vue2-client 1.14.15 → 1.14.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.14.15",
+  "version": "1.14.17",
   "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

@@ -82,6 +82,7 @@
             @editButtonStateDataClick="editButtonStateDataClick"
             @importExcelOk="importExcelOk"
             @rowClick="handleRowClick"
+            @beforeDataChange="beforeDataChange"
             @expand="onExpand">
             <template slot="leftButton" slot-scope="{selectedRowKeys, selectedRows}">
               <slot name="leftButton" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
@@ -824,6 +825,9 @@ export default {
     handleRowClick (record) {
       this.$emit('rowClick', record)
     },
+    beforeDataChange (record) {
+      this.$emit('beforeDataChange', record)
+    },
     onExpand (expanded, record) {
       this.$emit('expand', expanded, record)
     }

package/src/base-client/components/common/XReportGrid/XReport.vue

@@ -243,10 +243,44 @@ export default {
       isWidget: this.widget,
       currUser: this.currUser,
       getGlobalData: this.getGlobalData,
-      setGlobalData: this.setGlobalData
+      setGlobalData: this.setGlobalData,
+      findComponentByName: this.findComponentByName
     }
   },
   methods: {
+    findComponentByName (instance, componentName, maxDepth, findType) {
+      // 基础判断：如果实例不存在或者已经超过最大深度，返回null
+      if (!instance || maxDepth <= 0) {
+        return null
+      }
+
+      // 检查当前实例是否有目标组件
+      try {
+        if (instance.getComponentByName && instance.getComponentByName(componentName)) {
+          return instance.getComponentByName(componentName)
+        }
+      } catch (e) {
+        console.warn('查找组件时发生错误:', e)
+      }
+
+      // 递归查找子组件
+      if (findType === 'parent') {
+        // 向上查找父组件
+        if (instance.$parent) {
+          return this.findComponentByName(instance.$parent, componentName, maxDepth - 1, findType)
+        }
+      } else {
+        if (instance.$children && instance.$children.length) {
+          for (const child of instance.$children) {
+            const result = this.findComponentByName(child, componentName, maxDepth - 1, findType)
+            if (result) {
+              return result
+            }
+          }
+        }
+      }
+      return null
+    },
     listClick (data) {
       this.$emit('listClick', data)
     },

package/src/base-client/components/common/XReportGrid/XReportTrGroup.vue

@@ -34,6 +34,7 @@
                 :serverName="cell.serviceName"
                 v-on="getEventHandlers(cell)"
                 @hook:mounted="(h)=>onComponentMounted(h,cell,cellIndex)"
+                @beforeDataChange="beforeDataChange"
                 @rowClick="handleRowClick"
                 @onExpand="onExpand"
                 :queryParamsName="cell.slotConfig"
@@ -71,6 +72,7 @@
                 :serverName="cell.serviceName"
                 v-on="getEventHandlers(cell)"
                 @hook:mounted="(h)=>onComponentMounted(h,cell,cellIndex)"
+                @beforeDataChange="beforeDataChange"
                 @rowClick="handleRowClick"
                 @onExpand="onExpand"
                 :queryParamsName="cell.slotConfig"
@@ -210,7 +212,7 @@ export default {
       }
     }
   },
