cnhis-design-vue 3.1.16-beta.7 → 3.1.16

package/es/packages/form-render/src/components/renderer/{combination → jsonCombination}/index.js

@@ -1,24 +1,25 @@
-import { defineComponent, ref, computed, watch, onMounted, createVNode, createTextVNode } from 'vue';
+import { defineComponent, ref, computed, watch, onMounted, createVNode } from 'vue';
 import { isField } from '@formily/core';
 import { Path } from '@formily/path';
-import { isNumber, isEqual } from 'lodash-es';
-import { useDeepValidate } from '../../../../../../packages/form-render/src/components/renderer/combination/hooks/useDeepValidate';
-import { mergeDeepProperties, formRenderLog } from '../../../utils/index.js';
+import { AddCircleOutline, RemoveCircle } from '@vicons/ionicons5';
+import { isNumber, isArray, isEqual } from 'lodash-es';
+import { useDeepValidate } from '../../../../../../packages/form-render/src/components/renderer/jsonCombination/hooks/useDeepValidate';
+import { formRenderLog, mergeDeepProperties } from '../../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { useDebounceFn, isObject } from '@vueuse/core';
-import { NButton } from 'naive-ui';
+import { NButton, NIcon } from 'naive-ui';
 import FormRender from '../../../FormRender.js';
 import { assignUpdateValue } from '../../../utils/schema.js';
 
 const script = defineComponent({
-  name: "FormCombination",
+  name: "FormJsonCombination",
   props: {
     title: {
       type: String,
       default: ""
     },
     value: {
-      type: String
+      type: [String, Array]
     },
     maxGroupNum: {
       type: Number
@@ -35,12 +36,18 @@ const script = defineComponent({
   setup(props, {
     emit
   }) {
+    formRenderLog("\u5F53\u524DCOMBINATION\u63A7\u4EF6\u4E3Ajson\u6A21\u5F0F,\u63A8\u8350\u4F7F\u7528\u975Ejson\u6A21\u5F0F,FieldItem.jsonCombination=false", "warn");
     const emitChange = useDebounceFn(function emitChange2() {
       emit("update:value", JSON.stringify(combinationData.value));
     }, 300);
     const combinationData = ref([]);
     const currentGroupNum = computed(() => combinationData.value.length);
     function setCombinationData(data, withInitialData = false) {
+      if (isArray(data)) {
+        if (!data.length)
+          data.push({});
+        data = JSON.stringify(data);
+      }
       const parsedData = getParsedData(data);
       if (!needLoad(parsedData))
         return;
@@ -66,7 +73,6 @@ const script = defineComponent({
             return null;
           return result;
         } catch (e) {
-          formRenderLog(`invalid JSON value ${data2} in COMBINATION => ${props.title}`, "warn");
           return null;
         }
       }
@@ -137,22 +143,31 @@ const script = defineComponent({
         "text": true,
         "disabled": currentGroupNum.value >= maxGroupNum.value
       }, {
-        default: () => [createTextVNode("\u65B0\u589E")]
+        icon: () => createVNode(NIcon, {
+          "component": AddCircleOutline
+        }, null),
+        default: () => "\u65B0\u589E"
       })]), Array.from({
         length: currentGroupNum.value
       }).map((_, idx) => createVNode("section", {
-        "class": "form-render__combinationContent"
+        "class": "form-render__combinationContentJson"
       }, [createVNode(FormRenderComponent, {
         "ref": (_ref) => setFormRenderRef(idx, _ref),
         "fieldList": props.getProperties(),
         "onFormChange": (payload) => onChange(idx, payload)
-      }, null), idx === 0 ? null : createVNode("i", {
+      }, null), idx === 0 ? null : createVNode(NButton, {
+        "text": true,
         "class": "form-render__combinationClose",
+        "type": "error",
         "onClick": () => removeGroup(idx)
-      }, ["-"])]))]);
+      }, {
+        icon: () => createVNode(NIcon, {
+          "component": RemoveCircle
+        }, null)
+      })]))]);
     };
   }
 });
-const COMBINATION = connect(script, mapProps(assignUpdateValue));
+const JSON_COMBINATION = connect(script, mapProps(assignUpdateValue));
 
-export { COMBINATION };
+export { JSON_COMBINATION };

package/es/packages/form-render/src/components/renderer/select.d.ts

@@ -1,14 +1,6 @@
 import { AnyObject, Func } from '../../../../../../es/src/types';
-import { FormRequestType } from '../../types';
+import { UrlConfig } from '../../types';
 import { PropType } from 'vue';
