From 078a9ace9ee72b38e087f488562099f855c5bad6 Mon Sep 17 00:00:00 2001
From: wangqing <smalljop@foxmail.com>
Date: Thu, 17 Dec 2020 18:46:33 +0800
Subject: [PATCH] =?UTF-8?q?upload=20=E7=BB=84=E4=BB=B6=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/generator/config.js |  4 ++--
 src/components/parser/Parser.vue   |  9 ++++++---
 src/components/render/render.js    | 25 +++++++++++++++++++++++--
 src/utils/convert.js               |  1 +
 src/views/form/ProjectForm.vue     | 17 ++++++++++++-----
 5 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/src/components/generator/config.js b/src/components/generator/config.js
index d620331..bc9bf4f 100644
--- a/src/components/generator/config.js
+++ b/src/components/generator/config.js
@@ -494,14 +494,14 @@ export const selectComponents = [
             buttonText: '点击上传',
             regList: [],
             changeTag: true,
-            fileSize: 1,
+            fileSize: 10,
             sizeUnit: 'MB',
             document: 'https://element.eleme.cn/#/zh-CN/component/upload'
         },
         __slot__: {
             'list-type': true
         },
-        action: 'https://api.freebrio.com/api/v1/file/upload',
+        action: '/tduck-api/project/file/upload/',
         disabled: false,
         accept: '',
         name: 'file',
diff --git a/src/components/parser/Parser.vue b/src/components/parser/Parser.vue
index ea1290f..7af4f54 100644
--- a/src/components/parser/Parser.vue
+++ b/src/components/parser/Parser.vue
@@ -1,5 +1,5 @@
 <script>
-import {deepClone} from '@/utils/index'
+import {deepClone, jsonClone} from '@/utils/index'
 import render from '@/components/render/render.js'
 import _ from 'lodash'
 
@@ -34,7 +34,10 @@ const layouts = {
             this.serialNumber = this.serialNumber + 1
             label = serialNumber + ': ' + label
         }
-
+        //不同项目地址区分
+        if (config.tag === 'el-upload') {
+            scheme.action = scheme.action + this.formConf.projectKey
+        }
         return (
             <el-col span={config.span}>
                 <el-form-item label-width={labelWidth} prop={scheme.__vModel__}
@@ -235,7 +238,7 @@ export default {
     },
     data() {
         const data = {
-            serialNumber: 1,//序号
+            // serialNumber: 1,//序号
             formConfCopy: deepClone(this.formConf),
             [this.formConf.formModel]: {},
             [this.formConf.labelFormModel]: {},
diff --git a/src/components/render/render.js b/src/components/render/render.js
index c64f476..d6b3adb 100644
--- a/src/components/render/render.js
+++ b/src/components/render/render.js
@@ -25,8 +25,29 @@ function vModel(dataObject, defaultValue) {
         dataObject.attrs['on-remove'] = (file, fileList) => {
             this.$emit('deleteUpload', file, fileList)
         }
-        dataObject.attrs['on-exceed']=(file, fileList) => {
-            this.$emit('deleteUpload', file, fileList)
+        dataObject.attrs['on-exceed'] = (files, fileList) => {
+            this.$message.error(`最多上传${config.limit}个文件`);
+        },
+        dataObject.attrs['before-upload'] = (file) => {
+            let sizeUnitNum = 1
+            //文件大小判断
+            switch (config.sizeUnit) {
+                case 'KB':
+                    sizeUnitNum = 1024
+                    break
+                case 'MB':
+                    sizeUnitNum = 1024 * 1024
+                    break
+                case 'GB':
+                    sizeUnitNum = 1024 * 1024 * 1024
+                    break
+            }
+            let totalSize= config.fileSize*sizeUnitNum
+            if (file.size> totalSize) {
+                this.$message.error(`上传图片大小不能超过${config.fileSize}${config.sizeUnit}`);
+                return false
+            }
+            console.log(dataObject)
         }
     } else {
         dataObject.props.value = defaultValue
diff --git a/src/utils/convert.js b/src/utils/convert.js
index 10dbe18..1789b72 100644
--- a/src/utils/convert.js
+++ b/src/utils/convert.js
@@ -65,6 +65,7 @@ export function dbDataConvertForItemJson(data) {
             jsonItem.__config__.defaultValue = data.defaultValue.value
         }
     }
+
     jsonItem.regList = data.regList
     jsonItem.placeholder = data.placeholder
     jsonItem.__vModel__ = 'field' + data.formItemId
diff --git a/src/views/form/ProjectForm.vue b/src/views/form/ProjectForm.vue
index 1796222..e6cdbd0 100644
--- a/src/views/form/ProjectForm.vue
+++ b/src/views/form/ProjectForm.vue
@@ -20,7 +20,7 @@
             </p>
             <el-divider>
             </el-divider>
-            <parser v-if="formConf.fields.length" :form-conf="formConf" @submit="submitForm"/>
+            <parser v-if="startParser" :form-conf="formConf" @submit="submitForm"/>
         </div>
     </div>
 </template>
@@ -51,7 +51,7 @@ export default {
     },
     data() {
         return {
-            projectKey: '',
+            startParser:false,
             projectTheme: {
                 headImgUrl: '',
                 logoImg: '',
@@ -60,6 +60,7 @@ export default {
             },
             formConf: {
                 fields: [],
+                projectKey:'',
                 __methods__: {},
                 formRef: 'elForm',
                 formModel: 'formData',
@@ -87,17 +88,17 @@ export default {
     },
     created() {
         if (this.projectConfig && this.projectConfig.projectKey) {
-            this.projectKey = this.projectConfig.projectKey
+            this.formConf.projectKey = this.projectConfig.projectKey
             // this.formConf.formBtns = this.projectConfig.showBtns
             //不存去路由中尝试获取 iframe
         } else if (this.$route.query.key) {
-            this.projectKey = this.$route.query.key
+            this.formConf.projectKey  = this.$route.query.key
             this.formConf.formBtns = true
         }
         this.formConf.size = window.innerWidth < 480 ? 'medium' : 'small'
     },
     mounted() {
-        this.$api.get(`/user/project/details/${this.projectKey}`).then(res => {
+        this.$api.get(`/user/project/details/${this.formConf.projectKey }`).then(res => {
             if (res.data) {
                 let fields = res.data.projectItems.map(item => {
                     return dbDataConvertForItemJson(item)
@@ -119,6 +120,7 @@ export default {
                         this.formConf.submitBtnColor = btnsColor
                     }
                 }
+                this.startParser=true
 
             }
         })
@@ -182,4 +184,9 @@ export default {
         width: 80%;
     }
 }
+@media screen and (max-width: 500px) {
+    .el-message {
+        min-width: 300px !important;
+    }
+}
 </style>