vue2-client 1.15.117 → 1.15.118

package/package.json

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

@@ -887,7 +887,7 @@ export default {
     if (this.attr.showQueryFormItemFunc) {
       this.debouncedShowQueryFormItemFunc = debounce(this.showQueryFormItemFunc, 100)
       // 执行一次
-      this.showFormItemFunc()
+      this.showQueryFormItemFunc()
     }
     // 人员联动框增加监听
     if (this?.attr?.keyName?.toString()?.startsWith('search@根据表单项[') && this?.attr?.keyName?.toString().endsWith(']联动人员')) {
@@ -906,7 +906,12 @@ export default {
     queryParamsName () {
       if (this.attr.keyName.startsWith('function')) {
         // 调用异步函数获取内容
-        return executeStrFunctionByContext(this, this.attr.keyName, [this.form, runLogic, this.mode, getConfigByNameAsync])
+        const obj = executeStrFunctionByContext(this, this.attr.keyName, [this.form, runLogic, this.mode, getConfigByNameAsync])
+        // 处理同步返回值
+        return this.handleQueryParamsResult(obj)
+      } else if (this.attr.keyName.startsWith('async ')) {
+        console.warn('此处不支持异步操作')
+        return ''
       } else {
         // 按现有方式处理
         return this.attr.keyName.split('@')[this.attr.keyName.split('@').length - 1]
@@ -998,6 +1003,24 @@ export default {
     }
   },
   methods: {
+    // 处理 queryParams 结果并更新 rowChooseFixedQueryValue
+    handleQueryParamsResult (obj) {
+      let configName = ''
+      if (obj && typeof obj === 'object') {
+        // obj 是一个对象，并且不是数组
+        if (Object.prototype.hasOwnProperty.call(obj, 'configName')) {
+          configName = obj?.configName
+        }
+        if (Object.prototype.hasOwnProperty.call(obj, 'fixedQueryForm')) {
+          if (obj?.fixedQueryForm && typeof obj?.fixedQueryForm === 'object') {
+            this.rowChooseFixedQueryValue = Object.assign({}, this.rowChooseFixedQueryValue, obj.fixedQueryForm)
+          }
+        }
+      } else if (obj && typeof obj === 'string') {
+        configName = obj
+      }
+      return configName
+    },
     // 根据selectValueType预处理options数据
     processOptionsForValueType (options) {
       return this.selectValueTypeHandler.processOptions(options, this.attr.selectValueType)

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

@@ -8,7 +8,7 @@
       @action="action"
       @selectRow="selectRow"
       @columnClick="columnClick"
-      serviceName="af-revenue"
+      serviceName="af-system"
       ref="xFormTable">
     </x-form-table>
   </a-card>
@@ -26,7 +26,7 @@ export default {
   data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'UserFilesListCRUD',
+      queryParamsName: 'ceshiCRUD',
       // 新增表单固定值
       fixedAddForm: {},
       // 是否显示详情抽屉

package/src/router/async/router.map.js

@@ -60,13 +60,13 @@ path: 'example',
   // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
+  component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDatePicker/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XRate/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XTimeSelect/XTimeSelectDemo.vue'),
-  component: () => import('@vue2-client/base-client/components/his/XImportExcelButton/XFrontImportExcelDemo.vue'),
+  // component: () => import('@vue2-client/base-client/components/his/XImportExcelButton/XFrontImportExcelDemo.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
   // component: () => import('@vue2-client/pages/XPageViewExample/index.vue'),