cnhis-design-vue 3.1.11 → 3.1.12-beta.2

package/es/packages/form-render/src/FormRender.vue_vue_type_script_setup_true_lang.js

@@ -1,13 +1,13 @@
-import { defineComponent, computed, watch, openBlock, createBlock, unref, withCtx, createElementBlock, createVNode, Fragment, renderList, createCommentVNode, createElementVNode, normalizeStyle, renderSlot, toDisplayString } from 'vue';
+import { defineComponent, computed, watch, openBlock, createBlock, unref, withCtx, createElementBlock, createVNode, isRef, Fragment, renderList, createCommentVNode, createElementVNode, normalizeStyle, renderSlot, toDisplayString } from 'vue';
 import { createForm, onFieldValueChange, isField } from '@formily/core';
 import { FormProvider, FormConsumer } from '@formily/vue';
 import { cloneDeep } from 'lodash-es';
 import { NForm, NTabs, NTabPane } from 'naive-ui';
 import { useFormContext } from './hooks/useFormContext.js';
 import { useInitialData } from './hooks/useInitialData.js';
-import { useFieldList2Schema } from './hooks/useFieldList2Schema.js';
-import { useAnchor } from './hooks/useAnchor.js';
+import { useFieldListAdaptor } from './hooks/useFieldListAdaptor.js';
 import { useFieldVisitor } from './hooks/useFieldVisitor.js';
