cnhis-design-vue 3.1.16-beta.9 → 3.1.17-beta.1

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

@@ -1,11 +1,11 @@
 import { isObject } from '@vueuse/core';
-import { pick } from 'lodash-es';
-import { useFormValidator, useTypeNormalize } from '../../../../packages/form-render';
+import { cloneDeep, pick } from 'lodash-es';
+import { useFormValidator, useFieldNormalize } from '../../../../packages/form-render';
 import { arrayed, parseNumberFromMaybeString, formRenderLog } from '../utils/index.js';
-import { fieldKeyEscape, createLinebarId, elementIdEscape } from '../utils/schema.js';
+import { fieldKeyEscape, createLinebarId } from '../utils/schema.js';
 import { transformDateFormat } from '../utils/business.js';
 
-function useFieldListAdaptor(collector, uuid) {
+function useFieldListAdaptor(collector) {
   const { createValidatorSchema } = useFormValidator();
   const createStandardSchema = (item) => {
     var _a;
@@ -14,6 +14,7 @@ function useFieldListAdaptor(collector, uuid) {
       type: (_a = item.fieldType) != null ? _a : "string",
       title: item.alias || item.name,
       "x-component": item.html_type,
+      default: item.default_val,
       "x-component-props": {
         placeholder: item.placeholder,
         clearable: item.is_empty === "0",
@@ -38,7 +39,6 @@ function useFieldListAdaptor(collector, uuid) {
           showLabel: item.hide_title !== "1",
           propertyKey: item.val_key,
           annotation: item.annotation,
-          id: elementIdEscape(`${uuid}-${item.val_key}`),
           ...item.decoratorProps || {}
         }
       });
@@ -102,6 +102,10 @@ function useFieldListAdaptor(collector, uuid) {
   };
   const createCombinationSchema = (item) => {
     const schema = createStandardSchema(item);
+    schema.type = "array";
+    if (item.jsonCombination !== false) {
+      schema["x-component"] = "JSON_COMBINATION";
+    }
     Object.assign(schema["x-decorator-props"], {
       showLabel: false,
       showFeedback: false
@@ -204,12 +208,12 @@ function useFieldListAdaptor(collector, uuid) {
       properties: schemaAdaptor(fieldList)
     };
   };
-  const { normalize } = useTypeNormalize();
+  const { FieldNormalizeWaterfallHook } = useFieldNormalize();
   function schemaAdaptor(fieldList) {
     let prevLinebar = null;
     return fieldList.reduce((fin, cur, idx) => {
       var _a;
-      normalize(cur);
+      cur = FieldNormalizeWaterfallHook.call(cloneDeep(cur));
       const obj_type = (_a = cur.validate) == null ? void 0 : _a.obj_type;
       obj_type && collector.collect(obj_type, cur.val_key);
       if (cur.html_type === "LINEBAR") {

package/es/packages/form-render/src/hooks/useFieldNormalize.d.ts

@@ -0,0 +1,5 @@
+import { SyncWaterfallHook } from '../../../../../es/src/utils/tapable';
+import { FieldItem } from '../types';
+export declare function useFieldNormalize(): {
+    FieldNormalizeWaterfallHook: SyncWaterfallHook<FieldItem, import("../../../../../es/src/utils/tapable").UnsetAdditionalOptions>;
+};

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

@@ -0,0 +1,58 @@
+import { SyncWaterfallHook } from '../../../../src/utils/tapable';
+import { FIELD_BUSINESS_TYPE } from '../../../../packages/form-render/src/constants';
+
+function useFieldNormalize() {
+  const FieldNormalizeWaterfallHook = new SyncWaterfallHook(["fieldItem"]);
+  FieldNormalizeWaterfallHook.tap("__block", (fieldItem) => {
+    if (["CHECKBOX_BLOCK", "RADIO_BLOCK"].includes(fieldItem.html_type)) {
+      fieldItem.__vertical = true;
+    }
+    return fieldItem;
+  });
+  FieldNormalizeWaterfallHook.tap("__line", (fieldItem) => {
+    if (["LINE_BREAKS"].includes(fieldItem.html_type)) {
+      fieldItem.__line = true;
+      fieldItem.is_show = "1";
+    }
+    return fieldItem;
+  });
+  FieldNormalizeWaterfallHook.tap("__age", (fieldItem) => {
+    if (fieldItem.html_type === "AGE") {
+      fieldItem.html_type = "INPUT_NUMBER";
+      fieldItem.suffixConfig = [
+        {
+          validate: { obj_type: FIELD_BUSINESS_TYPE.AGE_UNIT },
+          val_key: fieldItem.val_key_unit,
+          html_type: "SELECT",
+          option: fieldItem.option,
+          urlConfig: fieldItem.urlConfig
+        }
+      ];
+    }
+    return fieldItem;
+  });
+  const types = [
+    [["SEARCH", "PHONE_TYPE", "IDCARD_TYPE"], "SELECT"],
+    ["DIGITAL", "INPUT_NUMBER"],
+    ["CHECKBOX_BLOCK", "CHECKBOX"],
+    ["RADIO_BLOCK", "RADIO"],
+    [["DATE-INPUT", "DATETIME-INPUT"], "DATE"],
+    ["SWITCH_COMPONENT", "SWITCH"],
+    ["SLIDER_COMPONENT", "SLIDER"],
+    ["LINE_BREAKS", "LINEBAR"]
+  ];
+  FieldNormalizeWaterfallHook.tap("__normalize", (fieldItem) => {
+    types.some(([rule, target]) => {
+      const match = Array.isArray(rule) ? rule.includes(fieldItem.html_type) : rule === fieldItem.html_type;
+      return match && (fieldItem.html_type = target);
+    });
+    return fieldItem;
+  });
+  FieldNormalizeWaterfallHook.tap("__elem_width", (fieldItem) => {
+    fieldItem.elem_width = ~~((fieldItem.elem_width || 3) * 2);
+    return fieldItem;
+  });
+  return { FieldNormalizeWaterfallHook };
+}
+
+export { useFieldNormalize };

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

@@ -3,8 +3,6 @@ import { isFunction } from '@vueuse/core';
 
 function useFieldVisitor() {
   function traverse(fieldList, visitorMap, key = "val_key") {
-    if (!visitorMap)
-      return fieldList;
     return fieldList.reduce((fin, field) => {
       if (Array.isArray(field.children)) {
         field.children = traverse(field.children, visitorMap, key);
@@ -15,7 +13,7 @@ function useFieldVisitor() {
       if (field.suffixConfig) {
         field.suffixConfig = traverse(arrayed(field.suffixConfig), visitorMap, key);
       }
-      const visitor = visitorMap[field[key]];
+      const visitor = visitorMap == null ? void 0 : visitorMap[field[key]];
       let current = field;
       const before = [];
       const after = [];
@@ -31,8 +29,7 @@ function useFieldVisitor() {
           after.push(...arrayed(field2));
         }
       });
-      fin.push(...before, current, ...after);
-      return fin;
+      return fin.concat([...before, current, ...after]);
     }, []);
   }
   return { traverse };

package/es/packages/form-render/src/hooks/useFormRenderLifeCycle.d.ts

@@ -1,13 +1,13 @@
-import { WithUndefined } from '../../../../../es/src/types';
+import { UndefinedAble } from '../../../../../es/src/types';
 import { FormRenderLifeCycle, FormRenderProps } from '../../../../../es/packages/form-render';
 export declare function useFormRenderLifeCycle(props: FormRenderProps): {
     callLifeCycle: <T extends "onSetup" | "beforeRequest" | "afterRequest">(lifeCycleName: T, payload?: Parameters<Required<Partial<{
         onSetup(): void;
-        beforeRequest(fieldKey: string, params?: import("../../../../../es/src/types").AnyObject | undefined): void | WithUndefined<import("../../../../../es/src/types").AnyObject>;
+        beforeRequest(fieldKey: string, params?: import("../../../../../es/src/types").AnyObject | undefined): void | UndefinedAble<import("../../../../../es/src/types").AnyObject>;
         afterRequest(fieldKey: string, payload?: any): import("../../../../../es/src/types").AnyObject[];
-    }>>[T]> | undefined) => WithUndefined<ReturnType<Required<Partial<{
+    }>>[T]> | undefined) => UndefinedAble<ReturnType<Required<Partial<{
         onSetup(): void;
-        beforeRequest(fieldKey: string, params?: import("../../../../../es/src/types").AnyObject | undefined): void | WithUndefined<import("../../../../../es/src/types").AnyObject>;
+        beforeRequest(fieldKey: string, params?: import("../../../../../es/src/types").AnyObject | undefined): void | UndefinedAble<import("../../../../../es/src/types").AnyObject>;
         afterRequest(fieldKey: string, payload?: any): import("../../../../../es/src/types").AnyObject[];
     }>>[T]>>;
 };

package/es/packages/form-render/src/hooks/useFormRequest.d.ts

@@ -1,7 +1,7 @@
-import { Func, WithNull } from '../../../../../es/src/types';
+import { Func, Nullable } from '../../../../../es/src/types';
 declare type RequestInstance = Record<string, Func>;
 export declare function useFormRequest(): {
-    getHttpInstance: () => WithNull<RequestInstance>;
+    getHttpInstance: () => Nullable<RequestInstance>;
     registGlobHttpInstance: (instance: RequestInstance) => void;
 };
 export {};

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

@@ -171,6 +171,10 @@ export declare type FieldItem = {
      * COMBINATION控件最大表单组数量
      */
     maxGroupNum: number;
+    /**
+     * COMBINATION json format
+     */
+    jsonCombination: boolean;
     /**
      * COMBINATION控件子项
      */

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

@@ -1,4 +1,4 @@
-import { AnyObject, WithUndefined } from '../../../../../es/src/types';
+import { AnyObject, UndefinedAble } from '../../../../../es/src/types';
 import { DataField, Field } from '@formily/core';
 import { ISchema } from '@formily/json-schema/esm/types';
 import { Component, FunctionalComponent } from 'vue';
@@ -25,7 +25,7 @@ export declare type FormAsyncQueue = AsyncQueue<FormAsyncQueueItem, any, AnyObje
 export declare type AgeContext = Record<'age' | 'day' | 'month' | 'year', number>;
 export declare type IdCardParseInfo = Record<'sex' | 'birthday', string> & AgeContext;
 export declare type FormRenderExpose = {
-    validate(path?: string): Promise<void>;
+    validate(path?: string): Promise<unknown>;
     getFormValues(): AnyObject;
     setFieldState(path: string, setter: (field: Field) => void): void;
     resetFields(path?: string): void;
@@ -43,7 +43,7 @@ export declare type FormChangePayload = {
     fieldKey: string;
     fieldName: string;
     fieldInstance: DataField;
-    context: FormChangeContext;
+    context?: FormChangeContext;
 };
 export declare type DependKeyType = string | Record<string, string> | Array<{
     paramName: string;
@@ -52,7 +52,7 @@ export declare type DependKeyType = string | Record<string, string> | Array<{
 } | string>;
 export declare type FormRenderLifeCycle = Partial<{
     onSetup(): void;
-    beforeRequest(fieldKey: string, params?: AnyObject): WithUndefined<AnyObject> | void;
+    beforeRequest(fieldKey: string, params?: AnyObject): UndefinedAble<AnyObject> | void;
     afterRequest(fieldKey: string, payload?: any): AnyObject[];
 }>;
 export declare type FormRenderProps = Partial<{

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

@@ -1,6 +1,6 @@
-import { WithNull } from '../../../../../es/src/types';
+import { Nullable } from '../../../../../es/src/types';
 export declare function queryDecorator(key: string, wrapperElement: HTMLElement, formUUID: string): HTMLElement | null;
-export declare function queryInput(decoratorElement?: WithNull<HTMLElement>): {
+export declare function queryInput(decoratorElement?: Nullable<HTMLElement>): {
     widgetElement: HTMLInputElement | null | undefined;
     widgetElementList: HTMLInputElement[];
 };

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

@@ -1,9 +1,10 @@
 import { inject, provide, computed, createVNode, Fragment } from 'vue';
+import { Path } from '@formily/path';
 import { isObject } from '@vue/shared';
 import { isNumber, isString, isFunction } from 'lodash-es';
 export { isIdCard, isMobile, parseAge2Birthday, parseAge2FromContext, parseBirthday, parseIdCard, transformDateFormat } from './business.js';
 export { queryDecorator, queryInput } from './dom.js';
-export { assignUpdateValue, createLinebarId, elementIdEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseFieldList, traverseSchema } from './schema.js';
+export { assignUpdateValue, createLinebarId, createObjSchema, elementIdEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseFieldList, traverseSchema } from './schema.js';
 
 function formRenderLog(message, type = "log") {
   console[type](`[FormRender]: ${message}`);
@@ -19,7 +20,7 @@ function mergeDeepProperties(target, fieldList, traverseProperties = ["children"
       if (!isObject(field))
         return;
       if (targetPropertyFor(field) != null && _target[propertyFor(field)] == null) {
-        _target[propertyFor(field)] = targetPropertyFor(field);
+        Path.setIn(_target, propertyFor(field), targetPropertyFor(field));
       }
       traverseProperties.forEach((p) => {
         if (!field[p])

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

@@ -1,4 +1,4 @@
-import { AnyObject, WithNull } from '../../../../../es/src/types';
+import { AnyObject } from '../../../../../es/src/types';
 import { GeneralField } from '@formily/core';
 import { ISchema } from '@formily/json-schema/esm/types';
 import { DependKeyType, FieldItem } from '../../../../../es/packages/form-render';
@@ -9,8 +9,68 @@ export declare function createLinebarId(id: string): string;
 export declare function traverseDependKey(dependKeys: DependKeyType, handler: {
     (dependKey: string, valueKey: string, required?: boolean): void;
 }): void;
-export declare function getParentLinebar(key: string, fieldList: FieldItem[]): WithNull<string>;
+export declare function getParentLinebar(key: string, fieldList: FieldItem[]): string | null;
 export declare function assignUpdateValue(props: AnyObject, field: GeneralField): {
     [x: string]: any;
 };
 export declare function traverseFieldList(fieldList: FieldItem[], handler: (field: FieldItem) => void): void;
+export declare function createObjSchema(properties: Record<string, ISchema>): {
+    type: string;
+    properties: Record<string, import("@formily/json-schema/esm/types").Stringify<{
+        [key: symbol]: any;
+        [key: `x-${string}`]: any;
+        [key: `x-${number}`]: any;
+        version?: string | undefined;
+        name?: import("@formily/json-schema/esm/types").SchemaKey | undefined;
+        title?: any;
+        description?: any;
+        default?: any;
+        readOnly?: boolean | undefined;
+        writeOnly?: boolean | undefined;
+        type?: import("@formily/json-schema/esm/types").SchemaTypes | undefined;
+        enum?: import("@formily/json-schema/esm/types").SchemaEnum<any> | undefined;
+        const?: any;
+        multipleOf?: number | undefined;
+        maximum?: number | undefined;
+        exclusiveMaximum?: number | undefined;
+        minimum?: number | undefined;
+        exclusiveMinimum?: number | undefined;
+        maxLength?: number | undefined;
+        minLength?: number | undefined;
+        pattern?: string | RegExp | undefined;
+        maxItems?: number | undefined;
+        minItems?: number | undefined;
+        uniqueItems?: boolean | undefined;
+        maxProperties?: number | undefined;
+        minProperties?: number | undefined;
+        required?: string | boolean | string[] | undefined;
+        format?: string | undefined;
+        $ref?: string | undefined;
+        $namespace?: string | undefined;
+        definitions?: import("@formily/json-schema/esm/types").SchemaProperties<any, any, any, any, any, any, any, any> | undefined;
+        properties?: import("@formily/json-schema/esm/types").SchemaProperties<any, any, any, any, any, any, any, any> | undefined;
+        items?: import("@formily/json-schema/esm/types").SchemaItems<any, any, any, any, any, any, any, any> | undefined;
+        additionalItems?: import("@formily/json-schema/esm/types").Stringify<any> | undefined;
+        patternProperties?: import("@formily/json-schema/esm/types").SchemaProperties<any, any, any, any, any, any, any, any> | undefined;
+        additionalProperties?: import("@formily/json-schema/esm/types").Stringify<any> | undefined;
+        "x-value"?: any;
+        "x-index"?: number | undefined;
+        "x-pattern"?: any;
+        "x-display"?: any;
+        "x-validator"?: any;
+        "x-decorator"?: any;
+        "x-decorator-props"?: any;
+        "x-component"?: any;
+        "x-component-props"?: any;
+        "x-reactions"?: import("@formily/json-schema/esm/types").SchemaReactions<any> | undefined;
+        "x-content"?: any;
+        "x-data"?: any;
+        "x-visible"?: boolean | undefined;
+        "x-hidden"?: boolean | undefined;
+        "x-disabled"?: boolean | undefined;
+        "x-editable"?: boolean | undefined;
+        "x-read-only"?: boolean | undefined;
+        "x-read-pretty"?: boolean | undefined;
+        "x-compile-omitted"?: string[] | undefined;
+    }>>;
+};

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

@@ -14,7 +14,7 @@ function fieldKeyEscape(fieldList) {
   return fieldList.map((f) => f.val_key).join("-").replace(/[.]/g, "_");
 }
 function elementIdEscape(id) {
-  return id.replace(".", "-");
+  return id.replace(/[.]/g, "-");
 }
 function createLinebarId(id) {
   return elementIdEscape(`id-${id}`);
@@ -90,5 +90,8 @@ function traverseFieldList(fieldList, handler) {
   }
   traverse(fieldList);
 }
+function createObjSchema(properties) {
+  return { type: "object", properties };
+}
 
-export { assignUpdateValue, createLinebarId, elementIdEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseFieldList, traverseSchema };
+export { assignUpdateValue, createLinebarId, createObjSchema, elementIdEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseFieldList, traverseSchema };

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

@@ -105,6 +105,10 @@
   padding: 0;
   margin: 0;
 }
+.form-render__combinationHeader .n-button__icon {
+  font-size: 14px;
+  margin: 0 2px 0 0;
+}
 .form-render__combinationHeaderText {
   font-size: 16px;
   font-weight: 500;
@@ -115,18 +119,17 @@
   top: 5px;
   width: 14px;
   height: 14px;
-  border-radius: 50%;
-  background: red;
-  cursor: pointer;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  color: white;
-  vertical-align: middle;
   font-size: 16px;
 }
+.form-render__combinationContentJson {
+  position: relative;
+}
 .form-render__combinationContent {
   position: relative;
+  display: grid !important;
+  grid-template-columns: repeat(var(--column), minmax(0px, 1fr));
+  align-items: start;
+  gap: 0 16px;
 }
 .form-render__complex {
   width: 100%;

package/es/packages/index.css

@@ -2926,6 +2926,10 @@ body > .vxe-table--tooltip-wrapper {
   padding: 0;
   margin: 0;
 }
+.form-render__combinationHeader .n-button__icon {
+  font-size: 14px;
+  margin: 0 2px 0 0;
+}
 .form-render__combinationHeaderText {
   font-size: 16px;
   font-weight: 500;
@@ -2936,18 +2940,17 @@ body > .vxe-table--tooltip-wrapper {
   top: 5px;
   width: 14px;
   height: 14px;
-  border-radius: 50%;
-  background: red;
-  cursor: pointer;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  color: white;
-  vertical-align: middle;
   font-size: 16px;
 }
+.form-render__combinationContentJson {
+  position: relative;
+}
 .form-render__combinationContent {
   position: relative;
+  display: grid !important;
+  grid-template-columns: repeat(var(--column), minmax(0px, 1fr));
+  align-items: start;
+  gap: 0 16px;
 }
 .form-render__complex {
   width: 100%;
@@ -3248,7 +3251,7 @@ body > .vxe-table--tooltip-wrapper {
   padding: 16px;
   box-sizing: border-box;
   flex-shrink: 0;
-  width: 220px;
+  width: 240px;
   background: white;
 }
 .form-config__configHeader {

package/es/packages/index.js

@@ -46,12 +46,11 @@ export { useCommonLog } from './form-render/src/hooks/useCommonLog.js';
 export { useFormField } from './form-render/src/hooks/useFormField.js';
 export { AsyncQueue, useAsyncQueue } from './form-render/src/hooks/useAsyncQueue.js';
 export { useFieldVisitor } from './form-render/src/hooks/useFieldVisitor.js';
-export { useTypeNormalize } from './form-render/src/hooks/useTypeNormalize.js';
+export { useFieldNormalize } from './form-render/src/hooks/useFieldNormalize.js';
 export { useFormValidator } from './form-render/src/hooks/useFormValidator.js';
 export { BusinessCollector, useBusinessBinding } from './form-render/src/hooks/useBusinessBinding.js';
 export { ContextCollector, useChangeContext } from './form-render/src/hooks/useChangeContext.js';
 export { FormItemDepsCollector, useFormItemDeps } from './form-render/src/hooks/useFormItemDeps.js';
-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 { GlobalShortcutProvider, ShortcutManager, useShortcuts } from './shortcut-provider/src/hooks/useShortcuts.js';

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

@@ -88,6 +88,7 @@ class ShortcutManager {
       const callback = this.shortcutCallbackMap.get(keySignature);
       if (!callback)
         return;
+      event.preventDefault();
       const shortcutItem = Object.values(this.shortcutCache.value).find((item) => item.currentKeySignature === keySignature);
       if (!shortcutItem || shortcutItem.status !== ShortcutStatus.ACTIVE || shortcutItem.disabled)
         return;

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

@@ -122,6 +122,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
         content?: string | import("..").FormRenderer | Record<string, import("..").FormRenderer> | undefined;
         lazyRequest?: boolean | undefined;
         maxGroupNum?: number | undefined;
+        jsonCombination?: boolean | undefined;
         children?: any[] | undefined;
         properties?: any[] | undefined;
         componentProps?: import("../../../es/src/types").AnyObject | undefined;
@@ -1807,7 +1808,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
         lifeCycle: {
             type: import("vue").PropType<Partial<{
                 onSetup(): void;
-                beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject>;
+                beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").UndefinedAble<import("../../../es/src/types").AnyObject>;
                 afterRequest(fieldKey: string, payload?: any): import("../../../es/src/types").AnyObject[];
             }>>;
         };
@@ -1922,7 +1923,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
             lifeCycle: {
                 type: import("vue").PropType<Partial<{
                     onSetup(): void;
-                    beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject>;
+                    beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").UndefinedAble<import("../../../es/src/types").AnyObject>;
                     afterRequest(fieldKey: string, payload?: any): import("../../../es/src/types").AnyObject[];
                 }>>;
             };
@@ -1931,7 +1932,9 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
         }>>;
         emit: (event: "formChange", ...args: any[]) => void;
         nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-        formModel: import("@formily/core").Form<any>;
+        formModel: import("@formily/core").Form<{
+            [x: string]: any;
+        }>;
         SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
         businessCollector: import("..").BusinessCollector;
         formItemDepsCollector: import("..").FormItemDepsCollector;
@@ -3422,7 +3425,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
         lifeCycle: {
             type: import("vue").PropType<Partial<{
                 onSetup(): void;
-                beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject>;
+                beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").UndefinedAble<import("../../../es/src/types").AnyObject>;
                 afterRequest(fieldKey: string, payload?: any): import("../../../es/src/types").AnyObject[];
             }>>;
         };

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

@@ -124,6 +124,7 @@ declare const _default: import("vue").DefineComponent<{
         content?: string | import("../../../../es/packages/form-render").FormRenderer | Record<string, import("../../../../es/packages/form-render").FormRenderer> | undefined;
         lazyRequest?: boolean | undefined;
         maxGroupNum?: number | undefined;
+        jsonCombination?: boolean | undefined;
         children?: any[] | undefined;
         properties?: any[] | undefined;
         componentProps?: import("../../../../es/src/types").AnyObject | undefined;
@@ -1809,7 +1810,7 @@ declare const _default: import("vue").DefineComponent<{
         lifeCycle: {
             type: import("vue").PropType<Partial<{
                 onSetup(): void;
-                beforeRequest(fieldKey: string, params?: import("../../../../es/src/types").AnyObject | undefined): void | import("../../../../es/src/types").WithUndefined<import("../../../../es/src/types").AnyObject>;
+                beforeRequest(fieldKey: string, params?: import("../../../../es/src/types").AnyObject | undefined): void | import("../../../../es/src/types").UndefinedAble<import("../../../../es/src/types").AnyObject>;
                 afterRequest(fieldKey: string, payload?: any): import("../../../../es/src/types").AnyObject[];
             }>>;
         };
@@ -1924,7 +1925,7 @@ declare const _default: import("vue").DefineComponent<{
             lifeCycle: {
                 type: import("vue").PropType<Partial<{
                     onSetup(): void;
-                    beforeRequest(fieldKey: string, params?: import("../../../../es/src/types").AnyObject | undefined): void | import("../../../../es/src/types").WithUndefined<import("../../../../es/src/types").AnyObject>;
+                    beforeRequest(fieldKey: string, params?: import("../../../../es/src/types").AnyObject | undefined): void | import("../../../../es/src/types").UndefinedAble<import("../../../../es/src/types").AnyObject>;
                     afterRequest(fieldKey: string, payload?: any): import("../../../../es/src/types").AnyObject[];
                 }>>;
             };
@@ -1933,7 +1934,9 @@ declare const _default: import("vue").DefineComponent<{
         }>>;
         emit: (event: "formChange", ...args: any[]) => void;
         nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-        formModel: import("@formily/core").Form<any>;
+        formModel: import("@formily/core").Form<{
+            [x: string]: any;
+        }>;
         SchemaField: Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
         businessCollector: import("../../../../es/packages/form-render").BusinessCollector;
         formItemDepsCollector: import("../../../../es/packages/form-render").FormItemDepsCollector;
@@ -3424,7 +3427,7 @@ declare const _default: import("vue").DefineComponent<{
         lifeCycle: {
             type: import("vue").PropType<Partial<{
                 onSetup(): void;
-                beforeRequest(fieldKey: string, params?: import("../../../../es/src/types").AnyObject | undefined): void | import("../../../../es/src/types").WithUndefined<import("../../../../es/src/types").AnyObject>;
+                beforeRequest(fieldKey: string, params?: import("../../../../es/src/types").AnyObject | undefined): void | import("../../../../es/src/types").UndefinedAble<import("../../../../es/src/types").AnyObject>;
                 afterRequest(fieldKey: string, payload?: any): import("../../../../es/src/types").AnyObject[];
             }>>;
         };

package/es/src/types/index.d.ts

@@ -4,7 +4,7 @@ export declare type SFCWithInstall<T> = T & {
 };
 export declare type AnyObject = Record<string, any>;
 export declare type Func<T extends Array<any> = any[], P = any> = (...args: T) => P;
-export declare type WithNull<T> = T | null;
-export declare type WithUndefined<T> = T | undefined;
+export declare type Nullable<T> = T | null | undefined;
+export declare type UndefinedAble<T> = T | undefined;
 export declare type ArrayAble<T> = T | T[];
 export declare type MapValue<T> = T extends Map<any, infer P> ? P : any;

package/es/src/utils/index.d.ts

@@ -1,2 +1,3 @@
 import { App, Component } from 'vue';
 export declare function safeComponentRegister(app: App, component: Component, cName?: string | undefined, scheduler?: () => void): void;
+export declare function generateTimeFormat(format: string): string | undefined;

package/es/src/utils/index.js

@@ -1,3 +1,5 @@
+import { isString } from 'lodash-es';
+
 function safeComponentRegister(app, component, cName = component.name, scheduler) {
   if (!cName)
     throw new Error(`[CUI]: invalid component name for ${component}`);
@@ -11,5 +13,13 @@ function safeComponentRegister(app, component, cName = component.name, scheduler
     app.component(cName, component);
   }
 }
+function generateTimeFormat(format) {
+  if (!isString(format))
+    return;
+  const matched = format.match(/[Hms:]+/);
+  if (!matched)
+    return;
+  return matched[0];
+}
 
-export { safeComponentRegister };
+export { generateTimeFormat, safeComponentRegister };

package/es/src/utils/tapable/AsyncParallelBailHook.d.ts

@@ -0,0 +1,3 @@
+export default AsyncParallelBailHook;
+declare function AsyncParallelBailHook(args?: any[], name?: undefined): Hook;
+import Hook from "./Hook";