cnhis-design-vue 3.1.15-beta.9 → 3.1.16-beta.0

package/es/packages/form-config/style/index.css

@@ -6,7 +6,6 @@
   padding: 16px;
   box-sizing: border-box;
   width: 200px;
-  min-height: 400px;
   background: white;
 }
 .form-config__materialHeader {
@@ -17,6 +16,7 @@
 }
 .form-config__materialContent {
   padding: 8px;
+  min-height: 400px;
   display: flex;
   flex-direction: column;
   gap: 8px;

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

@@ -37,20 +37,20 @@ const script = defineComponent({
     const emitChange = useDebounceFn(function emitChange2() {
       emit("update:value", JSON.stringify(combinationData.value));
     }, 300);
-    const combinationData = ref([{}]);
+    const combinationData = ref([]);
     const currentGroupNum = computed(() => combinationData.value.length);
     function setCombinationData(data, withInitialData = false) {
       const parsedData = getParsedData(data);
       if (!needLoad(parsedData))
         return;
       parsedData.splice(maxGroupNum.value);
-      parsedData.forEach(setCombinationData2);
+      parsedData.forEach(setCombinationItemData);
       combinationData.value.splice(parsedData.length);
       combinationData.value.forEach(setFormRenderData);
       function needLoad(_data) {
         return !!_data && !isEqual(_data, combinationData.value);
       }
-      function setCombinationData2(v, idx) {
+      function setCombinationItemData(v, idx) {
         if (!isObject(v))
           return;
         combinationData.value[idx] = v;

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

@@ -1,7 +1,6 @@
 import { defineComponent, inject, computed, createVNode } from 'vue';
 import { isVoidField } from '@formily/core';
 import { connect, mapProps } from '@formily/vue';
-import { isBoolean } from 'lodash-es';
 import { NFormItem } from 'naive-ui';
 import AnnotationEdit from '../../../../../packages/annotation-edit';
 import { InjectionAnnotation } from '../../../../../packages/form-render/src/constants';
@@ -36,7 +35,7 @@ const script = defineComponent({
       }, null);
     }
     const showAnnotation = computed(() => {
-      return annotation.value && (!isBoolean(props.annotation) || props.annotation);
+      return annotation.value && props.annotation !== false;
     });
     const showLabel = computed(() => props.label && props.label !== " ");
     function renderLabel() {

package/es/packages/form-render/src/hooks/useFieldListAdaptor.js

@@ -1,7 +1,7 @@
 import { isObject } from '@vueuse/core';
 import { pick } from 'lodash-es';
 import { useFormValidator, useTypeNormalize } from '../../../../packages/form-render';
-import { fieldKeyEscape, arrayed, createLinebarId, elementIdEscape, transformDateFormat } from '../utils/index.js';
+import { fieldKeyEscape, arrayed, createLinebarId, elementIdEscape, parseNumberFromMaybeString, transformDateFormat } from '../utils/index.js';
 
 function useFieldListAdaptor(collector, uuid) {
   const { createValidatorSchema } = useFormValidator();
@@ -54,7 +54,7 @@ function useFieldListAdaptor(collector, uuid) {
       ...pick(item, ["lazyRequest", "urlConfig"]),
       options: item.option,
       multiple: item.multi_select === "0",
-      maxTagCount: +item.multi_select_value
+      maxTagCount: parseNumberFromMaybeString(item.multi_select_value)
     });
     return schema;
   };

package/es/packages/form-render/src/types/fieldItem.d.ts

@@ -111,6 +111,14 @@ export declare type FieldItem = {
     placeholder: string;
     validate: ValidateItem;
     option: OptionItem[];
+    /**
+     * 是否开启多选('0'表示开启, 值是反的)
+     */
+    multi_select: FormCommonState;
+    /**
+     * 多选时最大选择数量
+     */
+    multi_select_value: number | string;
     /**
      * 用于cascader控件提供层级参数
      */

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

@@ -15,6 +15,7 @@ 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 parseNumberFromMaybeString(value: unknown): unknown;
 export declare function traverseDependKey(dependKeys: DependKeyType, handler: {
     (dependKey: string, valueKey: string, required?: boolean): void;
 }): void;

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

@@ -1,6 +1,6 @@
 import { inject, provide, computed, createVNode, Fragment } from 'vue';
 import { isObject } from '@vue/shared';
-import { isString, isArray, isFunction } from 'lodash-es';
+import { isNumber, isString, isArray, isFunction } from 'lodash-es';
 import { FIELD_SEX_VALUE } from '../constants/index.js';
 import { isField } from '@formily/core';
 import { differenceInDays, differenceInMonths, differenceInYears } from 'date-fns';
@@ -101,6 +101,13 @@ function injectOrProvide(key, creator) {
   }
   return injected;
 }
+function parseNumberFromMaybeString(value) {
+  if (isNumber(value))
+    return value;
+  if (isString(value))
+    return +value;
+  return value;
+}
 function traverseDependKey(dependKeys, handler) {
   if (!dependKeys)
     return;
@@ -213,4 +220,4 @@ function createInputSlot(props) {
   });
 }
 
-export { arrayed, assignUpdateValue, createInputSlot, createLinebarId, createSlot, elementIdEscape, fieldKeyEscape, formRenderLog, getParentLinebar, injectOrProvide, isIdCard, isMobile, mergeDeepProperties, parseBirthday, parseIdCard, queryDecorator, queryInput, transformDateFormat, traverseDependKey, traverseSchema, uuidGenerator };
+export { arrayed, assignUpdateValue, createInputSlot, createLinebarId, createSlot, elementIdEscape, fieldKeyEscape, formRenderLog, getParentLinebar, injectOrProvide, isIdCard, isMobile, mergeDeepProperties, parseBirthday, parseIdCard, parseNumberFromMaybeString, queryDecorator, queryInput, transformDateFormat, traverseDependKey, traverseSchema, uuidGenerator };

package/es/packages/form-table/src/hooks/useNuiThemeOverrides.js

@@ -1,7 +1,7 @@
 function useNuiThemeOverrides() {
   const nuiThemeOverrides = {
     Input: { paddingMedium: "8px", paddingSmall: "8px", paddingLarge: "8px", paddingTiny: "8px" },
-    InternalSelection: { paddingSingle: "8px", paddingMultiple: "8px" },
+    InternalSelection: { paddingSingle: "8px", paddingMultiple: "2px" },
     Form: {
       feedbackHeightMedium: "16px",
       feedbackHeightLarge: "16px",

package/es/packages/index.css

@@ -3186,7 +3186,6 @@ body > .vxe-table--tooltip-wrapper {
   padding: 16px;
   box-sizing: border-box;
   width: 200px;
-  min-height: 400px;
   background: white;
 }
 .form-config__materialHeader {
@@ -3197,6 +3196,7 @@ body > .vxe-table--tooltip-wrapper {
 }
 .form-config__materialContent {
   padding: 8px;
+  min-height: 400px;
   display: flex;
   flex-direction: column;
   gap: 8px;

package/es/packages/index.d.ts

@@ -22,6 +22,7 @@ import CShortcutSetter from './shortcut-setter';
 import CFormConfig from './form-config';
 export * from './form-render';
 export * from './shortcut-provider';
+export * from './shortcut-setter';
 export * from './big-table';
 export * from './button-print';
 export * from './form-config';

package/es/packages/index.js

@@ -54,7 +54,7 @@ export { FormItemDepsCollector, useFormItemDeps } from './form-render/src/hooks/
 export { useInitialData } from './form-render/src/hooks/useInitialData.js';
 export { useAnchor } from './form-render/src/hooks/useAnchor.js';
 export { useFormContext } from './form-render/src/hooks/useFormContext.js';
-export { ShortcutManager, useShortcuts } from './shortcut-provider/src/hooks/useShortcuts.js';
+export { GlobalShortcutProvider, ShortcutManager, useShortcuts } from './shortcut-provider/src/hooks/useShortcuts.js';
 export { useShortcutSignature } from './shortcut-provider/src/hooks/useShortcutSignature.js';
 export { useColumnConfigAdaptor } from './big-table/src/hooks/useColumnConfigAdaptor.js';
 export { Print } from './button-print/src/utils/print.js';

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

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

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

@@ -1,7 +1,7 @@
 import { COMPONENT_NAMESPACE } from '../../src/global/variable';
 import { safeComponentRegister } from '../../src/utils';
 import script from './src/ShortcutProvider.js';
-export { ShortcutManager, useShortcuts } from './src/hooks/useShortcuts.js';
+export { GlobalShortcutProvider, ShortcutManager, useShortcuts } from './src/hooks/useShortcuts.js';
 export { useShortcutSignature } from './src/hooks/useShortcutSignature.js';
 
 const ShortcutProvider = script;

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

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

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

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

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

@@ -1,2 +1,2 @@
-export { ShortcutManager, useShortcuts } from './useShortcuts.js';
+export { GlobalShortcutProvider, ShortcutManager, useShortcuts } from './useShortcuts.js';
 export { useShortcutSignature } from './useShortcutSignature.js';

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

@@ -1,5 +1,6 @@
-import { ShortcutItem, ShortcutOption, ShortcutSignatureInfo } from '../../../../../es/packages/shortcut-provider/src/types';
 import { MaybeRef } from '@vueuse/core';
+import { ShortcutItem, ShortcutOption, ShortcutSignatureInfo } from '../../../../../es/packages/shortcut-provider/src/types';
+export declare const GlobalShortcutProvider: unique symbol;
 export declare class ShortcutManager {
     private readonly shortcutCallbackMap;
     private readonly shortcutCache;
@@ -7,27 +8,26 @@ export declare class ShortcutManager {
     private handle?;
     disabled: boolean;
     static log(message: string, dryRun?: boolean): string;
-    constructor(environmentEle?: MaybeRef<HTMLElement | undefined>);
+    constructor(environmentEle?: MaybeRef<HTMLElement | undefined>, scope?: string | Symbol);
     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>;
+    private query;
+    update(key: string, info: KeyboardEvent | Partial<ShortcutSignatureInfo>): Promise<void>;
     register(shortcutItem: ShortcutItem): {
         stop: () => void;
+        start: () => void;
         signature: () => string;
     };
     start(): this;
     destroy(): void;
+    clear(): void;
 }
-export declare function useShortcuts(glob?: boolean): {
+export declare function useShortcuts(scope?: MaybeRef<string | Symbol | undefined>): {
     register: (shortcut: ShortcutOption) => {
         stop: () => void;
         signature: () => string;
     };
     traverse: () => Omit<ShortcutItem, "callback">[];
-    query: (key: string) => Omit<ShortcutItem, "callback">;
-    update: (key: string, info: KeyboardEvent | Partial<ShortcutSignatureInfo>) => void;
-    onReset: (key: string) => void;
-    updateDisabled: (key: string, state?: boolean) => void;
+    clear: () => void;
+    update: (key: string, info: KeyboardEvent | Partial<ShortcutSignatureInfo>) => Promise<void>;
     updateManagerDisabled: (disabled?: boolean) => void;
 };

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

@@ -1,15 +1,18 @@
-import { ShortcutStatus, InjectionShortcutManager } from '../../../../packages/shortcut-provider/src/constants';
-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';
+import { reactive, ref, unref, computed, getCurrentInstance, inject, onBeforeUnmount, onDeactivated, onActivated } from 'vue';
+import { ShortcutStatus, InjectionShortcutManager } from '../../../../packages/shortcut-provider/src/constants';
+import { normalizeSignatureInfo, getKeySignature, getDisplaySignature, isInvalidSignature, isKeyboardEvent, findAncestor, isShortcutProvider } from '../../../../packages/shortcut-provider/src/utils';
 
+const GlobalShortcutProvider = Symbol("Glob");
+const ShortcutManagerCacheMap = /* @__PURE__ */ new Map();
 class ShortcutManager {
-  constructor(environmentEle) {
+  constructor(environmentEle, scope = GlobalShortcutProvider) {
     this.shortcutCallbackMap = reactive(/* @__PURE__ */ new Map());
     this.shortcutCache = ref({});
     this.disabled = false;
     this.environmentEle = environmentEle || window;
+    ShortcutManagerCacheMap.set(scope, this);
   }
   static log(message, dryRun = false) {
     const _message = `[ShortcutManager] ${message}`;
@@ -22,12 +25,6 @@ class ShortcutManager {
   query(key) {
     return this.shortcutCache.value[key];
   }
-  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;
@@ -35,11 +32,10 @@ class ShortcutManager {
     const item = this.query(key);
     if (!item)
       return;
-    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);
+    await ((_b = item.onUpdate) == null ? void 0 : _b.call(item, key, info ? normalizeSignatureInfo(info) : void 0));
+    checkSignature(this.shortcutCache, info);
+    item.currentKeySignature = getKeySignature(info);
+    item.shortcutSignature = normalizeSignatureInfo(info);
     this.shortcutCallbackMap.set(item.currentKeySignature, this.shortcutCallbackMap.get(oldKeySignature));
     this.shortcutCallbackMap.delete(oldKeySignature);
     function checkSignature(shortcutCache, info2) {
@@ -69,6 +65,9 @@ class ShortcutManager {
         stop: () => {
           shortcut.status = ShortcutStatus.INACTIVE;
         },
+        start: () => {
+          shortcut.status = ShortcutStatus.ACTIVE;
+        },
         signature: () => shortcut.currentKeySignature
       };
     }
@@ -101,23 +100,35 @@ class ShortcutManager {
     var _a;
     this.handle && ((_a = unref(this.environmentEle)) == null ? void 0 : _a.removeEventListener("keyup", this.handle, { capture: true }));
     this.handle = void 0;
+    this.clear();
+  }
+  clear() {
     this.shortcutCallbackMap.clear();
+    this.shortcutCache.value = {};
   }
 }
 const globManager = new ShortcutManager().start();
-function useShortcuts(glob = false) {
+function useShortcuts(scope) {
   function useManager() {
-    if (getCurrentInstance() && !glob) {
-      return inject(InjectionShortcutManager, globManager);
-    } else {
-      ShortcutManager.log("\u975Esetup\u8BED\u5883\u4E0B\u7684shortcut\u5C06\u5F71\u54CD\u5168\u5C40");
-      return globManager;
-    }
+    return computed(() => {
+      if (unref(scope)) {
+        const result = ShortcutManagerCacheMap.get(unref(scope));
+        if (!result)
+          ShortcutManager.log(`\u4E0D\u5B58\u5728\u7684scope=>${scope}, \u5C06\u4F7F\u7528\u5168\u5C40\u5FEB\u6377\u952E`);
+        return result || globManager;
+      } else if (getCurrentInstance()) {
+        return inject(InjectionShortcutManager, globManager);
+      } else {
+        ShortcutManager.log("\u975Esetup\u8BED\u5883\u4E0B\u7684shortcut\u5C06\u5F71\u54CD\u5168\u5C40");
+        return globManager;
+      }
+    });
   }
   const manager = useManager();
   function createShortcutItem(shortcut) {
     return {
       ...shortcut,
+      shortcutSignature: normalizeSignatureInfo(shortcut.shortcutSignature),
       currentKeySignature: getKeySignature(shortcut.shortcutSignature),
       key: keyFor(shortcut),
       status: ShortcutStatus.ACTIVE,
@@ -141,33 +152,29 @@ function useShortcuts(glob = false) {
     }
   }
   function register(shortcut) {
-    const { stop, signature } = manager.register(createShortcutItem(shortcut));
-    if (getCurrentInstance() && !glob) {
+    const { stop, signature, start } = unref(manager).register(createShortcutItem(shortcut));
+    if (getCurrentInstance()) {
       onBeforeUnmount(stop);
+      onDeactivated(stop);
+      onActivated(start);
     } else {
       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 };
   }
   function traverse() {
-    return glob ? globManager.traverse : manager.traverse;
-  }
-  function query(key) {
-    return manager.query(key);
+    return unref(manager).traverse;
   }
   function update(key, info) {
-    manager.update(key, info);
-  }
-  function onReset(key) {
-    manager.update(key);
-  }
-  function updateDisabled(key, state) {
-    manager.updateDisabled(key, state);
+    return unref(manager).update(key, info);
   }
   function updateManagerDisabled(disabled) {
-    manager.disabled = !!disabled;
+    unref(manager).disabled = !!disabled;
+  }
+  function clear() {
+    unref(manager).clear();
   }
-  return { register, traverse, query, update, onReset, updateDisabled, updateManagerDisabled };
+  return { register, traverse, clear, update, updateManagerDisabled };
 }
 
-export { ShortcutManager, useShortcuts };
+export { GlobalShortcutProvider, ShortcutManager, useShortcuts };

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

@@ -1,37 +1,21 @@
-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>;
 export interface ShortcutSignatureInfo {
     ctrl?: boolean;
     shift?: boolean;
     alt?: boolean;
     key: string;
 }
-declare type UpdateResult = Promise<WithUndefined<ShortcutSignatureInfo> | void>;
 export declare type ShortcutOption = {
-    label: string | Render;
+    label: string;
     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>;
+    onUpdate(key: string, newSignature?: ShortcutSignatureInfo): Promise<void>;
     /**
      * 快捷键输入框展位文本
      */
@@ -57,4 +41,3 @@ export interface ShortcutItem extends ShortcutOption {
     currentKeySignature: string;
     key: string;
 }
-export {};