vue2-client 1.8.345 → 1.8.347

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.345",
+  "version": "1.8.347",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

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

@@ -277,12 +277,17 @@ export default {
       // 修改场景下对表单项赋值
       if (modifyModelData && modifyModelData.data) {
         this.modifyModelData = modifyModelData
-        this.files = modifyModelData.files
-        this.images = modifyModelData.images
         if (Object.keys(modifyModelData.data).length > 0) {
           this.getModifyModelData(modifyModelData)
         }
       }
+      // 处理表单得附件
+      if (modifyModelData && modifyModelData.files) {
+        this.files = modifyModelData.files
+      }
+      if (modifyModelData && modifyModelData.images) {
+        this.images = modifyModelData.images
+      }
       this.loaded = true
     },
     // 时间组件赋默认值

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

@@ -138,7 +138,11 @@ export default {
       this.formList.push(res)
       let modifyModelData = {}
       if (this.modifyModelData[res.groupName]) {
-        modifyModelData = { data: this.modifyModelData[res.groupName] }
+        modifyModelData = {
+          data: this.modifyModelData[res.groupName],
+          files: this.modifyModelData[res.groupName].files,
+          images: this.modifyModelData[res.groupName].images
+        }
       }
       const params = {
         layout: res.xAddFormLayout,
@@ -146,6 +150,10 @@ export default {
         showSubmitBtn: false,
         serviceName: this.serviceName,
         fixedAddForm: modifyModelData.data,
+        modifyModelData: {
+          files: modifyModelData.files,
+          images: modifyModelData.images
+        },
         businessType: this.businessType,
         ...res
       }

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

@@ -346,6 +346,7 @@ export default {
           env: this.env
         })
         this.$refs.xTable.init({
+          formItems: res.formJson,
           queryParams: setQueryParams ? res : null,
           tableColumns: res.columnJson,
           buttonState: Object.assign(res.buttonState, this.buttonState),

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

@@ -292,7 +292,8 @@ export default {
       // 汇总抽屉是否显示
       summaryDrawerVisible: false,
       // 汇总更新标志
-      summaryUpdate: false
+      summaryUpdate: false,
+      formItems: []
     }
   },
   props: {
@@ -403,8 +404,10 @@ export default {
         serviceName,
         tableSummaryMap = {},
         viewMode,
+        formItems,
         env = 'prod'
       } = params
+      this.formItems = formItems
       this.showSummary = Object.keys(tableSummaryMap).length > 0
       this.queryParams = queryParams
       this.tableColumns = JSON.parse(JSON.stringify(tableColumns))
@@ -564,6 +567,12 @@ export default {
      * 获取主键列名称
      */
     getPrimaryKeyName () {
+      if (this.formItems && this.formItems.length) {
+        const primaryKeyData = this.formItems.filter(item => item.silencePurpose === 'primaryKey')
+        if (primaryKeyData.length) {
+          return primaryKeyData[0].model
+        }
+      }
       return this.tableColumns[0].dataIndex
     },
     // 导出选中或本页数据
@@ -680,6 +689,11 @@ export default {
         this.selectId = id
       }
       const primaryKeyName = this.getPrimaryKeyName()
+
+      if (this.tableColumns[0].dataIndex !== primaryKeyName) {
+        this.selectId = this.selectedRows[0][primaryKeyName]
+      }
+
       requestParameters.conditionParams[primaryKeyName] = this.selectId
       requestParameters.f_businessid = this.selectId
       if (this.isTableTemp) {