vue2-client 1.2.55-test → 1.2.55-test3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.2.55-test",
+  "version": "1.2.55-test3",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/base-client/components/common/Upload/Upload.vue

@@ -50,11 +50,26 @@ export default {
       default: () => {
         return {}
       }
+    },
+    files: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    images: {
+      type: Array,
+      default: () => {
+        return []
+      }
     }
   },
   computed: {
     ...mapState('account', { currUser: 'user' })
   },
+  created () {
+    this.uploadedFileList = this.model.type === 'file' ? [...this.files] : [...this.images]
+  },
   methods: {
     uploadFiles (info) {
       // 初始化文件信息
@@ -77,7 +92,8 @@ export default {
       if (this.model.pathKey) {
         formData.append('pathKey', this.model.pathKey)
       }
-      formData.append('stockAlias', this.model.stockAlias)
+      // formData.append('stockAlias', this.model.stockAlias)
+      formData.append('formType', this.model.type)
       formData.append('resUploadStock', this.model.resUploadStock)
       formData.append('filename', info.file.name)
       formData.append('filesize', (info.file.size / 1024 / 1024).toFixed(4))
@@ -87,7 +103,7 @@ export default {
       // if (process.env.NODE_ENV === 'production') {
       //   url = `/${this.model.stockAlias}/webmeteruploadapi/resource`
       // }
-      post('/webmeterresourceapi/resource', formData, { headers }).then(res => {
+      post('/webmeterresourceapi/upload', formData, { headers }).then(res => {
         // 根据服务端返回的结果判断成功与否，设置文件条目的状态
         if (res.success) {
           fileInfo.status = 'done'

package/src/base-client/components/common/XAddForm/XAddForm.vue

@@ -20,6 +20,8 @@
             v-for="(item, index) in realJsonData"
             mode="新增/修改"
             :attr="item"
+            :files="files"
+            :images="images"
             :form="form"
             :key="index"
             :disabled="itemDisabled(item)"
@@ -54,6 +56,9 @@ export default {
         SelectsArray: { },
         // 多层下拉框组 各组数量
         SelectsNumber: {},
+        // 修改有文件得表单是使用
+        files: [],
+        images: [],
         // 校验
         rules: {},
         // 图标样式
@@ -252,7 +257,9 @@ export default {
           }
         }
         this.form = formData
-        if (Object.keys(this.modifyModelData).length > 0) {
+        this.files = this.modifyModelData.files
+        this.images = this.modifyModelData.images
+        if (Object.keys(this.modifyModelData.data).length > 0) {
           this.getModifyModelData()
         }
       },
@@ -308,18 +315,18 @@ export default {
       getModifyModelData () {
         for (let i = 0; i < this.realJsonData.length; i++) {
           const item = this.realJsonData[i]
-          if (this.modifyModelData[item.model] || this.modifyModelData[item.model] === 0) {
-            this.form[item.model] = this.modifyModelData[item.model] + ''
+          if (this.modifyModelData.data[item.model] || this.modifyModelData.data[item.model] === 0) {
+            this.form[item.model] = this.modifyModelData.data[item.model] + ''
           } else {
             this.form[item.model] = undefined
           }
         }
         // 追加版本号信息
         for (const item of this.versionJsonData) {
-          if (!this.modifyModelData[item.model]) {
+          if (!this.modifyModelData.data[item.model]) {
             this.form[item.model] = 0
           } else {
-            this.form[item.model] = this.modifyModelData[item.model] + ''
+            this.form[item.model] = this.modifyModelData.data[item.model] + ''
           }
         }
       },