cnhis-design-vue 3.1.16-beta.8 → 3.1.17-beta.0

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

@@ -1,9 +1,10 @@
 import { defineComponent, inject, computed, createVNode } from 'vue';
 import { isVoidField } from '@formily/core';
-import { connect, mapProps } from '@formily/vue';
+import { useField, connect, mapProps } from '@formily/vue';
 import { NFormItem } from 'naive-ui';
 import AnnotationEdit from '../../../../../packages/annotation-edit';
-import { InjectionAnnotation } from '../../../../../packages/form-render/src/constants';
+import { InjectionAnnotation, InjectionFormUUID } from '../../../../../packages/form-render/src/constants';
+import { elementIdEscape } from '../../../../../packages/form-render/src/utils';
 
 const script = defineComponent({
   props: {
@@ -38,6 +39,11 @@ const script = defineComponent({
       return annotation.value && props.annotation !== false;
     });
     const showLabel = computed(() => props.label && props.label !== " ");
+    const field = useField();
+    const uuid = inject(InjectionFormUUID);
+    const id = computed(() => {
+      return elementIdEscape(`${uuid}-${field.value.path.toString()}`);
+    });
     function renderLabel() {
       return showLabel.value ? createVNode("section", {
         "class": "form-render__formItemLabel"
@@ -47,7 +53,9 @@ const script = defineComponent({
         }]
       }, [props.label]), showAnnotation.value ? renderAnnotation() : null]) : null;
     }
-    return () => createVNode(NFormItem, null, {
+    return () => createVNode(NFormItem, {
+      id: id.value
+    }, {
       ...slots,
       label: renderLabel
     });
@@ -56,14 +64,13 @@ const script = defineComponent({
 const FORM_ITEM = connect(script, mapProps({
   title: "label"
 }, (props, field) => {
-  var _a;
   const feedback = !isVoidField(field) ? field.selfErrors.length ? field.selfErrors.join(",") : void 0 : void 0;
   return {
     ...props,
     required: isVoidField(field) ? void 0 : field.required,
     class: "form-render__formItem",
     style: {
-      "--form-item-column": (_a = props.span) != null ? _a : 3
+      "--form-item-column": props.span
     },
     feedback,
     "validation-status": feedback ? "error" : void 0

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

@@ -7,6 +7,7 @@ export * from './linebar';
 export * from './inputGroup';
 export * from './date';
 export * from './cascader';
+export * from './jsonCombination';
 export * from './combination';
 export * from './checkbox';
 export * from './switch';

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

@@ -7,7 +7,8 @@ export { LINEBAR } from './linebar.js';
 export { INPUT_GROUP } from './inputGroup.js';
 export { DATE } from './date.js';
 export { SEARCH_CASCADE } from './cascader.js';
-export { COMBINATION } from './combination/index.js';
+export { JSON_COMBINATION } from './jsonCombination/index.js';
+export { COMBINATION } from './combination.js';
 export { CHECKBOX } from './checkbox.js';
 export { SWITCH } from './switch.js';
 export { RADIO } from './radio.js';

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

@@ -2,7 +2,7 @@ import { connect, mapProps } from '@formily/vue';
 import { NInputGroup } from 'naive-ui';
 
 const INPUT_GROUP = connect(NInputGroup, mapProps((props) => {
-  return { style: { "--column": props.span || 3 }, class: "form-render__inputGroup" };
+  return { style: { "--column": props.span }, class: "form-render__inputGroup" };
 }));
 
 export { INPUT_GROUP };

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

@@ -0,0 +1,44 @@
+import { FieldItem } from '../../../../../../../es/packages/form-render';
+import { PropType } from 'vue';
+export declare const JSON_COMBINATION: import("vue").DefineComponent<{
+    title: {
+        type: StringConstructor;
+        default: string;
+    };
+    value: {
+        type: (ArrayConstructor | StringConstructor)[];
+    };
+    maxGroupNum: {
+        type: NumberConstructor;
+    };
+    getProperties: {
+        type: PropType<() => FieldItem[]>;
+        default: () => never[];
+    };
+    onInput: {};
+    onBlur: {};
+    onChange: {};
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:value"[], "update:value", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    title: {
+        type: StringConstructor;
+        default: string;
+    };
+    value: {
+        type: (ArrayConstructor | StringConstructor)[];
+    };
+    maxGroupNum: {
+        type: NumberConstructor;
+    };
+    getProperties: {
+        type: PropType<() => FieldItem[]>;
+        default: () => never[];
+    };
+    onInput: {};
+    onBlur: {};
+    onChange: {};
+}>> & {
+    "onUpdate:value"?: ((...args: any[]) => any) | undefined;
+}, {
+    title: string;
+    getProperties: () => FieldItem[];
+}>;

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.js

@@ -72,12 +72,12 @@ const script = defineComponent({
         try {
           traverseDependKey(config.dependKey, (dependKey, valueKey2, required) => {
             const _field = field2.query(dependKey).take();
-            if (isField(_field)) {
-              if (required && _field.value == null) {
-                throw `\u7F3A\u5C11\u5FC5\u987B\u7684\u53C2\u6570=>${dependKey}`;
-              }
-              _params[valueKey2] = _field.value;
+            if (!isField(_field))
+              return;
+            if (required && _field.value == null) {
+              throw `\u7F3A\u5C11\u5FC5\u987B\u7684\u53C2\u6570=>${dependKey}`;
             }
+            _params[valueKey2] = _field.value;
           });
         } catch (e) {
           return Promise.reject(e);
@@ -105,11 +105,14 @@ const script = defineComponent({
       }
     });
     const changeContextCollector = inject(InjectionChangeContextCollector);
-    changeContextCollector == null ? void 0 : changeContextCollector.setContext(fieldKey.value, async () => {
+    changeContextCollector.setContext(fieldKey.value, async () => {
       await nextTick();
       return {
-        currentOption: cloneDeep(parsedOptions.value.find((option) => option[valueKey.value] === valueRef.value))
+        currentOption: cloneDeep(getCurrentOption())
       };
+      function getCurrentOption() {
+        return parsedOptions.value.find((option) => option[valueKey.value] === valueRef.value);
+      }
     });
     const formItemDepsCollector = inject(InjectionFormItemDepsCollector);
     watch(() => props.urlConfig, (config, oldConfig) => {
@@ -120,7 +123,7 @@ const script = defineComponent({
         return;
       formItemDepsCollector.setDeps(fieldKey.value, config.dependKey || [], async () => {
         remoteOptions.value = null;
-        emit("update:value", null);
+        valueRef.value = null;
         !props.lazyRequest && await fetchData();
       });
       (valueRef.value || !props.lazyRequest) && fetchData();

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

@@ -1,4 +1,4 @@
-import { WithNull } from '../../../../../es/src/types';
+import { Nullable } from '../../../../../es/src/types';
 import { ContextCollector } from '../../../../../es/packages/form-render/src/hooks/useChangeContext';
 import { BusinessCollector, FormItemDepsCollector } from '../hooks';
 import { FormAsyncQueue } from '../types';
@@ -9,7 +9,7 @@ export declare const InjectionBusinessCollector: InjectionKey<BusinessCollector>
 export declare const InjectionChangeContextCollector: InjectionKey<ContextCollector>;
 export declare const InjectionFormItemDepsCollector: InjectionKey<FormItemDepsCollector>;
 export declare const InjectionFormUUID: InjectionKey<string>;
-export declare const InjectionAnnotation: InjectionKey<WritableComputedRef<WithNull<Record<string, string>>>>;
+export declare const InjectionAnnotation: InjectionKey<WritableComputedRef<Nullable<Record<string, string>>>>;
 export declare const FormItemLineBarDepKeyPrepend = "__dep_LINEBAR_";
 export declare enum FIELD_BUSINESS_TYPE {
     PASSWORD = "password",

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/useAnchor.d.ts

@@ -1,8 +1,8 @@
-import { WithUndefined } from '../../../../../es/src/types';
+import { UndefinedAble } from '../../../../../es/src/types';
 import { ISchema } from '@formily/json-schema/esm/types';
 import { Ref } from 'vue';
 import { FormItemDepsCollector, FormRenderProps } from '../../../../../es/packages/form-render';
-export declare function useAnchor(props: Readonly<FormRenderProps>, scrollbarRef: Ref<WithUndefined<HTMLElement>>, collector: FormItemDepsCollector): {
+export declare function useAnchor(props: Readonly<FormRenderProps>, scrollbarRef: Ref<UndefinedAble<HTMLElement>>, collector: FormItemDepsCollector): {
     currentAnchor: import("vue").WritableComputedRef<string>;
     onScroll: () => void;
     formHeight: import("vue").ComputedRef<string | undefined>;
@@ -11,6 +11,6 @@ export declare function useAnchor(props: Readonly<FormRenderProps>, scrollbarRef
         title: string;
     }[]>;
     generateAnchorList: (schema: ISchema) => void;
-    scrollbarRef: Ref<WithUndefined<HTMLElement>>;
+    scrollbarRef: Ref<UndefinedAble<HTMLElement>>;
     scrollTo: (id: string) => Promise<void>;
 };

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

@@ -1,8 +1,8 @@
-import { AnyObject, WithUndefined } from '../../../../../es/src/types';
+import { AnyObject, UndefinedAble } from '../../../../../es/src/types';
 import { FormAsyncQueueItem } from '../types';
 declare type ProcessorOption = Partial<{
     afterRequest(key: string, payload?: unknown): AnyObject[];
-    beforeRequest(key: string, params?: unknown): WithUndefined<AnyObject> | void;
+    beforeRequest(key: string, params?: unknown): UndefinedAble<AnyObject> | void;
 }>;
 interface EntryCallback {
     (err?: any, result?: any): void;

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/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,10 +29,13 @@ function useFieldVisitor() {
           after.push(...arrayed(field2));
         }
       });
-      fin.push(...before, current, ...after);
-      return fin;
+      return fin.concat([...before, current, ...after].map(defaultTransfer));
     }, []);
   }
+  function defaultTransfer(field) {
+    field.elem_width = ~~((field.elem_width || 3) * 2);
+    return field;
+  }
   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/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

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