cnhis-design-vue 3.1.15-beta.1 → 3.1.15-beta.2

package/es/packages/big-table/src/BigTable.vue_vue_type_script_setup_true_lang.js

@@ -2314,7 +2314,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         "span-method": colspanMethod,
         "footer-span-method": footerRowspanMethod,
         "tooltip-config": {
-          enterable: false
+          enterable: false,
+          ..._ctx.$attrs.tooltipConfig || {}
         },
         "checkbox-config": {
           checkField: "checked",
@@ -2330,10 +2331,12 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           checkField: "checked",
           trigger: "cell",
           reserve: true,
-          highlight: true
+          highlight: true,
+          ..._ctx.$attrs.radioConfig || {}
         },
         "scroll-y": {
-          gt: 50
+          gt: 50,
+          ..._ctx.$attrs.scrollY || {}
         },
         "row-style": unref(getRowStyle),
         "edit-config": state.editConfig,
@@ -2343,7 +2346,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           loadMethod: unref(loadExpandMethod),
           toggleMethod: unref(toggleExpandMethod),
           iconOpen: "iconfont icon-a-xitongtubiaozhediejian",
-          iconClose: "iconfont icon-a-xitongtubiaotianjia"
+          iconClose: "iconfont icon-a-xitongtubiaotianjia",
+          ..._ctx.$attrs.expandConfig || {}
         },
         "keyboard-config": _ctx.columnConfig.keyboardConfig || {},
         "edit-rules": _ctx.columnConfig.editRules || {},
@@ -2413,7 +2417,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           }
         })]),
         _: 3