-  inject: ['openDialog', 'emitEvent', 'registerComponent', 'setColSpanByName', 'setGlobalData', 'getGlobalData', 'getComponentByName', 'runLogic', 'getMixinData', 'getSelectedId', 'isInAModal', 'getConfigByName', 'getSelectedData', 'getOutEnv', 'currUser', 'isWidget'],
+  inject: ['openDialog', 'emitEvent', 'registerComponent', 'setColSpanByName', 'setGlobalData', 'getGlobalData', 'getComponentByName', 'runLogic', 'getMixinData', 'getSelectedId', 'isInAModal', 'getConfigByName', 'getSelectedData', 'getOutEnv', 'currUser', 'isWidget', 'findComponentByName'],
   methods: {
     getWindow,
     isMicroAppEnv,
@@ -220,6 +222,9 @@ export default {
     handleRowClick (record) {
       this.$emit('rowClick', record)
     },
+    beforeDataChange (record) {
+      this.$emit('beforeDataChange', record)
+    },
     onExpand (expanded, record) {
       this.$emit('expand', expanded, record)
     },

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

@@ -152,6 +152,7 @@
       <x-table-wrapper
         ref="table"
         @rowClick="handleRowClick"
+        @beforeDataChange="beforeDataChange"
         @expand="onExpand">
         <template slot="expandedRowRender">
           <!-- 列扩展栅格 -->
@@ -257,6 +258,7 @@
       <x-table-wrapper
         ref="selectedDataTable"
         :load-selected-data="true"
+        @beforeDataChange="beforeDataChange"
         @rowClick="handleRowClick">
       </x-table-wrapper>
     </a-modal>
@@ -1332,6 +1334,9 @@ export default {
     handleRowClick (record) {
       this.$emit('rowClick', record)
     },
+    beforeDataChange (record) {
+      this.$emit('beforeDataChange', record)
+    },
     onExpand (expanded, record) {
       this.$emit('expand', expanded, record)
     }

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

@@ -18,6 +18,7 @@
     :setScrollYHeight="tableContext.setScrollYHeight"
     :selectRowMode="tableContext.selectRowMode"
     :size="tableContext.tableSize"
+    @beforeDataChange="beforeDataChange"
     @expand="onExpand"
     @rowClick="handleRowClick"
   >
@@ -152,6 +153,7 @@
     :selectRowMode="tableContext.selectRowMode"
     :size="tableContext.tableSize"
     @rowClick="handleRowClick"
+    @beforeDataChange="beforeDataChange"
   >
     <template
       v-for="(item, c_index) in tableContext.tableColumns"
@@ -297,6 +299,9 @@ export default {
     handleRowClick (record) {
       this.$emit('rowClick', record)
     },
+    beforeDataChange (record) {
+      this.$emit('beforeDataChange', record)
+    },
     onExpand (expanded, record) {
       this.$emit('expand', expanded, record)
     },

package/src/base-client/components/his/XList/XList.vue

@@ -38,6 +38,10 @@ export default {
     queryParamsName: {
       type: Object,
       default: null
+    },
+    fixedQueryForm: {
+      type: Object,
+      default: { condition: '1=1' }
     }
   },
   inject: ['getComponentByName'],
@@ -51,17 +55,17 @@ export default {
     }
   },
   created () {
-    this.getData(this.queryParamsName)
+    this.getData(this.queryParamsName, this.fixedQueryForm)
   },
   methods: {
-    async getData (config) {
+    async getData (config, param) {
       const that = this
       getConfigByName(config, 'af-his', res => {
         that.button = res.button
         that.icon = res.icon
         that.buttonNames = res.buttonNames || []
         that.buttonMode = res.buttonMode || false
-        runLogic(res.data, {}, 'af-his').then(ress => {
+        runLogic(res.data, param, 'af-his').then(ress => {
           that.data = ress
         })
       })
@@ -69,8 +73,8 @@ export default {
     handleClick (index) {
       this.$emit('listClick', this.data[index])
     },
-    refreshList () {
-      this.getData(this.queryParamsName)
+    refreshList (param) {
+      this.getData(this.queryParamsName, param)
     },
     click (index, buttonIndex) {
       this.$emit('click', { data: this.data[index], name: this.buttonNames[buttonIndex] })
@@ -85,6 +89,11 @@ export default {
         this.data = res.data
       })
     }
+  },
+  watch: {
+    'fixedQueryForm' (val) {
+      this.refreshList(val)
+    }
   }
 }
 </script>

package/src/components/STable/index.js

@@ -187,6 +187,18 @@ export default {
         (this.sortOrder && { sortOrder: this.sortOrder }) || {},
         { ...filters }
       )
+
+      // 在加载新数据前，将当前数据传递给父组件
+      if (this.localDataSource && this.localDataSource.length > 0) {
+        // 变化前的数据: oldData, 分页信息: pagination, 过滤条件: filters, 排序信息: sorter
+        this.$emit('beforeDataChange', {
+          oldData: this.localDataSource,
+          pagination: this.localPagination,
+          filters: filters,
+          sorter: sorter
+        })
+      }
+
       const result = this.data(parameter)
       // 对接自己的通用数据接口需要修改下方代码中的 r.pageNo, r.totalCount, r.data
       // eslint-disable-next-line