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

package/es/packages/index.css

@@ -291,7 +291,7 @@ body > .vxe-table--tooltip-wrapper {
   width: 100%;
 }
 .custom-big-table .filter-box .text-over-tooltip-components {
-  max-width: calc(100% - 20px);
+  max-width: calc(100% - 40px);
 }
 .custom-big-table .filter-box .vxe-filter--btn {
   border-top-color: #c0c4cc;
@@ -539,6 +539,21 @@ body > .vxe-table--tooltip-wrapper {
   margin-right: 6px;
   box-shadow: 0px 2px 4px 0px rgba(99, 129, 249, 0.5);
 }
+.annotation-edit {
+  cursor: pointer;
+  color: #0067ee;
+  font-size: 16px;
+  user-select: none;
+  display: inline-flex;
+  align-items: center;
+}
+.annotation-edit.is-active {
+  color: rgba(255, 152, 40);
+}
+.annotation-edit__icon {
+  display: inline-flex;
+  align-items: center;
+}
 .no-data-tip {
   display: flex;
   flex-direction: column;
@@ -601,6 +616,17 @@ body > .vxe-table--tooltip-wrapper {
   fill: currentColor;
   overflow: hidden;
 }
+.vxe-header--column [annotation-hover-show='true'] {
+  visibility: hidden;
+}
+.vxe-header--column:hover [annotation-hover-show='true'] {
+  visibility: visible;
+}
+.big-table__annotationWrapper {
+  width: 20px;
+  display: inline-flex;
+  align-items: center;
+}
 .people-tree {
   display: flex;
 }
@@ -1027,15 +1053,6 @@ body > .vxe-table--tooltip-wrapper {
   height: 52px;
   line-height: 52px;
 }
-.c-field-set .set-show .alias-style {
-  outline: none;
-  border-radius: 4px 4px 4px 4px;
-  border: solid 1px #d5d5d5;
-  height: 32px;
-  text-indent: 16px;
-  color: #38454f;
-  width: 100%;
-}
 .c-field-set .set-show .is-sort-style {
   outline: none;
   border-radius: 4px 4px 4px 4px;
@@ -2694,7 +2711,7 @@ body > .vxe-table--tooltip-wrapper {
 @font-face {
   font-family: 'iconfont';
   /* Project id 3468756 */
-  src: url('./iconfont.ttf?t=1655348824139') format('truetype');
+  src: url('./iconfont.ttf') format('truetype');
 }
 .c-info-header .iconfont {
   font-family: 'iconfont' !important;
@@ -2830,7 +2847,8 @@ body > .vxe-table--tooltip-wrapper {
 .form-render__formItem {
   grid-column: span var(--form-item-column) / span var(--form-item-column);
 }
-.form-render__formItem .n-date-picker {
+.form-render__formItem .n-date-picker,
+.form-render__formItem .n-input-number {
   width: 100%;
 }
 .form-render__formItemLabel {
@@ -2847,6 +2865,15 @@ body > .vxe-table--tooltip-wrapper {
   transform: translateY(-50%);
   right: calc(var(--icon-right) * 1px);
 }
+.form-render__formItem .n-form-item-label {
+  display: inline-flex;
+}
+.form-render__formItem .n-form-item-label [annotation-hover-show='true'] {
+  visibility: hidden;
+}
+.form-render__formItem .n-form-item-label:hover [annotation-hover-show='true'] {
+  visibility: visible;
+}
 .form-render__linebar {
   grid-column: span var(--column) / span var(--column);
 }
@@ -2936,15 +2963,6 @@ body > .vxe-table--tooltip-wrapper {
   display: flex !important;
   gap: 0 8px;
 }
-.form-render .n-form-item-label {
-  display: inline-flex;
-}
-.form-render .n-form-item-label [annotation-hover-show='true'] {
-  visibility: hidden;
-}
-.form-render .n-form-item-label:hover [annotation-hover-show='true'] {
-  visibility: visible;
-}
 .c-fabric-chart-popup-tip,
 .c-fabric-chart-popup-menu {
   position: absolute;
@@ -3160,3 +3178,111 @@ body > .vxe-table--tooltip-wrapper {
 .nodeTipContent li p {
   margin: 0;
 }
+.form-config {
+  display: flex;
+  justify-content: space-between;
+}
+.form-config__material {
+  padding: 16px;
+  box-sizing: border-box;
+  width: 200px;
+  min-height: 400px;
+  background: white;
+}
+.form-config__materialHeader {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 40px;
+}
+.form-config__materialContent {
+  padding: 8px;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+.form-config__materialContentItem {
+  display: flex;
+  align-items: center;
+  padding: 8px;
+  border: 1px dashed #d9d9d9;
+  box-sizing: border-box;
+  background-color: #fafafa;
+  grid-column: span var(--item-column) / span var(--item-column);
+}
+.form-config__displayWrapper {
+  padding: 16px;
+  box-sizing: border-box;
+  flex: 1;
+  padding: 16px 0;
+}
+.form-config__displayHeader {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 40px;
+}
+.form-config__displayContent {
+  padding: 16px;
+  box-sizing: border-box;
+  height: fit-content;
+  background: #eeeeee;
+  display: grid !important;
+  grid-template-columns: repeat(12, minmax(0px, 1fr));
+  gap: 8px 16px;
+}
+.form-config__displayContentItem {
+  grid-column: span var(--item-column) / span var(--item-column);
+  position: relative;
+}
+.form-config__config {
+  padding: 16px;
+  box-sizing: border-box;
+  width: 220px;
+  background: white;
+}
+.form-config__renderer--default {
+  display: flex;
+  align-items: center;
+  padding: 8px;
+  border: 1px dashed #d9d9d9;
+  box-sizing: border-box;
+  background-color: #fafafa;
+  user-select: none;
+  position: relative;
+  width: 100%;
+}
+.form-config__renderer--complex {
+  border: 1px dashed lightblue;
+  padding: 8px;
+}
+.form-config__renderer--complex--grid {
+  display: grid !important;
+  grid-template-columns: repeat(12, minmax(0px, 1fr));
+  gap: 8px 16px;
+  grid-column: span var(--item-column) / span var(--item-column);
+}
+.form-config__renderer--complex--flex {
+  display: flex;
+}
+.form-config .is-disabled {
+  background: #e5e5e5;
+}
+.form-config .is-required {
+  padding-left: 16px !important;
+}
+.form-config .is-required::before {
+  position: absolute;
+  content: '*';
+  left: 8px;
+  color: red;
+}
+.form-config .is-active {
+  color: #5585f5;
+}
+.form-config .is-choosing {
+  box-shadow: #5585f5 0 0 0 2px !important;
+}
+.form-config .is-choosing-area {
+  background: #f0f7ff;
+}

package/es/packages/index.d.ts

@@ -19,12 +19,14 @@ import CFormRender from './form-render';
 import CFabricChart from './fabric-chart';
 import CShortcutProvider from './shortcut-provider';
 import CShortcutSetter from './shortcut-setter';
+import CFormConfig from './form-config';
 export * from './form-render';
 export * from './shortcut-provider';
 export * from './big-table';
 export * from './button-print';
+export * from './form-config';
 declare function install(app: App): void;
-export { CGrid, CBigTable, CFieldSet, CDragLayout, CButtonPrint, CSelectPerson, CSelectLabel, CLabelFormContent, CScaleView, CMap, CVodChunkUpload, CRadio, CCheckbox, CSelect, CDatetime, CFormTable, CInfoHeader, CTimeLine, CBpmnWorkflow, CStepsWheel, Editor, CFormRender, CFabricChart, CShortcutProvider, CShortcutSetter };
+export { CGrid, CBigTable, CFieldSet, CDragLayout, CButtonPrint, CSelectPerson, CSelectLabel, CLabelFormContent, CScaleView, CMap, CVodChunkUpload, CRadio, CCheckbox, CSelect, CDatetime, CFormTable, CInfoHeader, CTimeLine, CBpmnWorkflow, CStepsWheel, Editor, CFormRender, CFabricChart, CShortcutProvider, CShortcutSetter, CFormConfig };
 declare const _default: {
     install: typeof install;
 };

package/es/packages/index.js

@@ -38,6 +38,8 @@ import ShortcutProvider from './shortcut-provider/index.js';
 export { default as CShortcutProvider } from './shortcut-provider/index.js';
 import ShortcutSetter from './shortcut-setter/index.js';
 export { default as CShortcutSetter } from './shortcut-setter/index.js';
+import FormConfig from './form-config/index.js';
+export { default as CFormConfig } from './form-config/index.js';
 export { useFieldListAdaptor } from './form-render/src/hooks/useFieldListAdaptor.js';
 export { useFormRequest } from './form-render/src/hooks/useFormRequest.js';
 export { useCommonLog } from './form-render/src/hooks/useCommonLog.js';
@@ -82,7 +84,8 @@ const components = {
   CFormRender: FormRender,
   CFabricChart: FabricChart,
   CShortcutProvider: ShortcutProvider,
-  CShortcutSetter: ShortcutSetter
+  CShortcutSetter: ShortcutSetter,
+  CFormConfig: FormConfig
 };
 function install(app) {
   Object.values(components).forEach((component) => {

package/es/packages/info-header/index.d.ts

@@ -1965,9 +1965,7 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
             maxWidth: string;
             width: string;
         }>;
-        parsedContentStyle: import("vue").ComputedRef<"" | (import("vue").CSSProperties & {
-            maxWidth: string;
-        })>;
+        parsedContentStyle: import("vue").ComputedRef<{}>;
         displayContent: import("vue").ComputedRef<string>;
         InfoEllipsis: import("vue").DefineComponent<{
             content: {

package/es/packages/info-header/src/HiddenContent.js

@@ -23,7 +23,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     const parsedContentStyle = computed(() => {
       if (!props.width)
-        return "";
+        return {};
       const maxWidth = props.width - 40 + "px";
       return Object.assign({}, props.contentStyle, { maxWidth });
     });

package/es/packages/info-header/src/HiddenContent.vue.d.ts

@@ -35,9 +35,7 @@ declare const _default: import("vue").DefineComponent<{
         maxWidth: string;
         width: string;
     }>;
-    parsedContentStyle: import("vue").ComputedRef<"" | (CSSProperties & {
-        maxWidth: string;
-    })>;
+    parsedContentStyle: import("vue").ComputedRef<{}>;
     displayContent: import("vue").ComputedRef<string>;
     InfoEllipsis: import("vue").DefineComponent<{
         content: {

package/es/packages/info-header/src/InfoHeader.vue.d.ts

@@ -1966,9 +1966,7 @@ declare const _default: import("vue").DefineComponent<{
             maxWidth: string;
             width: string;
         }>;
-        parsedContentStyle: import("vue").ComputedRef<"" | (CSSProperties & {
-            maxWidth: string;
-        })>;
+        parsedContentStyle: import("vue").ComputedRef<{}>;
         displayContent: import("vue").ComputedRef<string>;
         InfoEllipsis: import("vue").DefineComponent<{
             content: {

package/es/packages/info-header/style/index.css

@@ -10,7 +10,7 @@
 @font-face {
   font-family: 'iconfont';
   /* Project id 3468756 */
-  src: url('./iconfont.ttf?t=1655348824139') format('truetype');
+  src: url('./iconfont.ttf') format('truetype');
 }
 .c-info-header .iconfont {
   font-family: 'iconfont' !important;

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 };