-      }, 16, ["height", "seq-config", "tree-config", "cell-class-name", "row-config", "show-footer", "checkbox-config", "row-style", "edit-config", "expand-config", "keyboard-config", "edit-rules", "menu-config", "onScroll", "onKeydown"]), createCommentVNode(" `${refreshRow}\u6761\u66F4\u65B0` "), withDirectives(createElementVNode("div", {
+      }, 16, ["height", "seq-config", "tree-config", "cell-class-name", "row-config", "show-footer", "tooltip-config", "checkbox-config", "radio-config", "scroll-y", "row-style", "edit-config", "expand-config", "keyboard-config", "edit-rules", "menu-config", "onScroll", "onKeydown"]), createCommentVNode(" `${refreshRow}\u6761\u66F4\u65B0` "), withDirectives(createElementVNode("div", {
         class: "refresh",
         onClick: hanldeClickRefresh
       }, [createVNode(unref(NIcon), {

package/es/packages/form-render/src/components/renderer/combination.js

@@ -3,7 +3,7 @@ import { isField } from '@formily/core';
 import { Path } from '../../../../../node_modules/@formily/path/esm/index.js';
 import { flatten, isNumber } from 'lodash-es';
 import { useFormField } from '../../../../../packages/form-render';
-import { arrayed, assignUpdateValue, formRenderLog } from '../../utils/index.js';
+import { arrayed, assignUpdateValue, mergeDeepProperties, formRenderLog } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { useDebounceFn, isObject } from '@vueuse/core';
 import { NButton } from 'naive-ui';
@@ -64,7 +64,7 @@ const script = defineComponent({
     });
     function add() {
       groupNum.value++;
-      _values.value.push({});
+      _values.value.push(mergeDeepProperties({}, props.getProperties()));
       emitChange();
     }
     function remove(idx) {
@@ -82,7 +82,7 @@ const script = defineComponent({
       immediate: true
     });
     const _values = ref([{}]);
-    function initValues(data) {
+    function initValues(data, withInitialData = false) {
       if (!data)
         return;
       try {
@@ -92,10 +92,10 @@ const script = defineComponent({
         parsed.forEach((v, idx) => {
           if (idx > maxGroupNum.value - 1)
             return;
-          if (isObject(v))
-            return _values.value[idx] = v;
-          _values.value[idx] = {};
-          formRenderLog(`invalid Object value ${v} in COMBINATION => ${props.title}[${idx}]`, "warn");
+          if (isObject(v)) {
+            _values.value[idx] = v;
+            withInitialData && mergeDeepProperties(v, props.getProperties());
+          }
         });
         groupNum.value = Math.min(_values.value.length, maxGroupNum.value);
       } catch (e) {
@@ -115,7 +115,10 @@ const script = defineComponent({
       }
     }
     watch(() => props.value, (value) => initValues(value));
-    onMounted(() => initValues(props.value));
+    onMounted(() => {
+      initValues(props.value || "[{}]", true);
+      emitChange();
+    });
     function stop(event) {
       event.stopPropagation();
     }

package/es/packages/form-render/src/utils/index.d.ts

@@ -12,6 +12,7 @@ export declare function transformDateFormat(format?: string): "date" | "datetime
 export declare function isIdCard(idCardNo: string): boolean;
 export declare function isMobile(mobile: string): boolean;
 export declare function parseBirthday(birthday: string): AgeContext;
+export declare function mergeDeepProperties(target: AnyObject, fieldList: FieldItem[], traverseProperties?: string[], property?: string, targetProperty?: string): AnyObject;
 export declare function parseIdCard(idCardNo: string): IdCardParseInfo;
 export declare function injectOrProvide<T>(key: InjectionKey<T>, creator: () => T): T;
 export declare function traverseDependKey(dependKeys: DependKeyType, handler: {

package/es/packages/form-render/src/utils/index.js

@@ -1,5 +1,6 @@
 import { inject, provide, computed, createVNode, Fragment } from 'vue';
-import { isArray, isObject, isString, isFunction } from 'lodash-es';
+import { isObject } from '@vue/shared';
+import { isArray, isString, isFunction } from 'lodash-es';
 import { FIELD_SEX_VALUE } from '../constants/index.js';
 import { isField } from '@formily/core';
 import differenceInDays from '../../../../node_modules/date-fns/esm/differenceInDays/index.js';
@@ -46,6 +47,33 @@ function parseBirthday(birthday) {
   result.age = result.year = differenceInYears(d, birthDate);
   return result;
 }
+function mergeDeepProperties(target, fieldList, traverseProperties = ["children", "properties", "suffixConfig"], property = "val_key", targetProperty = "default_val") {
+  function traverse(_target, _fieldList) {
+    _fieldList.forEach((field) => {
+      if (!isObject(field))
+        return;
+      if (targetPropertyFor(field) != null && _target[propertyFor(field)] == null) {
+        _target[propertyFor(field)] = targetPropertyFor(field);
+      }
+      traverseProperties.forEach((p) => {
+        if (!field[p])
+          return;
+        if (!_target[propertyFor(field)]) {
+          _target[propertyFor(field)] = {};
+        }
+        traverse(_target[propertyFor(field)], arrayed(field[p]));
+      });
+    });
+  }
+  traverse(target, fieldList);
+  return target;
+  function propertyFor(field) {
+    return field[property];
+  }
+  function targetPropertyFor(field) {
+    return field[targetProperty];
+  }
+}
 function parseIdCard(idCardNo) {
   const parseInner = (certificateNo, idxSexStart, birthYearSpan) => {
     const res = {};
@@ -172,4 +200,4 @@ function createInputSlot(props) {
   });
 }
 
-export { arrayed, assignUpdateValue, createInputSlot, createLinebarId, createSlot, elementIdEscape, fieldKeyEscape, formRenderLog, getParentLinebar, injectOrProvide, isIdCard, isMobile, parseBirthday, parseIdCard, queryDecorator, queryInput, transformDateFormat, traverseDependKey, traverseSchema, uuidGenerator };
+export { arrayed, assignUpdateValue, createInputSlot, createLinebarId, createSlot, elementIdEscape, fieldKeyEscape, formRenderLog, getParentLinebar, injectOrProvide, isIdCard, isMobile, mergeDeepProperties, parseBirthday, parseIdCard, queryDecorator, queryInput, transformDateFormat, traverseDependKey, traverseSchema, uuidGenerator };

package/es/packages/shortcut-provider/index.d.ts

@@ -1,17 +1,8 @@
 import { SFCWithInstall } from '../../../es/src/types';
 export * from './src/hooks';
 export * from './src/types';
-declare const ShortcutProvider: SFCWithInstall<import("vue").DefineComponent<{
-    cacheKey: StringConstructor;
-}, {
+declare const ShortcutProvider: SFCWithInstall<import("vue").DefineComponent<{}, {
     shortcutWrapperRef: import("vue").Ref<HTMLElement | undefined>;
-    props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
-        cacheKey: StringConstructor;
-    }>> & {
-        [x: `on${string}`]: ((...args: any[]) => any) | ((...args: unknown[]) => any) | undefined;
-    }>>;
     manager: import("./src/hooks").ShortcutManager;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    cacheKey: StringConstructor;
-}>>, {}>>;
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>>;
 export default ShortcutProvider;

package/es/packages/shortcut-provider/src/ShortcutProvider.js

@@ -5,13 +5,9 @@ import _export_sfc from '../../../_virtual/plugin-vue_export-helper.js';
 
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "ShortcutProvider",
-  props: {
-    cacheKey: String
-  },
   setup(__props) {
-    const props = __props;
     const shortcutWrapperRef = ref();
-    const manager = new ShortcutManager(shortcutWrapperRef, props.cacheKey).start();
+    const manager = new ShortcutManager(shortcutWrapperRef).start();
     provide(InjectionShortcutManager, manager);
     onBeforeUnmount(() => {
       manager.destroy();

package/es/packages/shortcut-provider/src/ShortcutProvider.vue.d.ts

@@ -1,15 +1,6 @@
 import { ShortcutManager } from '../../../../es/packages/shortcut-provider';
-declare const _default: import("vue").DefineComponent<{
-    cacheKey: StringConstructor;
-}, {
+declare const _default: import("vue").DefineComponent<{}, {
     shortcutWrapperRef: import("vue").Ref<HTMLElement | undefined>;
-    props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
-        cacheKey: StringConstructor;
-    }>> & {
-        [x: `on${string}`]: ((...args: any[]) => any) | ((...args: unknown[]) => any) | undefined;
-    }>>;
     manager: ShortcutManager;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    cacheKey: StringConstructor;
-}>>, {}>;
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
 export default _default;

package/es/packages/shortcut-provider/src/hooks/useShortcuts.d.ts

@@ -5,12 +5,13 @@ export declare class ShortcutManager {
     private readonly shortcutCache;
     private readonly environmentEle;
     private handle?;
+    disabled: boolean;
     static log(message: string, dryRun?: boolean): string;
-    constructor(environmentEle?: MaybeRef<HTMLElement | undefined>, cacheKey?: string);
-    get traverse(): unknown[];
-    query(key: string): any;
-    updateState(key: string, state?: boolean): void;
-    update(key: string, info: KeyboardEvent | Partial<ShortcutSignatureInfo>): void;
+    constructor(environmentEle?: MaybeRef<HTMLElement | undefined>);
+    get traverse(): Omit<ShortcutItem, "callback">[];
+    query(key: string): Omit<ShortcutItem, "callback">;
+    updateDisabled(key: string, state?: boolean): Promise<void>;
+    update(key: string, info?: KeyboardEvent | Partial<ShortcutSignatureInfo>): Promise<void>;
     register(shortcutItem: ShortcutItem): {
         stop: () => void;
         signature: () => string;
@@ -23,8 +24,10 @@ export declare function useShortcuts(glob?: boolean): {
         stop: () => void;
         signature: () => string;
     };
-    traverse: () => unknown[];
-    query: (key: string) => any;
+    traverse: () => Omit<ShortcutItem, "callback">[];
+    query: (key: string) => Omit<ShortcutItem, "callback">;
     update: (key: string, info: KeyboardEvent | Partial<ShortcutSignatureInfo>) => void;
-    updateState: (key: string, state?: boolean) => void;
+    onReset: (key: string) => void;
+    updateDisabled: (key: string, state?: boolean) => void;
+    updateManagerDisabled: (disabled?: boolean) => void;
 };

package/es/packages/shortcut-provider/src/hooks/useShortcuts.js

@@ -1,17 +1,15 @@
 import { ShortcutStatus, InjectionShortcutManager } from '../../../../packages/shortcut-provider/src/constants';
-import { getKeySignature, getDisplaySignature, isKeyboardEvent, findAncestor, isShortcutProvider } from '../../../../packages/shortcut-provider/src/utils';
-import { reactive, unref, getCurrentInstance, inject, onBeforeUnmount } from 'vue';
-import { useStorage, useEventListener, useDebounceFn } from '@vueuse/core';
+import { normalizeSignatureInfo, getKeySignature, getDisplaySignature, isInvalidSignature, isKeyboardEvent, findAncestor, isShortcutProvider } from '../../../../packages/shortcut-provider/src/utils';
+import { reactive, ref, unref, getCurrentInstance, inject, onBeforeUnmount } from 'vue';
+import { useEventListener, useDebounceFn } from '@vueuse/core';
 import { pick, omit, isFunction, isString } from 'lodash-es';
 
 class ShortcutManager {
-  constructor(environmentEle, cacheKey = "__shortcut__glob") {
+  constructor(environmentEle) {
     this.shortcutCallbackMap = reactive(/* @__PURE__ */ new Map());
+    this.shortcutCache = ref({});
+    this.disabled = false;
     this.environmentEle = environmentEle || window;
-    this.shortcutCache = useStorage(cacheKey, {}, localStorage, {
-      listenToStorageChanges: true,
-      deep: true
-    });
   }
   static log(message, dryRun = false) {
     const _message = `[ShortcutManager] ${message}`;
@@ -24,30 +22,43 @@ class ShortcutManager {
   query(key) {
     return this.shortcutCache.value[key];
   }
-  updateState(key, state) {
-    this.query(key) && (this.query(key).disabled = !!state);
-  }
-  update(key, info) {
+  async updateDisabled(key, state) {
     var _a;
+    const item = this.query(key);
+    await ((_a = item.onUpdateDisabled) == null ? void 0 : _a.call(item, key, state));
+    item.disabled = !!state;
+  }
+  async update(key, info) {
+    var _a, _b;
     const oldKeySignature = (_a = this.query(key)) == null ? void 0 : _a.currentKeySignature;
-    if (oldKeySignature === getKeySignature(info))
-      return;
-    if (Object.values(this.shortcutCache.value).some((v) => v.currentKeySignature === getKeySignature(info))) {
-      throw `\u91CD\u590D\u7684\u5FEB\u6377\u952E=> ${getDisplaySignature(info)}`;
-    }
+    info && checkSignature(this.shortcutCache, info);
     const item = this.query(key);
     if (!item)
       return;
-    item.currentKeySignature = getKeySignature(info);
-    this.shortcutCallbackMap.set(getKeySignature(info), this.shortcutCallbackMap.get(oldKeySignature));
+    const newInfo = await ((_b = item.onUpdate) == null ? void 0 : _b.call(item, key, info ? normalizeSignatureInfo(info) : void 0)) || info;
+    if (!newInfo)
+      return;
+    checkSignature(this.shortcutCache, newInfo);
+    item.currentKeySignature = getKeySignature(newInfo);
+    this.shortcutCallbackMap.set(item.currentKeySignature, this.shortcutCallbackMap.get(oldKeySignature));
     this.shortcutCallbackMap.delete(oldKeySignature);
+    function checkSignature(shortcutCache, info2) {
+      if (oldKeySignature === getKeySignature(info2))
+        return;
+      if (Object.values(shortcutCache.value).some((v) => v.currentKeySignature === getKeySignature(info2))) {
+        throw `\u91CD\u590D\u7684\u5FEB\u6377\u952E=> ${getDisplaySignature(info2)}`;
+      }
+      if (isInvalidSignature(info2)) {
+        throw `\u975E\u6CD5\u7684\u5FEB\u6377\u952E=>${info2.key}`;
+      }
+    }
   }
   register(shortcutItem) {
     const item = this.query(shortcutItem.key);
     if (item) {
       item.status = ShortcutStatus.ACTIVE;
       this.shortcutCallbackMap.set(item.currentKeySignature, shortcutItem.callback);
-      Object.assign(item, pick(shortcutItem, ["debounce", "debounceOption", "label", "defaultShortcut", "order", "key"]));
+      Object.assign(item, pick(shortcutItem, ["debounce", "debounceOption", "label", "order", "key"]));
       return createHandler(item);
     }
     this.shortcutCache.value[shortcutItem.key] = omit(shortcutItem, ["callback"]);
@@ -68,7 +79,7 @@ class ShortcutManager {
       return this;
     }
     this.handle = async (event) => {
-      if (!isKeyboardEvent(event))
+      if (!isKeyboardEvent(event) || this.disabled)
         return;
       const providerWrapper = findAncestor(event.target, isShortcutProvider);
       if (providerWrapper && providerWrapper !== unref(this.environmentEle)) {
@@ -107,10 +118,9 @@ function useShortcuts(glob = false) {
   function createShortcutItem(shortcut) {
     return {
       ...shortcut,
-      currentKeySignature: getKeySignature(shortcut.defaultShortcut),
+      currentKeySignature: getKeySignature(shortcut.shortcutSignature),
       key: keyFor(shortcut),
       status: ShortcutStatus.ACTIVE,
-      disabled: false,
       callback: callbackFor(shortcut)
     };
     function callbackFor(shortcut2) {
@@ -132,10 +142,10 @@ function useShortcuts(glob = false) {
   }
   function register(shortcut) {
     const { stop, signature } = manager.register(createShortcutItem(shortcut));
-    if (getCurrentInstance()) {
+    if (getCurrentInstance() && !glob) {
       onBeforeUnmount(stop);
     } else {
-      ShortcutManager.log("\u5728\u975Esetup\u8BED\u5883\u4E0B\u4F7F\u7528register\u51FD\u6570,\u7EC4\u4EF6\u9500\u6BC1\u65F6\u9700\u8981\u624B\u52A8\u8C03\u7528stop\u51FD\u6570\u4F7F\u5FEB\u6377\u952E\u5931\u6D3B");
+      ShortcutManager.log("\u5728\u975Esetup\u8BED\u5883\u4E0B\u4F7F\u7528register\u51FD\u6570,\u7EC4\u4EF6\u9500\u6BC1\u65F6\u53EF\u80FD\u9700\u8981\u624B\u52A8\u8C03\u7528stop\u51FD\u6570\u4F7F\u5FEB\u6377\u952E\u5931\u6D3B");
     }
     return { stop, signature };
   }
@@ -148,10 +158,16 @@ function useShortcuts(glob = false) {
   function update(key, info) {
     manager.update(key, info);
   }
-  function updateState(key, state) {
-    manager.updateState(key, state);
+  function onReset(key) {
+    manager.update(key);
+  }
+  function updateDisabled(key, state) {
+    manager.updateDisabled(key, state);
+  }
+  function updateManagerDisabled(disabled) {
+    manager.disabled = !!disabled;
   }
-  return { register, traverse, query, update, updateState };
+  return { register, traverse, query, update, onReset, updateDisabled, updateManagerDisabled };
 }
 
 export { ShortcutManager, useShortcuts };

package/es/packages/shortcut-provider/src/types/index.d.ts

@@ -1,4 +1,4 @@
-import { ArrayAble } from '../../../../../es/src/types';
+import { ArrayAble, WithUndefined } from '../../../../../es/src/types';
 import { VNode } from 'vue';
 import { ShortcutStatus } from '../../../../../es/packages/shortcut-provider/src/constants';
 declare type Render = () => ArrayAble<VNode>;
@@ -8,25 +8,53 @@ export interface ShortcutSignatureInfo {
     alt?: boolean;
     key: string;
 }
+declare type UpdateResult = Promise<WithUndefined<ShortcutSignatureInfo> | void>;
 export declare type ShortcutOption = {
     label: string | Render;
-    defaultShortcut: ShortcutSignatureInfo;
+    shortcutSignature: ShortcutSignatureInfo;
     callback(): void;
 } & Partial<{
+    /**
+     * @description 重置时回调
+     * @param key
+     */
+    onReset(key: string): Promise<any>;
+    /**
+     * @description 更新快捷键回调
+     * @param key
+     * @param newSignature 用户输入的快捷键签名
+     * @return
+     */
+    onUpdate(key: string, newSignature?: ShortcutSignatureInfo): UpdateResult;
+    /**
+     * @description 更新快捷键disabled状态回调
+     * @param key
+     * @param newState
+     */
+    onUpdateDisabled(key: string, newState?: boolean): Promise<any>;
+    /**
+     * 快捷键输入框展位文本
+     */
     placeholder: string;
+    /**
+     * 快捷键输入框编辑状态下的展位文本
+     */
     editPlaceholder: string;
     key: string;
     order: number;
+    disabled: boolean;
     debounce: boolean;
     debounceOption: {
         duration?: number;
     };
-    operation: Array<'disabled' | 'reset'>;
+    /**
+     * 快捷键编辑组件的操作按钮
+     */
+    operation: Array<'state' | 'reset'>;
 }>;
 export interface ShortcutItem extends ShortcutOption {
     status: ShortcutStatus;
     currentKeySignature: string;
     key: string;
-    disabled: boolean;
 }
 export {};

package/es/packages/shortcut-provider/src/utils/index.d.ts

@@ -1,6 +1,9 @@
 import { ShortcutSignatureInfo } from '../../../../../es/packages/shortcut-provider/src/types';
 export declare function isKeyboardEvent(event: any): event is KeyboardEvent;
+export declare function normalizeSignatureInfo(info: KeyboardEvent | Partial<ShortcutSignatureInfo>): Required<ShortcutSignatureInfo>;
 export declare function getKeySignature(info: KeyboardEvent | Partial<ShortcutSignatureInfo>): string;
+export declare function inKeyBlackList(key: string): boolean | undefined;
+export declare function isInvalidSignature(info: KeyboardEvent | Partial<ShortcutSignatureInfo>): boolean | undefined;
 export declare function getDisplaySignature(info: KeyboardEvent | Partial<ShortcutSignatureInfo>): string;
 export declare function transformKey2DisplaySignature(keySignature: string): string;
 export declare function isShortcutProvider(ele: HTMLElement): boolean;

package/es/packages/shortcut-provider/src/utils/index.js

@@ -1,3 +1,5 @@
+import { isString } from 'lodash-es';
+
 function isKeyboardEvent(event) {
   return Reflect.get(event, "view") === window && Reflect.get(event, "shiftKey") != void 0;
 }
@@ -21,12 +23,20 @@ function getKeySignature(info) {
   return `${ctrl ? "Ctrl_" : ""}${shift ? "Shift_" : ""}${alt ? "Alt_" : ""}${key}`;
 }
 const keyBlackList = ["CONTROL", "ALT", "SHIFT"];
-const inBlackList = (key) => {
-  return keyBlackList.includes(key);
-};
+function inKeyBlackList(key) {
+  if (!isString(key))
+    return;
+  return keyBlackList.includes(key.toUpperCase());
+}
+function isInvalidSignature(info) {
+  const { ctrl, shift, alt, key } = normalizeSignatureInfo(info);
+  if (!ctrl && !shift && !alt)
+    return !/F\d/.test(key);
+  return inKeyBlackList(key);
+}
 function getDisplaySignature(info) {
   const { ctrl, shift, alt, key } = normalizeSignatureInfo(info);
-  return `${ctrl ? "Ctrl+ " : ""}${alt ? "Alt + " : ""}${shift ? "Shift + " : ""}${inBlackList(key) ? "" : key}`;
+  return `${ctrl ? "Ctrl+ " : ""}${alt ? "Alt + " : ""}${shift ? "Shift + " : ""}${inKeyBlackList(key) ? "" : key}`;
 }
 function transformKey2DisplaySignature(keySignature) {
   return keySignature.replace(/_/g, " + ");
@@ -46,4 +56,4 @@ function findAncestor(ele, finder) {
   return next;
 }
 
-export { findAncestor, getDisplaySignature, getKeySignature, isKeyboardEvent, isShortcutProvider, transformKey2DisplaySignature };
+export { findAncestor, getDisplaySignature, getKeySignature, inKeyBlackList, isInvalidSignature, isKeyboardEvent, isShortcutProvider, normalizeSignatureInfo, transformKey2DisplaySignature };

package/es/packages/shortcut-setter/index.d.ts

@@ -59,10 +59,12 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
                 editPlaceholder: string;
                 operation: ("disabled" | "reset")[];
             };
-            query: (key: string) => any;
+            query: (key: string) => Omit<import("..").ShortcutItem, "callback">;
             update: (key: string, info: KeyboardEvent | Partial<import("..").ShortcutSignatureInfo>) => void;
-            updateState: (key: string, state?: boolean | undefined) => void;
-            shortcutItem: import("vue").ComputedRef<any>;
+            updateState: any;
+            onReset: (key: string) => void;
+            updateManagerDisabled: (disabled?: boolean | undefined) => void;
+            shortcutItem: import("vue").ComputedRef<Omit<import("..").ShortcutItem, "callback">>;
             disabledState: import("vue").ComputedRef<boolean>;
             currentSetShortcut: import("vue").ComputedRef<string>;
             state: import("vue").Ref<import("./constant").ShortcutInputState>;
@@ -79,7 +81,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
             updateDecorator: (fn: () => unknown, afterUpdate?: (() => void) | undefined) => void;
             onInputKeyUp: import("lodash").DebouncedFuncLeading<(event: KeyboardEvent) => void>;
             onStop: () => void;
-            onReset: () => void;
+            onSignatureReset: () => void;
             NButton: import("vue").DefineComponent<{
                 readonly color: StringConstructor;
                 readonly textColor: StringConstructor;

package/es/packages/shortcut-setter/src/ShortcutSetter.vue.d.ts

@@ -59,10 +59,12 @@ declare const _default: import("vue").DefineComponent<{
                 editPlaceholder: string;
                 operation: ("disabled" | "reset")[];
             };
-            query: (key: string) => any;
+            query: (key: string) => Omit<import("../../../../es/packages/shortcut-provider").ShortcutItem, "callback">;
             update: (key: string, info: KeyboardEvent | Partial<import("../../../../es/packages/shortcut-provider").ShortcutSignatureInfo>) => void;
-            updateState: (key: string, state?: boolean | undefined) => void;
-            shortcutItem: import("vue").ComputedRef<any>;
+            updateState: any;
+            onReset: (key: string) => void;
+            updateManagerDisabled: (disabled?: boolean | undefined) => void;
+            shortcutItem: import("vue").ComputedRef<Omit<import("../../../../es/packages/shortcut-provider").ShortcutItem, "callback">>;
             disabledState: import("vue").ComputedRef<boolean>;
             currentSetShortcut: import("vue").ComputedRef<string>;
             state: import("vue").Ref<import("../constant").ShortcutInputState>;
@@ -79,7 +81,7 @@ declare const _default: import("vue").DefineComponent<{
             updateDecorator: (fn: () => unknown, afterUpdate?: (() => void) | undefined) => void;
             onInputKeyUp: import("lodash").DebouncedFuncLeading<(event: KeyboardEvent) => void>;
             onStop: () => void;
-            onReset: () => void;
+            onSignatureReset: () => void;
             NButton: import("vue").DefineComponent<{
                 readonly color: StringConstructor;
                 readonly textColor: StringConstructor;

package/es/packages/shortcut-setter/src/ShortcutSetterItem.js

@@ -24,7 +24,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
-    const { query, update, updateState } = useShortcuts(props.glob);
+    const { query, update, updateState, onReset, updateManagerDisabled } = useShortcuts(props.glob);
     const shortcutItem = computed(() => {
       return query(props.fieldItem.val_key);
     });
@@ -49,11 +49,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return isEditState.value ? props.placeholder : props.editPlaceholder;
     });
     function onInputFocus() {
+      updateManagerDisabled(true);
       state.value = ShortcutInputState.EDIT;
     }
     const inputRef = ref();
     function onInputBlur() {
       var _a;
+      updateManagerDisabled(false);
       state.value = ShortcutInputState.STATIC;
       currentEditShortcut.value = "";
       (_a = inputRef.value) == null ? void 0 : _a.blur();
@@ -78,10 +80,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return;
       updateDecorator(() => updateState(props.fieldItem.val_key, !disabledState.value), onInputBlur);
     }
-    function onReset() {
+    function onSignatureReset() {
       if (!shortcutItem.value)
         return;
-      updateDecorator(() => update(props.fieldItem.val_key, shortcutItem.value.defaultShortcut), onInputBlur);
+      updateDecorator(() => onReset(props.fieldItem.val_key), onInputBlur);
     }
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("section", _hoisted_1, [
@@ -110,7 +112,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }, 8, ["type"])) : createCommentVNode("v-if", true),
           hasOperation("reset") ? (openBlock(), createBlock(unref(NPopconfirm), {
             key: 1,
-            onPositiveClick: onReset
+            onPositiveClick: onSignatureReset
           }, {
             trigger: withCtx(() => [
               createVNode(unref(NButton), {

package/es/packages/shortcut-setter/src/ShortcutSetterItem.vue.d.ts

@@ -49,10 +49,12 @@ declare const _default: import("vue").DefineComponent<{
         editPlaceholder: string;
         operation: Array<'disabled' | 'reset'>;
     };
-    query: (key: string) => any;
+    query: (key: string) => Omit<import("../../../../es/packages/shortcut-provider").ShortcutItem, "callback">;
     update: (key: string, info: KeyboardEvent | Partial<import("../../../../es/packages/shortcut-provider").ShortcutSignatureInfo>) => void;
-    updateState: (key: string, state?: boolean | undefined) => void;
-    shortcutItem: import("vue").ComputedRef<any>;
+    updateState: any;
+    onReset: (key: string) => void;
+    updateManagerDisabled: (disabled?: boolean | undefined) => void;
+    shortcutItem: import("vue").ComputedRef<Omit<import("../../../../es/packages/shortcut-provider").ShortcutItem, "callback">>;
     disabledState: import("vue").ComputedRef<boolean>;
     currentSetShortcut: import("vue").ComputedRef<string>;
     state: import("vue").Ref<ShortcutInputState>;
@@ -69,7 +71,7 @@ declare const _default: import("vue").DefineComponent<{
     updateDecorator: (fn: () => unknown, afterUpdate?: () => void) => void;
     onInputKeyUp: import("lodash").DebouncedFuncLeading<(event: KeyboardEvent) => void>;
     onStop: () => void;
-    onReset: () => void;
+    onSignatureReset: () => void;
     NButton: import("vue").DefineComponent<{
         readonly color: StringConstructor;
         readonly textColor: StringConstructor;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.15-beta.1",
+  "version": "3.1.15-beta.2",
   "license": "ISC",
   "module": "es/packages/index.js",
   "main": "es/packages/index.js",