vue2-client 1.20.65 → 1.20.66

package/.idea/af-vue2-client.iml

@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="WEB_MODULE" version="4">
   <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
+    <content url="file://$MODULE_DIR$" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>

package/.idea/inspectionProfiles/Project_Default.xml

@@ -2,5 +2,22 @@
   <profile version="1.0">
     <option name="myName" value="Project Default" />
     <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="HtmlUnknownTag" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="myValues">
+        <value>
+          <list size="7">
+            <item index="0" class="java.lang.String" itemvalue="nobr" />
+            <item index="1" class="java.lang.String" itemvalue="noembed" />
+            <item index="2" class="java.lang.String" itemvalue="comment" />
+            <item index="3" class="java.lang.String" itemvalue="noscript" />
+            <item index="4" class="java.lang.String" itemvalue="embed" />
+            <item index="5" class="java.lang.String" itemvalue="script" />
+            <item index="6" class="java.lang.String" itemvalue="a-descriptions-item" />
+          </list>
+        </value>
+      </option>
+      <option name="myCustomValuesEnabled" value="true" />
+    </inspection_tool>
+    <inspection_tool class="UsePropertyAccessSyntax" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
   </profile>
 </component>

package/logs/afgit.config.log

@@ -0,0 +1,12 @@
+2026-03-18 10:11:17 - afgit.config - INFO - 开始推送配置
+2026-03-18 10:11:17 - afgit.config - INFO - 开始推送配置文件（含新增与修改），目录: ./config_files
+2026-03-18 10:11:17 - afgit.config - DEBUG - 开始认证，URL: http://192.168.50.67:31467/api/af-auth/login, 用户名: 1
+2026-03-18 10:11:18 - afgit.config - ERROR - 解析认证响应失败: {"code":400,"data":null,"error":true,"msg":"用户不存在/密码错误","success":false}, 用户名: 1, 密码: Class123!@!
+2026-03-18 10:11:18 - afgit.config - ERROR - 认证失败，推送终止
+2026-03-18 10:11:18 - afgit.config - ERROR - 推送配置失败
+2026-03-18 10:11:24 - afgit.config - INFO - 开始拉取最新配置
+2026-03-18 10:11:24 - afgit.config - INFO - 开始下载配置文件到: ./config_files
+2026-03-18 10:11:24 - afgit.config - DEBUG - 开始认证，URL: http://192.168.50.67:31467/api/af-auth/login, 用户名: 1
+2026-03-18 10:11:25 - afgit.config - ERROR - 解析认证响应失败: {"code":400,"data":null,"error":true,"msg":"用户不存在/密码错误","success":false}, 用户名: 1, 密码: Class123!@!
+2026-03-18 10:11:25 - afgit.config - ERROR - 认证失败，下载终止
+2026-03-18 10:11:25 - afgit.config - ERROR - 拉取配置失败

package/logs/afgit.config.log.2026-02-27

@@ -0,0 +1,7 @@
+2026-02-27 09:24:44 - afgit.config - INFO - 开始拉取最新配置
+2026-02-27 09:24:44 - afgit.config - INFO - 创建本地目录: ./config_files
+2026-02-27 09:24:44 - afgit.config - INFO - 开始下载配置文件到: ./config_files
+2026-02-27 09:24:44 - afgit.config - DEBUG - 开始认证，URL: http://192.168.50.67:31467/api/af-auth/login, 用户名: 1
+2026-02-27 09:24:44 - afgit.config - ERROR - 解析认证响应失败: {"code":400,"data":null,"error":true,"msg":"用户不存在/密码错误","success":false}, 用户名: 1, 密码: Class123!@!
+2026-02-27 09:24:44 - afgit.config - ERROR - 认证失败，下载终止
+2026-02-27 09:24:44 - afgit.config - ERROR - 拉取配置失败

package/logs/afgit.config_error.log

@@ -0,0 +1,6 @@
+2026-03-18 10:11:18 - afgit.config - ERROR - 解析认证响应失败: {"code":400,"data":null,"error":true,"msg":"用户不存在/密码错误","success":false}, 用户名: 1, 密码: Class123!@!
+2026-03-18 10:11:18 - afgit.config - ERROR - 认证失败，推送终止
+2026-03-18 10:11:18 - afgit.config - ERROR - 推送配置失败
+2026-03-18 10:11:25 - afgit.config - ERROR - 解析认证响应失败: {"code":400,"data":null,"error":true,"msg":"用户不存在/密码错误","success":false}, 用户名: 1, 密码: Class123!@!
+2026-03-18 10:11:25 - afgit.config - ERROR - 认证失败，下载终止
+2026-03-18 10:11:25 - afgit.config - ERROR - 拉取配置失败

