vue2-client 1.20.70 → 1.20.72

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.20.70",
+  "version": "1.20.72",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
@@ -31,7 +31,7 @@
     "@microsoft/fetch-event-source": "^2.0.1",
     "@vue/babel-preset-jsx": "^1.4.0",
     "animate.css": "^4.1.1",
-    "ant-design-vue": "npm:@afwenming123/ant-design-vue@1.7.10",
+    "ant-design-vue": "npm:@afwenming123/ant-design-vue@1.7.12",
     "axios": "^0.27.2",
     "clipboard": "^2.0.11",
     "core-js": "^3.33.0",

package/src/base-client/plugins/shortcutMixin.js

@@ -22,7 +22,7 @@
  */
 
 import { shortcutManager } from '@vue2-client/base-client/utils/shortcutManager'
-import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
+// import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
 
 const log = (env => {
   if (env !== 'development') return () => {}
@@ -356,23 +356,26 @@ export const shortcutMixin = {
       log('reg', `✅ 注册 ${key} → scope=${scopeId} cellRef=${cellConfig.slotRef || '-'}`)
     },
 
+    // createShortcutContext(cellConfig, eventConfig, eventIndex, shortcutKey) {
+    //   return {
+    //     ...this,
+    //     getComponent: (ref) => this.shortcutGetComponent(ref),
+    //     findComponent: (ref) => this.shortcutFindComponent(ref),
+    //     cellConfig,
+    //     eventConfig,
+    //     eventIndex,
+    //     slotRef: cellConfig.slotRef,
+    //     shortcutKey,  // ✅ 新增：触发的快捷键
+    //     triggerEvent: (type, ...args) => {
+    //       const event = cellConfig.events?.find(e => e.type === type)
+    //       if (event?.customFunction) {
+    //         executeStrFunctionByContext(this, event.customFunction, args)
+    //       }
+    //     }
+    //   }
+    // },
     createShortcutContext(cellConfig, eventConfig, eventIndex, shortcutKey) {
-      return {
-        ...this,
-        getComponent: (ref) => this.shortcutGetComponent(ref),
-        findComponent: (ref) => this.shortcutFindComponent(ref),
-        cellConfig,
-        eventConfig,
-        eventIndex,
-        slotRef: cellConfig.slotRef,
-        shortcutKey,  // ✅ 新增：触发的快捷键
-        triggerEvent: (type, ...args) => {
-          const event = cellConfig.events?.find(e => e.type === type)
-          if (event?.customFunction) {
-            executeStrFunctionByContext(this, event.customFunction, args)
-          }
-        }
-      }
+      return this
     },
 
     // ========== 组件查找 ==========

package/src/base-client/utils/shortcutManager.js

@@ -757,7 +757,7 @@ class ShortcutManager {
     if (!normalizedKey) return
 
     const entry = {
-      action, scope, context, cellRef, isActive, instanceId,
+      action, scope, context, cellRef, isActive, instanceId, key,
       registeredAt: Date.now()
     }
 
@@ -918,16 +918,11 @@ class ShortcutManager {
    * @param {KeyboardEvent} keyboardEvent 原始键盘事件
    */
   executeEvent(entry, keyboardEvent) {
-    const { action, context } = entry
+    const { action, context, key } = entry
     if (!action?.customFunction) return
 
     try {
-      // ✅ 传递 keyboardEvent 和 shortcutKey
-      executeStrFunctionByContext(
-        context,
-        action.customFunction,
-        [keyboardEvent, context.shortcutKey || entry.key]
-      )
+      executeStrFunctionByContext(context, action.customFunction, [keyboardEvent, key])
     } catch (err) {
       log('error', `❌ 执行失败: ${err.message}`)
     }