vue2-client 1.8.407 → 1.8.409

package/package.json

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

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

@@ -660,6 +660,11 @@ export default {
       // 执行一次
       debounce(this.showFormItemFunc, 100)()
     }
+    if (this.attr.showQueryFormItemFunc) {
+      this.debouncedShowQueryFormItemFunc = debounce(this.showQueryFormItemFunc, 100)
+      // 执行一次
+      debounce(this.showQueryFormItemFunc, 100)()
+    }
     // 人员联动框增加监听
     if (this?.attr?.keyName?.toString()?.startsWith('search@根据表单项[') && this?.attr?.keyName?.toString().endsWith(']联动人员')) {
       this.debouncedUserLinkFunc = debounce(() => this.updateResOptions('人员'), 200)
@@ -695,6 +700,10 @@ export default {
         if (this.attr.showFormItemFunc) {
           this.debouncedShowFormItemFunc()
         }
+        // 如果有自定义是否展示查询表单项函数
+        if (this.attr.showQueryFormItemFunc) {
+          this.debouncedShowQueryFormItemFunc()
+        }
         // 地址搜索框赋值
         if (this.attr.type === 'addressSearch') {
           this.$refs.addressSearchCombobox.addressInput = this.form[this.attr.model]
@@ -835,6 +844,13 @@ export default {
         this.show = true
       }
     },
+    async showQueryFormItemFunc () {
+      if (this.attr.showQueryFormItemFunc) {
+        this.show = executeStrFunction(this.attr.showQueryFormItemFunc, [this.form, this.setForm, this.attr, util, this.mode])
+      } else {
+        this.show = true
+      }
+    },
     init () {
       if (this.mode === '新增/修改' && !this.attr.flex) {
         if (['horizontal', 'vertical'].includes(this.layout)) {

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

@@ -80,7 +80,7 @@
 <script>
 // 转PDF用
 import HtmlToPdf from '@vue2-client/utils/htmlToPDF'
-import { getConfigByName } from '@vue2-client/services/api/common'
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
 import XReportDesign from './XReportDesign.vue'
 import { printElement } from './print'
 // import XAddReport from '@vue2-client/base-client/components/common/XAddReport'
@@ -213,7 +213,7 @@ export default {
       // 保存最原始的数据，用于判断哪些数据被更改了
       dataCache: undefined,
       // 判断哪些数据被更改了，存储对应的key
-      diff: []
+      diff: [],
     }
   },
   beforeDestroy () {
@@ -243,10 +243,25 @@ export default {
   },
   provide () {
     return {
-      openDialog: this.openDialog
+      runLogic: runLogic,
+      openDialog: this.openDialog,
+      registerComponent: this.registerComponent,
+      getComponentByName: this.getComponentByName
     }
   },
   methods: {
+    // 把组件注册到refs中，方便调用
+    registerComponent (componentName, component) {
+      console.log('内部注册', this.$options.name, componentName)
+      this.$refs[componentName] = component
+      console.log('内部注册完成', this.$refs)
+    },
+    // 根据名字从注册到组件中获取组件
+    getComponentByName (componentName) {
+      console.log('内部取组件', this.$options.name, componentName)
+      console.log('内部组件内容', this.$refs)
+      return this.$refs[componentName]
+    },
     // 打开弹出框
     openDialog (configName, selectedId) {
       console.log('openDialog', configName, selectedId)
@@ -315,6 +330,10 @@ export default {
       console.log('')
       this.$emit('selectRow', selectedRowKeys, selectedRows)
     },
+    // 注册组件到$refs中
+    registerComponentToRefs (componentName, component) {
+      this.$refs[componentName] = component
+    },
 
     // 正常的保存方法，当前修改内容会直接全部导出到外部
     saveConfig () {

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

@@ -16,9 +16,8 @@
               <component
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                 :key="cellIndex"
+                :ref="`dynamicComponent_${ cell.slotRef || cellIndex}`"
                 :serviceName="cell.serviceName"
-                @selectRow="selectRow"
-                :ref="cell.slotRef || cell.slotType + cellIndex"
                 v-on="getEventHandlers(cell)"
                 :queryParamsName="cell.slotConfig"/>
             </template>
@@ -477,7 +476,7 @@ export default {
       // tableConfig: {}
     }
   },
-  inject: ['openDialog'],
+  inject: ['openDialog', 'registerComponent', 'getComponentByName', 'runLogic'],
   methods: {
     getEventHandlers (cell) {
       const handlers = {}
@@ -785,12 +784,42 @@ export default {
       console.log('1123123123')
       this.$emit('selectRow', selectedRowKeys, selectedRows)
     },
+    // 把用户定义的组件，传递到整个杉格中，方便调用
+    passComponentNamesToAncestor (refs) {
+      console.log('组件的keys', Object.entries(refs), refs)
+      // 遍历所有 refs
+      Object.entries(refs).forEach(([refKey, refValue]) => {
+        // 检查 ref 是否以 dynamicComponent_ 开头
+        if (refKey.startsWith('dynamicComponent_')) {
+          console.log('组件名存在')
+          const componentRef = refValue[0]
+          if (componentRef) {
+            // 去掉前缀并获取组件名字
+            const index = refKey.replace('dynamicComponent_', '') // 去掉前缀
+            console.log('注册组件', index)
+            // 传递给祖先组件
+            this.registerComponent(index, componentRef)
+          }
+        }
+      })
+    }
   },
   beforeMount () {
     if (this.useOssForImg) {
       this.uploadParams.resUploadMode = 'oss'
     }
-  }
+  },
+  mounted () {
+    this.$nextTick(() => {
+      // 使用 setTimeout 延迟访问 $refs
+      this.$nextTick(() => {
+        console.log('组件加载了', this.$refs)
+        console.log('组件加载了1', this.$refs.dynamicComponent_a0)
+        console.log('组件加载了2', Object.entries(this.$refs))
+        this.passComponentNamesToAncestor(this.$refs)
+      })
+    })
+  },
 }
 
 </script>

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

@@ -50,6 +50,8 @@
               :item-size="40"
               :auto-expand-parent="true"
               @check-change="handleCheckChange"
+              :default-expanded-keys="expandedKeys"
+              @node-expand="nodeExpand"
               @node-click="handleNodeClick"
               :filter-node-method="filterNode"
               :props="props"
@@ -199,6 +201,13 @@ export default {
     }
   },
   methods: {
+    nodeExpand (node) {
+      if (this.expandedKeys.includes(node[this.replaceFields.key])) {
+        this.expandedKeys = this.expandedKeys.filter(item => item !== node[this.replaceFields.key])
+      } else {
+        this.expandedKeys.push(node[this.replaceFields.key])
+      }
+    },
     highlightKeyword (label, keyword) {
       const maxLen = this.config.deepNodeMaxWidth
 
@@ -241,11 +250,6 @@ export default {
     },
     nodeItemClick (e) {
       this.selectedNode = e
-      if (this.expandedKeys.includes(e.eventKey)) {
-        this.expandedKeys = this.expandedKeys.filter(item => item !== e.eventKey)
-      } else {
-        this.expandedKeys.push(e.eventKey)
-      }
     },
     handleNodeClick (node) {
       this.nodeItemClick(node)