vue2-client 1.8.374 → 1.8.377

package/package.json

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

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

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

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

@@ -297,7 +297,8 @@ export default {
       summaryDrawerVisible: false,
       // 汇总更新标志
       summaryUpdate: false,
-      formItems: []
+      // 定义主键
+      primaryKey: ''
     }
   },
   props: {
@@ -412,10 +413,11 @@ export default {
         serviceName,
         tableSummaryMap = {},
         viewMode,
-        formItems,
+        primaryKey,
+        createdQuery = true,
         env = 'prod'
       } = params
-      this.formItems = formItems
+      this.primaryKey = primaryKey
       this.showSummary = Object.keys(tableSummaryMap).length > 0
       this.queryParams = queryParams
       this.tableColumns = JSON.parse(JSON.stringify(tableColumns))
@@ -447,7 +449,7 @@ export default {
       this.scrollXWidth = totalWidth
       // 加载筛选列完成
       this.columnSelectLoaded = true
-      this.setQueryForm(form || {})
+      this.setQueryForm(form || {}, createdQuery)
     },
     /**
      * 加载表格数据
@@ -504,9 +506,11 @@ export default {
     /**
      * 为表格附加查询条件
      */
-    setQueryForm (form = {}) {
+    setQueryForm (form = {}, createdQuery = true) {
       this.form = form
-      this.refresh(true)
+      if (createdQuery) {
+        this.refresh(true)
+      }
     },
     /**
      * 表格重新加载方法
@@ -577,11 +581,8 @@ 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
-        }
+      if (this.primaryKey) {
+        return this.primaryKey
       }
       const realColumns = this.tableColumns.filter(i => i?.slotType !== 'index')
       return realColumns[0].dataIndex