vue2-client 1.2.55-test2 → 1.2.56

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

@@ -68,7 +68,7 @@ export default {
     ...mapState('account', { currUser: 'user' })
   },
   created () {
-    this.uploadedFileList = this.mode.type === 'file' ? [...this.files] : [...this.images]
+    this.uploadedFileList = this.model.type === 'file' ? [...this.files] : [...this.images]
   },
   methods: {
     uploadFiles (info) {
@@ -86,15 +86,16 @@ export default {
       const headers = {
         'Content-Type': 'multipart/form-data',
       }
+      // TODO 暂时给默认值 基础表单调整好后处理
       const formData = new FormData()
       formData.append('avatar', info.file)
-      formData.append('resUploadMode', this.model.resUploadMode)
+      formData.append('resUploadMode', this.model.resUploadMode ?? 'server')
       if (this.model.pathKey) {
-        formData.append('pathKey', this.model.pathKey)
+        formData.append('pathKey', this.model.pathKey ?? 'cs')
       }
-      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('resUploadStock', this.model.resUploadStock ?? 1)
       formData.append('filename', info.file.name)
       formData.append('filesize', (info.file.size / 1024 / 1024).toFixed(4))
       formData.append('f_operator', this.currUser.username)

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

@@ -257,11 +257,12 @@ export default {
           }
         }
         this.form = formData
-        this.files = this.modifyModelData.files
-        this.images = this.modifyModelData.images
-        this.modifyModelData = this.modifyModelData.data
-        if (Object.keys(this.modifyModelData).length > 0) {
-          this.getModifyModelData()
+        if (this.modifyModelData.data) {
+          this.files = this.modifyModelData.files
+          this.images = this.modifyModelData.images
+          if (Object.keys(this.modifyModelData.data).length > 0) {
+            this.getModifyModelData()
+          }
         }
       },
       itemDisabled (value) {
@@ -316,18 +317,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] + ''
           }
         }
       },