+import { useAnchor } from './hooks/useAnchor.js';
 
 const _hoisted_1 = {
   key: 0,
@@ -30,19 +30,15 @@ var script = /* @__PURE__ */ defineComponent({
       default: () => ({})
     },
     scope: { type: Object, default: () => ({}) },
-    consumer: { type: Boolean, default: false }
+    consumer: { type: Boolean, default: false },
+    uuid: { type: String }
   },
   emits: [
     "formChange"
   ],
   setup(__props, { expose, emit }) {
     const props = __props;
-    const {
-      SchemaField,
-      businessCollector,
-      formItemDepsCollector,
-      changeContextCollector
-    } = useFormContext(props);
+    const { SchemaField, businessCollector, formItemDepsCollector, changeContextCollector, formUUID } = useFormContext(props);
     const formModel = createForm({
       initialValues: useInitialData().assignInitialData(props.initialData, props.fieldList),
       effects() {
@@ -60,37 +56,30 @@ var script = /* @__PURE__ */ defineComponent({
         });
       }
     });
-    const { traverse } = useFieldVisitor();
-    const { transform } = useFieldList2Schema(businessCollector);
+    const { schemaAdaptor } = useFieldListAdaptor(businessCollector, formUUID);
     const parsedSchema = computed(() => {
       if (props.schema) {
         return props.schema;
       }
       if (props.fieldList) {
-        const _fieldList = traverse(cloneDeep(props.fieldList), props.fieldVisitor);
-        return { type: "object", properties: transform(_fieldList) };
+        const _fieldList = useFieldVisitor().traverse(cloneDeep(props.fieldList), props.fieldVisitor);
+        return { type: "object", properties: schemaAdaptor(_fieldList) };
       }
       return { type: "object", properties: {} };
     });
-    const {
-      currentAnchor,
-      scrollbarRef,
-      generateAnchorList,
-      anchorIdList,
-      formHeight,
-      scrollTo,
-      onScroll,
-      updateCurrentAnchor
-    } = useAnchor(props, formItemDepsCollector);
+    const { currentAnchor, scrollbarRef, generateAnchorList, anchorIdList, formHeight, scrollTo, onScroll } = useAnchor(props, formItemDepsCollector);
     watch(parsedSchema, generateAnchorList, { immediate: true });
-    function bindTitle(info) {
+    function bindInfo(info) {
+      var _a, _b;
       info.title = formModel.query(info.path).get("title");
+      info.decoratorElement = (_a = scrollbarRef.value) == null ? void 0 : _a.querySelector(`#${formUUID}-${info.path}`);
+      info.widgetElement = (_b = info.decoratorElement) == null ? void 0 : _b.querySelector(`input`);
       return info;
     }
     expose({
       validate(path = "*") {
         return formModel.validate(path).catch((err) => {
-          return Promise.reject(Array.isArray(err) ? err.map(bindTitle) : err);
+          return Promise.reject(Array.isArray(err) ? err.map(bindInfo) : err);
         });
       },
       getFormValues() {
@@ -119,7 +108,7 @@ var script = /* @__PURE__ */ defineComponent({
           __props.anchor ? (openBlock(), createElementBlock("section", _hoisted_1, [
             createVNode(unref(NTabs), {
               value: unref(currentAnchor),
-              "onUpdate:value": unref(updateCurrentAnchor),
+              "onUpdate:value": _cache[0] || (_cache[0] = ($event) => isRef(currentAnchor) ? currentAnchor.value = $event : null),
               type: "line"
             }, {
               default: withCtx(() => [
@@ -132,14 +121,14 @@ var script = /* @__PURE__ */ defineComponent({
                 }), 128))
               ]),
               _: 1
-            }, 8, ["value", "onUpdate:value"])
+            }, 8, ["value"])
           ])) : createCommentVNode("v-if", true),
           createElementVNode("section", {
             class: "form-render__wrapper",
             style: normalizeStyle({ "--column": __props.column, "--form-height": unref(formHeight) }),
             ref_key: "scrollbarRef",
             ref: scrollbarRef,
-            onScroll: _cache[0] || (_cache[0] = (...args) => unref(onScroll) && unref(onScroll)(...args))
+            onScroll: _cache[1] || (_cache[1] = (...args) => unref(onScroll) && unref(onScroll)(...args))
           }, [
             createVNode(unref(FormProvider), { form: unref(formModel) }, {
               default: withCtx(() => [

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

@@ -117,6 +117,8 @@ const script = defineComponent({
         const parsed = Array.isArray(props.value) ? props.value : JSON.parse(props.value || "");
         if (Array.isArray(parsed)) {
           return parsed.map((option) => option[labelKey.value]).join(" / ");
+        } else {
+          return [];
         }
       } catch (e) {
         return "";

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

@@ -1,5 +1,5 @@
 import { AnyObject } from '../../../../../../es/src/types';
-import { PropType } from "vue";
+import { PropType } from 'vue';
 export declare const CHECKBOX: import("vue").DefineComponent<{
     options: {
         type: PropType<AnyObject[]>;

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

@@ -1,3 +1,4 @@
+import { FieldItem } from '../../types';
 import { PropType } from 'vue';
 export declare const COMBINATION: import("vue").DefineComponent<{
     title: {
@@ -7,65 +8,9 @@ export declare const COMBINATION: import("vue").DefineComponent<{
     value: {
         type: StringConstructor;
     };
-    properties: {
-        type: PropType<Record<string, import("@formily/vue").Stringify<{
-            [key: symbol]: any;
-            [key: `x-${string}`]: any;
-            [key: `x-${number}`]: any;
-            version?: string | undefined;
-            name?: import("@formily/vue").SchemaKey | undefined;
-            title?: any;
-            description?: any;
-            default?: any;
-            readOnly?: boolean | undefined;
-            writeOnly?: boolean | undefined;
-            type?: import("@formily/vue").SchemaTypes | undefined;
-            enum?: import("@formily/vue").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/vue").SchemaProperties<any, any, any, any, any, any, any, any> | undefined;
-            properties?: import("@formily/vue").SchemaProperties<any, any, any, any, any, any, any, any> | undefined;
-            items?: import("@formily/vue").SchemaItems<any, any, any, any, any, any, any, any> | undefined;
-            additionalItems?: import("@formily/vue").Stringify<any> | undefined;
-            patternProperties?: import("@formily/vue").SchemaProperties<any, any, any, any, any, any, any, any> | undefined;
-            additionalProperties?: import("@formily/vue").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/vue").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;
-        }>>>;
-        required: true;
+    getProperties: {
+        type: PropType<() => FieldItem[]>;
+        default: () => never[];
     };
 }, () => 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: {
@@ -75,68 +20,13 @@ export declare const COMBINATION: import("vue").DefineComponent<{
     value: {
         type: StringConstructor;
     };
-    properties: {
-        type: PropType<Record<string, import("@formily/vue").Stringify<{
-            [key: symbol]: any;
-            [key: `x-${string}`]: any;
-            [key: `x-${number}`]: any;
-            version?: string | undefined;
-            name?: import("@formily/vue").SchemaKey | undefined;
-            title?: any;
-            description?: any;
-            default?: any;
-            readOnly?: boolean | undefined;
-            writeOnly?: boolean | undefined;
-            type?: import("@formily/vue").SchemaTypes | undefined;
-            enum?: import("@formily/vue").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/vue").SchemaProperties<any, any, any, any, any, any, any, any> | undefined;
-            properties?: import("@formily/vue").SchemaProperties<any, any, any, any, any, any, any, any> | undefined;
-            items?: import("@formily/vue").SchemaItems<any, any, any, any, any, any, any, any> | undefined;
-            additionalItems?: import("@formily/vue").Stringify<any> | undefined;
-            patternProperties?: import("@formily/vue").SchemaProperties<any, any, any, any, any, any, any, any> | undefined;
-            additionalProperties?: import("@formily/vue").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/vue").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;
-        }>>>;
-        required: true;
+    getProperties: {
+        type: PropType<() => FieldItem[]>;
+        default: () => never[];
     };
 }>> & {
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
 }, {
     title: string;
+    getProperties: () => FieldItem[];
 }>;

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

@@ -1,4 +1,4 @@
-import { defineComponent, computed, ref, createVNode, createTextVNode, toRaw } from 'vue';
+import { defineComponent, ref, createVNode, createTextVNode, toRaw } from 'vue';
 import { assignUpdateValue, formRenderLog } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { useDebounceFn, isObject } from '@vueuse/core';
@@ -16,21 +16,15 @@ const script = defineComponent({
     value: {
       type: String
     },
-    properties: {
-      type: Object,
-      required: true
+    getProperties: {
+      type: Function,
+      default: () => []
     }
   },
   emits: ["update:value"],
   setup(props, {
     emit
   }) {
-    const _schema = computed(() => {
-      return {
-        type: "void",
-        properties: props.properties
-      };
-    });
     const emitChange = useDebounceFn(function emitChange2() {
       emit("update:value", JSON.stringify(_values.value));
     }, 300);
@@ -91,7 +85,7 @@ const script = defineComponent({
         "type": "info",
         "text": true
       }, {
-        default: () => [" ", createTextVNode("\u65B0\u589E"), " "]
+        default: () => [createTextVNode("\u65B0\u589E")]
       })]), Array.from({
         length: combinationRepeat.value
       }).map((_, idx) => {
@@ -99,7 +93,7 @@ const script = defineComponent({
           "class": "form-render__combinationContent"
         }, [createVNode(FormRenderComponent, {
           "initialData": toRaw(_values.value[idx]) || {},
-          "schema": _schema.value,
+          "fieldList": props.getProperties(),
           "onUpdateValue": () => false,
           "onInput": stop,
           "onBlur": stop,

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, onMounted, inject, createVNode, createTextVNode } from 'vue';
+import { defineComponent, ref, onMounted, inject, createVNode } from 'vue';
 import { connect, mapProps } from '@formily/vue';
 import { NDivider, NCollapseTransition } from 'naive-ui';
 import { useFormField } from '../../../../../packages/form-render';
@@ -58,7 +58,7 @@ const script = defineComponent({
       }) : createVNode("header", {
         "class": "form-render__linebarHeader",
         "onClick": toggleShow
-      }, [createTextVNode(" "), props.title, createTextVNode(" ")]), createVNode(NCollapseTransition, {
+      }, [" ", props.title, " "]), createVNode(NCollapseTransition, {
         "class": "form-render__linebarItem",
         "show": _show.value
       }, slots)]);

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

@@ -1,6 +1,7 @@
 import { AnyObject } from '../../../../../../es/src/types';
-import { PropType } from "vue";
+import { PropType } from 'vue';
 export declare const RADIO: import("vue").DefineComponent<{
+    value: {};
     options: {
         type: PropType<AnyObject[]>;
         default: () => never[];
@@ -10,6 +11,7 @@ export declare const RADIO: import("vue").DefineComponent<{
         default: boolean;
     };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    value: {};
     options: {
         type: PropType<AnyObject[]>;
         default: () => never[];

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

@@ -5,6 +5,7 @@ import { assignUpdateValue } from '../../utils/index.js';
 
 const script = defineComponent({
   props: {
+    value: {},
     options: {
       type: Array,
       default: () => []
@@ -14,11 +15,11 @@ const script = defineComponent({
       default: false
     }
   },
-  setup(props, {
-    attrs
-  }) {
+  setup(props) {
     return () => {
-      return createVNode(NRadioGroup, attrs, {
+      return createVNode(NRadioGroup, {
+        "value": props.value
+      }, {
         default: () => [createVNode(NSpace, {
           "vertical": props.vertical
         }, {

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

@@ -31,7 +31,7 @@ const script = defineComponent({
   }) {
     const _options = ref(null);
     let cachedOptions = null;
-    let lastSearch = ref("");
+    const lastSearch = ref("");
     const asyncQueue = inject(InjectAsyncQueue);
     const {
       title,
@@ -79,7 +79,7 @@ const script = defineComponent({
         _options.value = null;
       }
     }
-    const renderOptions = computed(() => {
+    const parsedOptions = computed(() => {
       if (_options.value)
         return _options.value;
       if (!Array.isArray(props.options))
@@ -125,7 +125,7 @@ const script = defineComponent({
       "valueField": valueKey.value,
       "onSearch": fetchData,
       "onUpdate:show": (show) => show && fetchData(),
-      "options": renderOptions.value
+      "options": parsedOptions.value
     }, slots);
   }
 });

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

@@ -7,6 +7,7 @@ export declare const InjectionSchemaField: InjectionKey<Component>;
 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 FormItemLineBarDepKeyPrepend = "__dep_LINEBAR_";
 export declare enum FIELD_BUSINESS_TYPE {
     PASSWORD = "password",

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

@@ -3,7 +3,8 @@ const InjectionSchemaField = Symbol("InjectionSchemaField");
 const InjectionBusinessCollector = Symbol("InjectionBusinessCollector");
 const InjectionChangeContextCollector = Symbol("InjectionChangeContextCollector");
 const InjectionFormItemDepsCollector = Symbol("InjectionFormItemDepsCollector");
-const FormItemLineBarDepKeyPrepend = `__dep_LINEBAR_`;
+const InjectionFormUUID = Symbol("InjectionFormUUID");
+const FormItemLineBarDepKeyPrepend = "__dep_LINEBAR_";
 var FIELD_BUSINESS_TYPE = /* @__PURE__ */ ((FIELD_BUSINESS_TYPE2) => {
   FIELD_BUSINESS_TYPE2["PASSWORD"] = "password";
   FIELD_BUSINESS_TYPE2["ID_CARD"] = "id_card";
@@ -26,4 +27,4 @@ var FIELD_SEX_VALUE = /* @__PURE__ */ ((FIELD_SEX_VALUE2) => {
   return FIELD_SEX_VALUE2;
 })(FIELD_SEX_VALUE || {});
 
-export { FIELD_BUSINESS_TYPE, FIELD_SEX_VALUE, FormItemLineBarDepKeyPrepend, InjectAsyncQueue, InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectionSchemaField };
+export { FIELD_BUSINESS_TYPE, FIELD_SEX_VALUE, FormItemLineBarDepKeyPrepend, InjectAsyncQueue, InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectionFormUUID, InjectionSchemaField };

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

@@ -1,4 +1,4 @@
-export * from './useFieldList2Schema';
+export * from './useFieldListAdaptor';
 export * from './useFormRequest';
 export * from './useCommonLog';
 export * from './useFormField';

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

@@ -1,4 +1,4 @@
-export { useFieldList2Schema } from './useFieldList2Schema.js';
+export { useFieldListAdaptor } from './useFieldListAdaptor.js';
 export { useFormRequest } from './useFormRequest.js';
 export { useCommonLog } from './useCommonLog.js';
 export { useFormField } from './useFormField.js';

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

@@ -2,8 +2,7 @@ import { AnyObject } from '../../../../../es/src/types';
 import { ISchema } from '@formily/json-schema/esm/types';
 import { FormItemDepsCollector } from '../../../../../es/packages/form-render';
 export declare function useAnchor(props: Readonly<AnyObject>, collector: FormItemDepsCollector): {
-    currentAnchor: import("vue").Ref<string>;
-    updateCurrentAnchor: (id: string) => Promise<void>;
+    currentAnchor: import("vue").WritableComputedRef<string>;
     onScroll: () => Promise<void>;
     formHeight: import("vue").ComputedRef<any>;
     anchorIdList: import("vue").Ref<{

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

@@ -1,17 +1,12 @@
 import { doAnimation } from '../../../../src/utils/anime';
 import { useDebounceFn } from '@vueuse/core';
 import { isNumber } from 'lodash-es';
-import { ref, computed, nextTick, watch } from 'vue';
+import { ref, computed, watch, nextTick } from 'vue';
 import { FormItemLineBarDepKeyPrepend } from '../../../../packages/form-render/src/constants';
 import { traverseSchema } from '../../../../packages/form-render/src/utils';
 
 function useAnchor(props, collector) {
-  const currentAnchor = ref("");
-  async function updateCurrentAnchor(id) {
-    currentAnchor.value = id;
-    await new Promise((resolve) => setTimeout(resolve, 100));
-    await scrollTo(id);
-  }
+  const __currentAnchor = ref("");
   const formHeight = computed(() => {
     if (isNumber(props.maxHeight))
       return props.maxHeight + "px";
@@ -60,15 +55,24 @@ function useAnchor(props, collector) {
         return;
       return node.offsetTop >= scrollTop || node.offsetTop < scrollTop && node.clientHeight + node.offsetTop > scrollTop + clientHeight;
     }) || anchorIdList.value[anchorIdList.value.length - 1];
-    currentAnchor.value = (_a = result == null ? void 0 : result.name) != null ? _a : "";
+    __currentAnchor.value = (_a = result == null ? void 0 : result.name) != null ? _a : "";
   }, 300);
   watch(anchorIdList, (anchorIdList2) => {
     var _a, _b;
-    currentAnchor.value = (_b = (_a = anchorIdList2[0]) == null ? void 0 : _a.name) != null ? _b : "";
+    __currentAnchor.value = (_b = (_a = anchorIdList2[0]) == null ? void 0 : _a.name) != null ? _b : "";
   }, { deep: true, immediate: true });
+  const currentAnchor = computed({
+    get() {
+      return __currentAnchor.value;
+    },
+    async set(id) {
+      __currentAnchor.value = id;
+      await new Promise((resolve) => setTimeout(resolve, 100));
+      await scrollTo(id);
+    }
+  });
   return {
     currentAnchor,
-    updateCurrentAnchor,
     onScroll,
     formHeight,
     anchorIdList,

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

@@ -126,8 +126,8 @@ function useAsyncQueue() {
           removeCache();
         }
       },
-      getKey(item) {
-        return item.url + JSON.stringify(item.params || {});
+      getKey({ url, method = "post", params }) {
+        return url + method + JSON.stringify(params || {});
       }
     });
   }

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

@@ -6,7 +6,9 @@ class BusinessCollector {
   constructor() {
     this.typeCollector = /* @__PURE__ */ new Map();
     this.fieldNameCollector = /* @__PURE__ */ new Map();
-    this.handlerMap = /* @__PURE__ */ new Map([[FIELD_BUSINESS_TYPE.ID_CARD, this.handlerIdCardType.bind(this)]]);
+    this.handlerMap = /* @__PURE__ */ new Map([
+      [FIELD_BUSINESS_TYPE.ID_CARD, this.handlerIdCardType.bind(this)]
+    ]);
   }
   collect(type, fieldName) {
     const set = this.typeCollector.get(type) || /* @__PURE__ */ new Set();

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

@@ -8,7 +8,9 @@ class ContextCollector {
     this.contextMap.set(key, context);
   }
   getContext(key) {
-    return this.contextMap.get(key) || {};
+    const result = this.contextMap.get(key) || {};
+    this.contextMap.delete(key);
+    return result;
   }
 }
 function useChangeContext() {

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

@@ -2,7 +2,7 @@ import { formRenderLog } from '../utils/index.js';
 
 function useCommonLog() {
   function invalidHttpInstanceLog() {
-    formRenderLog(`before use http feature, you should regist http instance by useFormilyRequest.registGlobHttpInstance()`, "warn");
+    formRenderLog("before use http feature, you should regist http instance by useFormilyRequest.registGlobHttpInstance()", "warn");
   }
   return { invalidHttpInstanceLog };
 }

package/es/packages/form-render/src/hooks/{useFieldList2Schema.d.ts → useFieldListAdaptor.d.ts}

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

package/es/packages/form-render/src/hooks/{useFieldList2Schema.js → useFieldListAdaptor.js}

@@ -3,7 +3,7 @@ import { arrayed, transformDateFormat } from '../utils/index.js';
 import { useFormValidator, useTypeNormalize } from '../../../../packages/form-render';
 import { isObject } from '@vueuse/core';
 
-function useFieldList2Schema(collector) {
+function useFieldListAdaptor(collector, uuid) {
   const { createValidatorSchema } = useFormValidator();
   const createStandardSchema = (item) => {
     const result = {
@@ -11,7 +11,11 @@ function useFieldList2Schema(collector) {
       type: "string",
       title: item.alias || item.name,
       "x-decorator": "FORM_ITEM",
-      "x-decorator-props": { span: item.elem_width, showLabel: item.hide_title !== "1" },
+      "x-decorator-props": {
+        span: item.elem_width,
+        showLabel: item.hide_title !== "1",
+        id: `${uuid}-${item.val_key}`
+      },
       "x-component": item.html_type,
       "x-component-props": { placeholder: item.placeholder, clearable: item.is_empty === "1" },
       "x-display": item.is_show === "0" ? "hidden" : "visible",
@@ -83,7 +87,7 @@ function useFieldList2Schema(collector) {
     schema["x-decorator-props"].showLabel = false;
     Object.assign(schema["x-component-props"], {
       title: item.alias || item.name,
-      properties: transform(item.children || [])
+      getProperties: () => item.children || []
     });
     return schema;
   };
@@ -131,7 +135,7 @@ function useFieldList2Schema(collector) {
   };
   const createComplexSchema = (item) => {
     const schema = createStandardSchema(item);
-    const properties = Array.isArray(item.properties) ? transform(item.properties) : {};
+    const properties = Array.isArray(item.properties) ? schemaAdaptor(item.properties) : {};
     schema.type = item.fieldType || "void";
     schema.properties = properties;
     Object.assign(schema["x-decorator-props"], { showFeedback: false });
@@ -168,11 +172,11 @@ function useFieldList2Schema(collector) {
       title: item.alias || item.name,
       "x-component": "INPUT_GROUP",
       "x-component-props": { span: item.elem_width },
-      properties: transform(fieldList)
+      properties: schemaAdaptor(fieldList)
     };
   };
   const { normalize } = useTypeNormalize();
-  function transform(fieldList) {
+  function schemaAdaptor(fieldList) {
     let prevLinebar = null;
     return fieldList.reduce((fin, cur) => {
       var _a;
@@ -191,7 +195,7 @@ function useFieldList2Schema(collector) {
       return fin;
     }, {});
   }
-  return { transform };
+  return { schemaAdaptor };
 }
 
-export { useFieldList2Schema };
+export { useFieldListAdaptor };

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

@@ -1,4 +1,4 @@
-import { FieldItem, FieldVisitor } from "../types";
+import { FieldItem, FieldVisitor } from '../types';
 export declare function useFieldVisitor(): {
     traverse: (fieldList: FieldItem[], visitorMap?: FieldVisitor, key?: string) => FieldItem[];
 };

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

@@ -5,4 +5,5 @@ export declare function useFormContext(props: AnyObject): {
     businessCollector: import("../../../../../es/packages/form-render").BusinessCollector;
     changeContextCollector: import("../../../../../es/packages/form-render").ContextCollector;
     formItemDepsCollector: import("../../../../../es/packages/form-render").FormItemDepsCollector;
+    formUUID: any;
 };