package/logs/afgit.config_error.log.2026-02-27

@@ -0,0 +1,3 @@
+2026-02-27 09:24:44 - afgit.config - ERROR - 解析认证响应失败: {"code":400,"data":null,"error":true,"msg":"用户不存在/密码错误","success":false}, 用户名: 1, 密码: Class123!@!
+2026-02-27 09:24:44 - afgit.config - ERROR - 认证失败，下载终止
+2026-02-27 09:24:44 - afgit.config - ERROR - 拉取配置失败

package/package.json

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

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

@@ -2,51 +2,31 @@
   <a-card :bordered="false">
     <x-form-table
       title="示例表单"
-      queryParamsName="scanCodeAndNFCRUD"
+      :queryParamsName="queryParamsName"
       :fixedAddForm="fixedAddForm"
       :externalSelectedRowKeys="selectedKeys"
-      :defaultPageSize="100"
-      :pageSizeArray="['100','200']"
       @action="action"
       @selectRow="selectRow"
       @columnClick="columnClick"
       @ceshi="ceshi"
-      @startService="startService"
-      serviceName="af-safecheck"
+      @rowDblClick="rowDblClick"
+      serviceName="af-revenue"
       ref="xFormTable"
       :reserveSpaceForButtons="true"
-    >
-    </x-form-table>
-    <a-modal
-      v-model="formModalVisible"
-      title="工单回访"
-      :zIndex="1002"
-      width="50vw"
-      :destroy-on-close="true"
-      @cancel="formModalVisible = false"
-      @ok="ok"
-    >
-      <x-add-native-form
-        ref="xForm"
-      />
-    </a-modal>
-    <button @click="backDealData">提交</button>
+      @addFormSubmit="addFormSubmit"
+    ></x-form-table>
   </a-card>
 </template>
 
 <script>
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
-import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
 import { microDispatch } from '@vue2-client/utils/microAppUtils'