-declare type UrlConfig = {
-    method: FormRequestType;
-    dependKey?: string | string[];
-    nameKey: string;
-    url: string;
-    params?: AnyObject;
-    valueKey: string;
-};
 export declare const SELECT: import("vue").DefineComponent<{
     value: {
         type: StringConstructor;
@@ -53,4 +45,3 @@ export declare const SELECT: import("vue").DefineComponent<{
     options: AnyObject[];
     lazyRequest: boolean;
 }>;
-export {};

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

@@ -1,8 +1,9 @@
 import { defineComponent, computed, ref, inject, nextTick, watch, createVNode } from 'vue';
 import { isField } from '@formily/core';
-import { cloneDeep, isEqual } from 'lodash-es';
+import { cloneDeep, isEqual, isString } from 'lodash-es';
 import { useCommonInjection } from '../../../../../packages/form-render/src/hooks/useCommonInjection';
 import { InjectAsyncQueue, InjectionChangeContextCollector, InjectionFormItemDepsCollector } from '../../constants/index.js';
+import { formRenderLog } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NSelect } from 'naive-ui';
 import { useFormField } from '../../hooks/useFormField.js';
@@ -61,9 +62,11 @@ const script = defineComponent({
       }
       if (remoteOptions.value)
         return;
-      remoteOptions.value = await asyncQueue.addAsync({
-        ...await createParams(configFor(props), field.value, fieldKey.value)
-      });
+      try {
+        remoteOptions.value = await asyncQueue.addAsync(await createParams(configFor(props), field.value, fieldKey.value));
+      } catch (e) {
+        isString(e) && formRenderLog(e, "warn");
+      }
       async function createParams(config, field2, key) {
         const _params = {};
         try {

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

@@ -9,6 +9,5 @@ export * from './useFormValidator';
 export * from './useBusinessBinding';
 export * from './useChangeContext';
 export * from './useFormItemDeps';
-export * from './useInitialData';
 export * from './useAnchor';
 export * from './useFormContext';

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

@@ -9,6 +9,5 @@ export { useFormValidator } from './useFormValidator.js';
 export { BusinessCollector, useBusinessBinding } from './useBusinessBinding.js';
 export { ContextCollector, useChangeContext } from './useChangeContext.js';
 export { FormItemDepsCollector, useFormItemDeps } from './useFormItemDeps.js';
-export { useInitialData } from './useInitialData.js';
 export { useAnchor } from './useAnchor.js';
 export { useFormContext } from './useFormContext.js';

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

@@ -3,7 +3,7 @@ import { FieldItem } from '../types';
 /**
  * @description 胶水层, 将低代码平台中的fieldList转换为JSONSchema
  */
-export declare function useFieldListAdaptor(collector: BusinessCollector, uuid: string): {
+export declare function useFieldListAdaptor(collector: BusinessCollector): {
     schemaAdaptor: (fieldList: FieldItem[]) => Record<string, import("@formily/json-schema/esm/types").Stringify<{
         [key: symbol]: any;
         [key: `x-${string}`]: any;

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 { arrayed, parseNumberFromMaybeString } from '../utils/index.js';
-import { fieldKeyEscape, createLinebarId, elementIdEscape } from '../utils/schema.js';
+import { arrayed, parseNumberFromMaybeString, formRenderLog } from '../utils/index.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
@@ -158,7 +162,10 @@ function useFieldListAdaptor(collector, uuid) {
   };
   const createComplexSchema = (item) => {
     const schema = createStandardSchema(item);
-    const properties = Array.isArray(item.properties) ? schemaAdaptor(item.properties) : {};
+    if (Array.isArray(item.properties)) {
+      formRenderLog("COMPLEX\u63A7\u4EF6\u7684properties\u5C5E\u6027\u5DF2\u7ECF\u5E9F\u5F03, \u8BF7\u4F7F\u7528children\u4F5C\u4E3A\u66FF\u4EE3, \u5728\u4E4B\u540E\u7684\u7248\u672C\u4E2Dproperties\u5C5E\u6027\u5C06\u4E0D\u518D\u652F\u6301", "warn");
+    }
+    const properties = Array.isArray(item.properties || item.children) ? schemaAdaptor(item.properties || item.children) : {};
     schema.type = item.fieldType || "void";
     schema.properties = properties;
     Object.assign(schema["x-decorator-props"], { showFeedback: false });

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

@@ -8,7 +8,8 @@ function useTypeNormalize() {
         validate: { obj_type: FIELD_BUSINESS_TYPE.AGE_UNIT },
         val_key: item.val_key_unit,
         html_type: "SELECT",
-        option: item.option
+        option: item.option,
+        urlConfig: item.urlConfig
       }
     ];
   }

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

@@ -1,7 +1,7 @@
 import { AnyObject, ArrayAble } from '../../../../../es/src/types';
 import { SchemaTypes } from '@formily/vue';
 import { CSSProperties, VNode } from 'vue';
-import { DependKeyType, FormCommonState } from '../../../../../es/packages/form-render';
+import { DependKeyType, FormCommonState, FormRequestType } from '../../../../../es/packages/form-render';
 declare type FieldBusinessType = 'password' | 'id_card' | 'age' | 'age_unit' | 'mobile' | 'telephone' | 'email' | 'sex' | 'birthday' | 'bank_card' | 'website' | 'gestational_weeks' | 'gestational_stage' | 'customer_name';
 export declare type ValidateItem = Partial<{
     /**
@@ -36,6 +36,15 @@ interface FormRendererPayload {
 export interface FormRenderer {
     (payload: FormRendererPayload): ArrayAble<VNode> | any;
 }
+export declare type UrlConfig = {
+    url: string;
+} & Partial<{
+    method?: FormRequestType;
+    nameKey?: string;
+    valueKey?: string;
+    params?: AnyObject;
+    dependKey?: DependKeyType;
+}>;
 interface SwitchProperty {
     value?: any;
     describe?: string;
@@ -141,17 +150,7 @@ export declare type FieldItem = {
      * slider控件间距
      */
     step_length: string | number;
-    urlConfig: Partial<{
-        url: string;
-        method: 'post' | 'get' | 'put' | 'patch' | 'delete';
-        /**
-         * 请求参数依赖关系
-         */
-        dependKey: DependKeyType;
-        params: AnyObject;
-        nameKey: string;
-        valueKey: string;
-    }>;
+    urlConfig: UrlConfig;
     /**
      * 控件组
      */
@@ -172,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

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

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

@@ -14,3 +14,63 @@ 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%;
@@ -3184,6 +3187,7 @@ body > .vxe-table--tooltip-wrapper {
 .form-config__material {
   padding: 16px;
   box-sizing: border-box;
+  flex-shrink: 0;
   width: 200px;
   background: white;
 }
@@ -3194,8 +3198,12 @@ body > .vxe-table--tooltip-wrapper {
   height: 40px;
 }
 .form-config__materialContent {
-  padding: 8px;
-  min-height: 400px;
+  padding: 16px;
+  box-sizing: border-box;
+  flex-shrink: 0;
+  overflow-y: auto;
+  max-height: var(--max-height);
+  min-height: 200px;
   display: flex;
   flex-direction: column;
   gap: 8px;
@@ -3212,6 +3220,8 @@ body > .vxe-table--tooltip-wrapper {
 .form-config__displayWrapper {
   padding: 16px;
   box-sizing: border-box;
+  flex-shrink: 0;
+  min-width: 400px;
   flex: 1;
   padding: 16px 0;
 }
@@ -3224,6 +3234,9 @@ body > .vxe-table--tooltip-wrapper {
 .form-config__displayContent {
   padding: 16px;
   box-sizing: border-box;
+  flex-shrink: 0;
+  overflow-y: auto;
+  max-height: var(--max-height);
   height: fit-content;
   background: #eeeeee;
   display: grid !important;
@@ -3237,9 +3250,23 @@ body > .vxe-table--tooltip-wrapper {
 .form-config__config {
   padding: 16px;
   box-sizing: border-box;
-  width: 220px;
+  flex-shrink: 0;
+  width: 240px;
   background: white;
 }
+.form-config__configHeader {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 40px;
+}
+.form-config__configContent {
+  padding: 16px;
+  box-sizing: border-box;
+  flex-shrink: 0;
+  overflow-y: auto;
+  max-height: var(--max-height);
+}
 .form-config__renderer--default {
   display: flex;
   align-items: center;

package/es/packages/index.js

@@ -51,7 +51,6 @@ 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

@@ -106,22 +106,23 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
         date_format?: string | undefined;
         step_length?: string | number | undefined;
         urlConfig?: {
-            url?: string | undefined;
-            method?: "delete" | "post" | "get" | "patch" | "put" | undefined;
+            url: string;
+            method?: import("..").FormRequestType | undefined;
+            nameKey?: string | undefined;
+            valueKey?: string | undefined;
+            params?: import("../../../es/src/types").AnyObject | undefined;
             dependKey?: string | Record<string, string> | (string | {
                 paramName: string;
                 paramValue?: string | undefined;
                 required?: boolean | undefined;
             })[] | undefined;
-            params?: import("../../../es/src/types").AnyObject | undefined;
-            nameKey?: string | undefined;
-            valueKey?: string | undefined;
         } | undefined;
         suffixConfig?: any | any[] | undefined;
         fieldType?: import("@formily/json-schema").SchemaTypes | undefined;
         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;
@@ -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;

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

@@ -108,22 +108,23 @@ declare const _default: import("vue").DefineComponent<{
         date_format?: string | undefined;
         step_length?: string | number | undefined;
         urlConfig?: {
-            url?: string | undefined;
-            method?: "delete" | "post" | "get" | "patch" | "put" | undefined;
+            url: string;
+            method?: import("../../../../es/packages/form-render").FormRequestType | undefined;
+            nameKey?: string | undefined;
+            valueKey?: string | undefined;
+            params?: import("../../../../es/src/types").AnyObject | undefined;
             dependKey?: string | Record<string, string> | (string | {
                 paramName: string;
                 paramValue?: string | undefined;
                 required?: boolean | undefined;
             })[] | undefined;
-            params?: import("../../../../es/src/types").AnyObject | undefined;
-            nameKey?: string | undefined;
-            valueKey?: string | undefined;
         } | undefined;
         suffixConfig?: any | any[] | undefined;
         fieldType?: import("@formily/json-schema").SchemaTypes | undefined;
         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;
@@ -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;

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;