vue2-client 1.8.343 → 1.8.346

package/package.json

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

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

@@ -299,6 +299,9 @@ export default {
   margin-right: 0px;
   margin-top: 0px;
   margin-bottom: 12px;
+  .ant-form-item-control-wrapper{
+    min-width: 0;
+  }
 }
 
 :deep(.table-page-search-wrapper .table-page-search-submitButtons) {

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) {

package/src/base-client/components/common/XTree/XTreePro.vue

@@ -41,8 +41,8 @@
             ref="veTree"
             node-key="value"
             :height="heightStore[1]"
-            show-checkbox
-            :data="filteredTreeData && filteredTreeData.length> 0?filteredTreeData: treeData"
+            :show-checkbox="config.checkable"
+            :data="localTreeData"
             :item-size="40"
             :auto-expand-parent="true"
             @check-change="handleCheckChange"
@@ -112,6 +112,7 @@ export default {
         label: 'label',
         children: 'children'
       },
+      localTreeData: this.treeData,
       config: {},
       // 暂存选中的数据
       expandedKeys: [],
@@ -132,16 +133,21 @@ export default {
       // 选了但没有全选
       indeterminate: false,
       // 暂存查询信息
-      searchInfo: false,
+      searchInfo: {},
       searchInput: ''
     }
   },
   components: {
     VueEasyTree
   },
+  watch: {
+    treeData (newVal) {
+      this.localTreeData = newVal
+    }
+  },
   created () {
     if (this.configName) {
-      getConfigByNameAsync(this.configName, 'af-revenue').then(
+      getConfigByNameAsync(this.configName).then(
         (x) => {
           Object.assign(this.config, x)
           Object.assign(this.replaceFields, x.replaceFields)
@@ -265,8 +271,8 @@ export default {
         userId: this.currUser.id,
         depId: this.currUser.f_department_id
       }), this.config.serviceName, this.env === 'dev').then(res => {
-        this.treeData = res
-        this.deepestNodes = this.getDeepestNodes(this.treeData)
+        this.localTreeData = res
+        this.deepestNodes = this.getDeepestNodes(this.localTreeData)
         this.spinning = false
       }).catch(e => {
         console.error('获取数据失败：' + e)

package/vue.config.js

@@ -15,7 +15,7 @@ const v3Server = 'http://121.36.106.17:8400'
 const gateway = 'http://192.168.50.67:31467'
 const testUpload = 'http://123.60.214.109:8406'
 const OSSServerDev = 'http://192.168.50.67:30351'
-const revenue = 'http://192.168.50.67:31567'
+const revenue = 'http://192.168.50.67:31467'
 // const OSSServerProd = 'http://192.168.50.67:31351'
 // const testUploadLocal = 'http://127.0.0.1:9001'
 // v3 铜川