-import {getConfigByNameAsync, runLogic} from '@vue2-client/services/api/common'
-
 export default {
   name: 'Demo',
   components: {
-    XFormTable,
-    XAddNativeForm,
+    XFormTable
   },
-  data () {
+  data() {
     return {
       // 查询配置文件名
       queryParamsName: 'ceshiCRUD',
@@ -62,32 +42,26 @@ export default {
       selectedKeys: [],
       selected: {
         keys: [],
-        rows: [],
-      },
-      formModalVisible: false,
+        rows: []
+      }
     }
   },
+
   methods: {
-    backDealData () {
-      this.$refs.xFormTable.$refs.xForm.backDealData().then(data => {
-        console.log('backDealData', data)
-        console.log('selected', this.$refs.xFormTable.$refs.xForm?.form)
+    handleCustomQuery() {
+      this.$refs.xFormTable.queryTable({
+        uf_f_alias: 'XianFeng',
+        uf_f_card_id: '10500030'
       })
     },
+    rowDblClick(record) {
+      console.log('rowDblClick', record)
+    },
     // input框 行編輯參數傳遞
-    ceshi (...args) {
+    ceshi(...args) {
       // attr, value, currentRecord, currentIndex, nextRecord, nextIndex
-      const [attr, value, currentRecord, currentIndex, nextRecord, nextIndex] =
-        args
-      console.log(
-        'ceshi',
-        attr,
-        value,
-        currentRecord,
-        currentIndex,
-        nextRecord,
-        nextIndex
-      )
+      const [attr, value, currentRecord, currentIndex, nextRecord, nextIndex] = args
+      console.log('ceshi', attr, value, currentRecord, currentIndex, nextRecord, nextIndex)
       // 示例：当按下 Enter 键且有下一行时，跳转到下一行的同一列
       // 可以在这里执行业务逻辑（例如：保存数据）
       console.log('当前行:', currentIndex, '下一行:', nextIndex)
@@ -98,115 +72,45 @@ export default {
       // 跳转到下一行的同一列
       this.$refs.xFormTable.$refs.xTable.focusInput(nextIndex, attr.model)
     },
-    test () {
+    test() {
       this.$refs.xFormTable.setTableData([])
     },
-    defaultF () {
+    defaultF() {
       this.$refs.xFormTable.setTableSize('default')
     },
-    middleF () {
+    middleF() {
       this.$refs.xFormTable.setTableSize('middle')
     },
-    smallF () {
+    smallF() {
       this.$refs.xFormTable.setTableSize('small')
     },
-    columnClick (key, value, record) {
+    columnClick(key, value, record) {
       microDispatch({
         type: 'v3route',
         path: '/bingliguanli/dianzibingliluru',
-        props: { selected: arguments[0].his_f_admission_id },
+        props: { selected: arguments[0].his_f_admission_id }
       })
     },
-    startService (record, id, actionType) {
-      getConfigByNameAsync('测试Form', 'af-safecheck').then(config => {
-        this.formModalVisible = true
-        this.$nextTick(
-          () => {
-            this.formModalVisible = true
-            this.$refs.xForm.init({
-              formItems: config.formJson,
-              title: '工单回访',
-              businessType: '只读',
-              ...config,
-              fixedAddForm: {
-                Images:[
-                  {
-                    'uid': 1850,
-                    'url': '/resource/af-system/images/3de85050493f4404ad3d0a00d53bca12.png',
-                    'name': '3de85050493f4404ad3d0a00d53bca12.png'
-                  }
-                ],
-                f_image1:[
-                  {
-                    'uid': 1850,
-                    'url': '/resource/af-system/images/3de85050493f4404ad3d0a00d53bca12.png',
-                    'name': '3de85050493f4404ad3d0a00d53bca12.png'
-                  }
-                ],
-                signs: [
-                  {
-                    'uid': 1850,
-                    'url': '/resource/af-system/images/3de85050493f4404ad3d0a00d53bca12.png',
-                    'name': '3de85050493f4404ad3d0a00d53bca12.png'
-                  }
-                ],
-              },
-              modifyModelData: {
-                data: {
-                  Images:[
-                    {
-                      'uid': 1850,
-                      'url': '/resource/af-system/images/3de85050493f4404ad3d0a00d53bca12.png',
-                      'name': '3de85050493f4404ad3d0a00d53bca12.png'
-                    }
-                  ],
-                  f_image1:[
-                    {
-                      'uid': 1850,
-                      'url': '/resource/af-system/images/3de85050493f4404ad3d0a00d53bca12.png',
-                      'name': '3de85050493f4404ad3d0a00d53bca12.png'
-                    }
-                  ],
-                  f_image2: [
-                    {
-                      'uid': 1850,
-                      'url': '/resource/af-system/images/3de85050493f4404ad3d0a00d53bca12.png',
-                      'name': '3de85050493f4404ad3d0a00d53bca12.png'
-                    }
-                  ],
-                },
-                signs: [
-                  {
-                    'uid': 1850,
-                    'url': '/resource/af-system/images/3de85050493f4404ad3d0a00d53bca12.png',
-                    'name': '3de85050493f4404ad3d0a00d53bca12.png'
-                  }
-                ],
-              },
-            })
-          })
-      })
-      // this.detailVisible = true
-      // console.log('触发了详情操作', record, id, actionType)
-    },
-    async ok () {
-      const res = await this.$refs.xForm.asyncSubmit()
-      await runLogic('ceshwewei', res.realForm)
+    action(record, id, actionType) {
+      this.detailVisible = true
+      console.log('触发了详情操作', record, id, actionType)
     },
-    onClose () {
+    onClose() {
       this.detailVisible = false
       // 关闭详情之后重新查询表单
       this.$refs.xFormTable.refreshTable(true)
     },
-    selectRow (selectedRowKeys, selectedRows) {
+    selectRow(selectedRowKeys, selectedRows) {
+      console.log('selectRow', selectedRowKeys, selectedRows)
       this.selected = {
         keys: selectedRowKeys,
-        rows: selectedRows,
+        rows: selectedRows
       }
-      console.log('selectedDemo', this.selected)
     },
-  },
-  computed: {},
+    addFormSubmit(params, callback){
+      callback()
+    }
+  }
 }
 </script>
 

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

@@ -220,6 +220,13 @@ export default {
       _configEndResolve: null,
     }
   },
+  inject: {
+    // 从祖先获取 getGridScopePath（可能是外层 XReport 或 XTab 提供的）
+    upstreamGetGridScopePath: {
+      from: 'getGridScopePath',
+      default: null
+    }
+  },
   beforeDestroy () {
     clearInterval(this.timer)
     if (this.$componentRegistry && this._globalRegistrySlotNames.length) {
@@ -233,6 +240,9 @@ export default {
     // 如果配置名更改了，重新获取配置
     configName (val) {
       if (val) {
+        // 先清空配置，避免异步期间使用旧配置注册快捷键
+        this.originalConfig = null
+        this.scanFinish = false
         getConfigByName(
           this.configName,
           undefined,
@@ -276,6 +286,20 @@ export default {
       closeAddReport: report.closeAddReport.bind(report),
       setData: report.setData.bind(report),
       getRootReport: () => report,
+      getGridScopePath: () => {
+        // 1. 优先从注入的上游函数获取父路径
+        let parent = ''
+        if (typeof report.upstreamGetGridScopePath === 'function') {
+          parent = report.upstreamGetGridScopePath()
+        }
+        // 2. 如果没有注入（根实例），回退到 prop（兼容旧写法）
+        if (!parent && report.parentScopePath) {
+          parent = report.parentScopePath
+        }
+        // 3. 拼上自己的 configName
+        const current = report.configName
+        return parent ? `${parent}/${current}` : current
+      }
     }
   },
   methods: {

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

@@ -186,9 +186,11 @@ import { getRealKeyData } from '@vue2-client/utils/util'
 import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
 import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
 import { getMicroData, getWindow, isMicroAppEnv, microDispatch } from '@vue2-client/utils/microAppUtils'
+import { shortcutMixin } from '@vue2-client/base-client/plugins/shortcutMixin'
 
 export default {
   name: 'XReportTrGroup',
+  mixins: [shortcutMixin],
   components: {
     Upload,
     XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'),
@@ -315,6 +317,8 @@ export default {
   },
   data () {
     return {
+      // 快捷键作用域类型：grid 表示栅格类组件
+      shortcutScopeType: 'grid',
       gutter: [8, { xs: 8, sm: 16, md: 24, lg: 32 }], // 设置水槽大小
       maxColSpan: 12,
       uploadParams: {
@@ -367,6 +371,11 @@ export default {
     closeAddReport: { default: false },
     setData: { default: false },
     getRootReport: { default: false },
+    // 注入来自父组件（XReport）的栅格完整作用域路径（XReport已拼接完整）
+    getGridScopePath: { default: null }
+  },
+  beforeDestroy() {
+    this.unregisterShortcuts()
   },
   methods: {
     getWindow,
@@ -374,6 +383,128 @@ export default {
     microDispatch,
     getMicroData,
     getRealKeyData,
+    // ========== Mixin 覆盖方法 ==========
+    /**
+     * 获取快捷键配置（覆盖mixin）
+     * 验证当前激活的配置名是否匹配当前组件的配置名
+     */
+    getShortcutConfig() {
+      try {
+        let parent = ''
+        if (typeof this.getGridScopePath === 'function') {
+          parent = this.getGridScopePath()
+        }
+        const parts = parent.split('/')
+        return { columns: this.columns, configName: parts[parts.length - 1], scopeType: 'grid' }
+      }catch (e){
+        console.log('=============---->',e)
+      }
+    },
+
+
+    /**
+     * 获取组件实例（覆盖mixin，供快捷键上下文使用）
+     */
+    getScopePath() {
+      // 1. 获取路由
+      const route = this.$route?.path || 'unknown-route'
+
+      // 2. 获取 Tab 容器名称（来自 XTab）
+      let tabInfo = 'no-tab'
+      if (typeof this.getTabPath === 'function') {
+        const tabPath = this.getTabPath()
+        if (tabPath) {
+          tabInfo = tabPath
+        }
+      } else if (typeof this.getCurrentTabIndex === 'function') {
+        const tabIndex = this.getCurrentTabIndex()
+        if (tabIndex !== undefined && tabIndex !== null) {
+          tabInfo = `tab[${tabIndex}]`
+        }
+      }
+
+      // 3. 获取栅格配置名称 - 优先使用根组件的 configName，否则尝试 config 上的属性
+      let gridName = 'unknown-grid'
+      if (this._rootConfigName) {
+        gridName = this._rootConfigName
+      } else if (this.config) {
+        // 尝试 configName
+        if (this.config.configName) {
+          gridName = this.config.configName
+        }
+        // 尝试 configKey
+        else if (this.config.configKey) {
+          gridName = this.config.configKey
+        }
+        // 尝试 slotConfigName
+        else if (this.config.slotConfigName) {
+          gridName = this.config.slotConfigName
+        }
+        // 尝试 name
+        else if (this.config.name) {
+          gridName = this.config.name
+        }
+        // 尝试 title
+        else if (this.config.title) {
+          gridName = this.config.title
+        }
+        // 尝试从 columns 中的第一个 slot 获取 slotConfig（槽位名）
+        else if (this.config.columns && this.config.columns.length > 0) {
+          const firstRow = this.config.columns[0]
+          if (Array.isArray(firstRow) && firstRow.length > 0) {
+            const firstCell = firstRow[0]
+            if (firstCell?.slotConfig) {
+              gridName = `slot:${firstCell.slotConfig}`
+            } else if (firstCell?.slotRef) {
+              gridName = `ref:${firstCell.slotRef}`
+            }
+          }
+        }
+      }
+
+      // 调试：打印 config 的可用属性
+      if (this._scopePathDebugCount === undefined) {
+        this._scopePathDebugCount = 0
+      }
+      if (this._scopePathDebugCount < 3 && this.config) {
+        console.log(`[XReportTrGroup getScopePath] config keys:`, Object.keys(this.config), 'configName:', this.config.configName)
+        this._scopePathDebugCount++
+      }
+
+      // 完整路径：路由 -> Tab容器名称 -> 栅格配置名称
+      return `${route} -> ${tabInfo} -> ${gridName}`
+    },
+
+    /**
+     * 获取组件实例（覆盖mixin，供快捷键上下文使用）
+     */
+    shortcutGetComponent(ref) {
+      // 通过 $refs 查找动态组件
+      const refName = `dynamicComponent_${ref}`
+      const component = this.$refs[refName]?.[0]
+      console.log('【获取组件实例】',component)
+      if (component) {
+        // 尝试获取实例方法
+        if (component.getXTabInstance) return component.getXTabInstance()
+        if (component.getXFormTableInstance) return component.getXFormTableInstance()
+        if (component.getXAddNativeFormInstance) return component.getXAddNativeFormInstance()
+        return component
+      }
+      return null
+    },
+
+    /**
+     * 查找组件（覆盖mixin）
+     */
+    shortcutFindComponent(ref) {
+      console.log('【查找组件】', this)
+      console.log('【查找组件】', ref)
+      if (this.findComponentByName) {
+        return this.findComponentByName(this, ref, 10, 'parent')
+      }
+      return this.shortcutGetComponent(ref)
+    },
+    // ========== Mixin 覆盖方法结束 ==========
     handleRowClick (record) {
       this.$emit('rowClick', record)
     },
@@ -418,6 +549,11 @@ export default {
       this.$set(this.slotConfigEnded, cellIndex, true)
       if (Object.keys(this.slotConfigEnded).length >= this.allSlotSum) {
         this.$emit('slotsConfigEnded')
+        // 所有 slot 配置结束后，完整扫描一次快捷键
+        this.$nextTick(() => {
+          console.log('【所有 slot 配置结束后】 完整扫描一次快捷键')
+          this.rescanShortcuts()
+        })
       }
     },
     onComponentMounted (h, cell, cellIndex) {
@@ -435,6 +571,12 @@ export default {
           mountedLogicMode: cell.mountedLogicMode,
           mountedLogicParam: cell.mountedLogicParam
         })}
+      // 子组件挂载后，触发其快捷键注册
+      const component = this.$refs[`dynamicComponent_${cell.slotRef || cellIndex}`]?.[0]
+      console.log('【子组件挂载后，触发其快捷键注册】', component)
+      if (component && typeof component.onShortcutMixinReady === 'function') {
+        component.onShortcutMixinReady()
+      }
       // 传递给祖先组件
       const shouldInit = cell.shouldInit == null ? true : cell.shouldInit
       if (shouldInit) {
@@ -667,7 +809,7 @@ export default {
         })
 
         // 处理子节点样式
-       this.parseNestedStyles(classConfig, childStyles)
+        this.parseNestedStyles(classConfig, childStyles)
       })
       return {
         rootStyles,
@@ -877,6 +1019,8 @@ export default {
   mounted () {
     this.$nextTick(() => {
       if (this.allSlotSum === 0) this.$emit('slotsConfigEnded')
+      // 挂载后注册快捷键
+      this.registerShortcutsIfNeeded()
     })
   },
 }