cnhis-design-vue 3.1.5-beta.10 → 3.1.5-beta.13

package/es/packages/form-render/src/FormRender.vue.d.ts

@@ -1,6 +1,6 @@
 import { AnyObject } from 'cnhis-design-vue/es/src/types';
-import { FieldItem, FieldVisitor } from "./types";
-import { Component, FunctionalComponent, PropType } from "vue";
+import { FieldItem, FieldVisitor } from './types';
+import { Component, FunctionalComponent, PropType } from 'vue';
 declare const _default: import("vue").DefineComponent<{
     fieldList: {
         type: PropType<FieldItem[]>;
@@ -87,6 +87,10 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<AnyObject>;
         default: () => {};
     };
+    consumer: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }, {
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         fieldList: {
@@ -174,13 +178,17 @@ declare const _default: import("vue").DefineComponent<{
             type: PropType<AnyObject>;
             default: () => {};
         };
+        consumer: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
     }>> & {
         onFormChange?: ((...args: any[]) => any) | undefined;
     }>>;
     emit: (event: "formChange", ...args: any[]) => void;
-    create: () => import("./hooks").BusinessCollector;
-    trigger: (collector: import("./hooks").BusinessCollector, formModel: import("@formily/core").Form<any>, fieldName: string, value: unknown) => void;
-    collector: import("./hooks").BusinessCollector;
+    businessCollector: import("./hooks").BusinessCollector;
+    changeContextCollector: import("./hooks").ContextCollector;
+    formItemDepsCollector: import("./hooks").FormItemDepsCollector;
     formModel: import("@formily/core").Form<{
         [x: string]: any;
     }>;
@@ -304,6 +312,271 @@ declare const _default: import("vue").DefineComponent<{
     FormProvider: import("vue").DefineComponent<Record<"form", any>, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<Record<"form", any>>>, {
         form: any;
     }>;
+    FormConsumer: import("vue").DefineComponent<{}, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
+    NForm: import("vue").DefineComponent<{
+        readonly inline: BooleanConstructor;
+        readonly labelWidth: PropType<string | number>;
+        readonly labelAlign: PropType<import("naive-ui/es/form/src/interface").LabelAlign>;
+        readonly labelPlacement: {
+            readonly type: PropType<import("naive-ui/es/form/src/interface").LabelPlacement>;
+            readonly default: "top";
+        };
+        readonly model: {
+            readonly type: PropType<Record<string, any>>;
+            readonly default: () => void;
+        };
+        readonly rules: PropType<import("naive-ui").FormRules>;
+        readonly disabled: BooleanConstructor;
+        readonly size: PropType<import("naive-ui/es/form/src/interface").Size>;
+        readonly showRequireMark: {
+            readonly type: PropType<boolean | undefined>;
+            readonly default: undefined;
+        };
+        readonly requireMarkPlacement: PropType<"left" | "right" | "right-hanging">;
+        readonly showFeedback: {
+            readonly type: BooleanConstructor;
+            readonly default: true;
+        };
+        readonly onSubmit: {
+            readonly type: PropType<(e: Event) => void>;
+            readonly default: (e: Event) => void;
+        };
+        readonly showLabel: {
+            readonly type: PropType<boolean | undefined>;
+            readonly default: undefined;
+        };
+        readonly validateMessages: PropType<Partial<import("naive-ui/es/form/src/interface").FormValidateMessages>>;
+        readonly theme: PropType<import("naive-ui/es/_mixins").Theme<"Form", {
+            blankHeightSmall: string;
+            blankHeightMedium: string;
+            blankHeightLarge: string;
+            lineHeight: string;
+            labelTextColor: string;
+            asteriskColor: string;
+            feedbackTextColorError: string;
+            feedbackTextColorWarning: string;
+            feedbackTextColor: string;
+            feedbackPadding: string;
+            feedbackHeightSmall: string;
+            feedbackHeightMedium: string;
+            feedbackHeightLarge: string;
+            feedbackFontSizeSmall: string;
+            feedbackFontSizeMedium: string;
+            feedbackFontSizeLarge: string;
+            labelFontSizeLeftSmall: string;
+            labelFontSizeLeftMedium: string;
+            labelFontSizeLeftLarge: string;
+            labelFontSizeTopSmall: string;
+            labelFontSizeTopMedium: string;
+            labelFontSizeTopLarge: string;
+            labelHeightSmall: string;
+            labelHeightMedium: string;
+            labelHeightLarge: string;
+            labelPaddingVertical: string;
+            labelPaddingHorizontal: string;
+            labelTextAlignVertical: string;
+            labelTextAlignHorizontal: string;
+        }, any>>;
+        readonly themeOverrides: PropType<import("naive-ui/es/_mixins/use-theme").ExtractThemeOverrides<import("naive-ui/es/_mixins").Theme<"Form", {
+            blankHeightSmall: string;
+            blankHeightMedium: string;
+            blankHeightLarge: string;
+            lineHeight: string;
+            labelTextColor: string;
+            asteriskColor: string;
+            feedbackTextColorError: string;
+            feedbackTextColorWarning: string;
+            feedbackTextColor: string;
+            feedbackPadding: string;
+            feedbackHeightSmall: string;
+            feedbackHeightMedium: string;
+            feedbackHeightLarge: string;
+            feedbackFontSizeSmall: string;
+            feedbackFontSizeMedium: string;
+            feedbackFontSizeLarge: string;
+            labelFontSizeLeftSmall: string;
+            labelFontSizeLeftMedium: string;
+            labelFontSizeLeftLarge: string;
+            labelFontSizeTopSmall: string;
+            labelFontSizeTopMedium: string;
+            labelFontSizeTopLarge: string;
+            labelHeightSmall: string;
+            labelHeightMedium: string;
+            labelHeightLarge: string;
+            labelPaddingVertical: string;
+            labelPaddingHorizontal: string;
+            labelTextAlignVertical: string;
+            labelTextAlignHorizontal: string;
+        }, any>>>;
+        readonly builtinThemeOverrides: PropType<import("naive-ui/es/_mixins/use-theme").ExtractThemeOverrides<import("naive-ui/es/_mixins").Theme<"Form", {
+            blankHeightSmall: string;
+            blankHeightMedium: string;
+            blankHeightLarge: string;
+            lineHeight: string;
+            labelTextColor: string;
+            asteriskColor: string;
+            feedbackTextColorError: string;
+            feedbackTextColorWarning: string;
+            feedbackTextColor: string;
+            feedbackPadding: string;
+            feedbackHeightSmall: string;
+            feedbackHeightMedium: string;
+            feedbackHeightLarge: string;
+            feedbackFontSizeSmall: string;
+            feedbackFontSizeMedium: string;
+            feedbackFontSizeLarge: string;
+            labelFontSizeLeftSmall: string;
+            labelFontSizeLeftMedium: string;
+            labelFontSizeLeftLarge: string;
+            labelFontSizeTopSmall: string;
+            labelFontSizeTopMedium: string;
+            labelFontSizeTopLarge: string;
+            labelHeightSmall: string;
+            labelHeightMedium: string;
+            labelHeightLarge: string;
+            labelPaddingVertical: string;
+            labelPaddingHorizontal: string;
+            labelTextAlignVertical: string;
+            labelTextAlignHorizontal: string;
+        }, any>>>;
+    }, import("naive-ui").FormInst & {
+        mergedClsPrefix: import("vue").ComputedRef<string>;
+    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+        readonly inline: BooleanConstructor;
+        readonly labelWidth: PropType<string | number>;
+        readonly labelAlign: PropType<import("naive-ui/es/form/src/interface").LabelAlign>;
+        readonly labelPlacement: {
+            readonly type: PropType<import("naive-ui/es/form/src/interface").LabelPlacement>;
+            readonly default: "top";
+        };
+        readonly model: {
+            readonly type: PropType<Record<string, any>>;
+            readonly default: () => void;
+        };
+        readonly rules: PropType<import("naive-ui").FormRules>;
+        readonly disabled: BooleanConstructor;
+        readonly size: PropType<import("naive-ui/es/form/src/interface").Size>;
+        readonly showRequireMark: {
+            readonly type: PropType<boolean | undefined>;
+            readonly default: undefined;
+        };
+        readonly requireMarkPlacement: PropType<"left" | "right" | "right-hanging">;
+        readonly showFeedback: {
+            readonly type: BooleanConstructor;
+            readonly default: true;
+        };
+        readonly onSubmit: {
+            readonly type: PropType<(e: Event) => void>;
+            readonly default: (e: Event) => void;
+        };
+        readonly showLabel: {
+            readonly type: PropType<boolean | undefined>;
+            readonly default: undefined;
+        };
+        readonly validateMessages: PropType<Partial<import("naive-ui/es/form/src/interface").FormValidateMessages>>;
+        readonly theme: PropType<import("naive-ui/es/_mixins").Theme<"Form", {
+            blankHeightSmall: string;
+            blankHeightMedium: string;
+            blankHeightLarge: string;
+            lineHeight: string;
+            labelTextColor: string;
+            asteriskColor: string;
+            feedbackTextColorError: string;
+            feedbackTextColorWarning: string;
+            feedbackTextColor: string;
+            feedbackPadding: string;
+            feedbackHeightSmall: string;
+            feedbackHeightMedium: string;
+            feedbackHeightLarge: string;
+            feedbackFontSizeSmall: string;
+            feedbackFontSizeMedium: string;
+            feedbackFontSizeLarge: string;
+            labelFontSizeLeftSmall: string;
+            labelFontSizeLeftMedium: string;
+            labelFontSizeLeftLarge: string;
+            labelFontSizeTopSmall: string;
+            labelFontSizeTopMedium: string;
+            labelFontSizeTopLarge: string;
+            labelHeightSmall: string;
+            labelHeightMedium: string;
+            labelHeightLarge: string;
+            labelPaddingVertical: string;
+            labelPaddingHorizontal: string;
+            labelTextAlignVertical: string;
+            labelTextAlignHorizontal: string;
+        }, any>>;
+        readonly themeOverrides: PropType<import("naive-ui/es/_mixins/use-theme").ExtractThemeOverrides<import("naive-ui/es/_mixins").Theme<"Form", {
+            blankHeightSmall: string;
+            blankHeightMedium: string;
+            blankHeightLarge: string;
+            lineHeight: string;
+            labelTextColor: string;
+            asteriskColor: string;
+            feedbackTextColorError: string;
+            feedbackTextColorWarning: string;
+            feedbackTextColor: string;
+            feedbackPadding: string;
+            feedbackHeightSmall: string;
+            feedbackHeightMedium: string;
+            feedbackHeightLarge: string;
+            feedbackFontSizeSmall: string;
+            feedbackFontSizeMedium: string;
+            feedbackFontSizeLarge: string;
+            labelFontSizeLeftSmall: string;
+            labelFontSizeLeftMedium: string;
+            labelFontSizeLeftLarge: string;
+            labelFontSizeTopSmall: string;
+            labelFontSizeTopMedium: string;
+            labelFontSizeTopLarge: string;
+            labelHeightSmall: string;
+            labelHeightMedium: string;
+            labelHeightLarge: string;
+            labelPaddingVertical: string;
+            labelPaddingHorizontal: string;
+            labelTextAlignVertical: string;
+            labelTextAlignHorizontal: string;
+        }, any>>>;
+        readonly builtinThemeOverrides: PropType<import("naive-ui/es/_mixins/use-theme").ExtractThemeOverrides<import("naive-ui/es/_mixins").Theme<"Form", {
+            blankHeightSmall: string;
+            blankHeightMedium: string;
+            blankHeightLarge: string;
+            lineHeight: string;
+            labelTextColor: string;
+            asteriskColor: string;
+            feedbackTextColorError: string;
+            feedbackTextColorWarning: string;
+            feedbackTextColor: string;
+            feedbackPadding: string;
+            feedbackHeightSmall: string;
+            feedbackHeightMedium: string;
+            feedbackHeightLarge: string;
+            feedbackFontSizeSmall: string;
+            feedbackFontSizeMedium: string;
+            feedbackFontSizeLarge: string;
+            labelFontSizeLeftSmall: string;
+            labelFontSizeLeftMedium: string;
+            labelFontSizeLeftLarge: string;
+            labelFontSizeTopSmall: string;
+            labelFontSizeTopMedium: string;
+            labelFontSizeTopLarge: string;
+            labelHeightSmall: string;
+            labelHeightMedium: string;
+            labelHeightLarge: string;
+            labelPaddingVertical: string;
+            labelPaddingHorizontal: string;
+            labelTextAlignVertical: string;
+            labelTextAlignHorizontal: string;
+        }, any>>>;
+    }>>, {
+        readonly inline: boolean;
+        readonly disabled: boolean;
+        readonly onSubmit: (e: Event) => void;
+        readonly labelPlacement: import("naive-ui/es/form/src/interface").LabelPlacement;
+        readonly model: Record<string, any>;
+        readonly showRequireMark: boolean | undefined;
+        readonly showFeedback: boolean;
+        readonly showLabel: boolean | undefined;
+    }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "formChange"[], "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     fieldList: {
         type: PropType<FieldItem[]>;
@@ -390,6 +663,10 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<AnyObject>;
         default: () => {};
     };
+    consumer: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & {
     onFormChange?: ((...args: any[]) => any) | undefined;
 }, {
@@ -398,5 +675,6 @@ declare const _default: import("vue").DefineComponent<{
     initialData: AnyObject;
     parallelism: number;
     scope: AnyObject;
+    consumer: boolean;
 }>;
 export default _default;

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

@@ -1,16 +1,20 @@
-import { defineComponent, computed, openBlock, createElementBlock, normalizeStyle, createVNode, unref, withCtx, renderSlot } from 'vue';
+import { defineComponent, provide, computed, openBlock, createBlock, unref, normalizeStyle, withCtx, createVNode, renderSlot, createElementVNode, toDisplayString, createCommentVNode } from 'vue';
 import { injectOrProvide } from './utils/index2.mjs';
 import { cloneDeep } from 'lodash-es';
-import { InjectionBusinessCollector, InjectAsyncQueue, InjectionSchemaField } from './constants/index2.mjs';
+import { InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectAsyncQueue, InjectionSchemaField } from './constants/index2.mjs';
 import { useFieldList2Schema } from './hooks/useFieldList2Schema2.mjs';
-import { FormProvider, createSchemaField } from '@formily/vue';
+import { FormProvider, FormConsumer, createSchemaField } from '@formily/vue';
 import { useAsyncQueue } from './hooks/useAsyncQueue2.mjs';
 import { useFieldVisitor } from './hooks/useFieldVisitor2.mjs';
 import '@vueuse/core';
 import { useBusinessBinding } from './hooks/useBusinessBinding2.mjs';
+import { useChangeContext } from './hooks/useChangeContext2.mjs';
+import { useFormItemDeps } from './hooks/useFormItemDeps2.mjs';
 import * as index from './components/index2.mjs';
 import { createForm, onFieldValueChange } from '@formily/core';
+import { NForm } from 'naive-ui';
 
+const _hoisted_1 = { style: { "white-space": "pre" } };
 var script = /* @__PURE__ */ defineComponent({
   __name: "FormRender",
   props: {
@@ -24,25 +28,35 @@ var script = /* @__PURE__ */ defineComponent({
       type: Object,
       default: () => ({})
     },
-    scope: { type: Object, default: () => ({}) }
+    scope: { type: Object, default: () => ({}) },
+    consumer: { type: Boolean, default: false }
   },
-  emits: ["formChange"],
+  emits: [
+    "formChange"
+  ],
   setup(__props, { expose, emit }) {
     const props = __props;
-    const { create, trigger } = useBusinessBinding();
-    const collector = injectOrProvide(InjectionBusinessCollector, create);
     injectOrProvide(InjectAsyncQueue, () => useAsyncQueue().create(props.parallelism));
+    const businessCollector = useBusinessBinding().create();
+    provide(InjectionBusinessCollector, businessCollector);
+    const changeContextCollector = useChangeContext().create();
+    provide(InjectionChangeContextCollector, changeContextCollector);
+    const formItemDepsCollector = useFormItemDeps().create();
+    provide(InjectionFormItemDepsCollector, formItemDepsCollector);
     const formModel = createForm({
       initialValues: props.initialData,
       effects() {
         onFieldValueChange("*", (field) => {
+          const fieldKey = field.props.name.toString();
           emit("formChange", {
             fieldInstance: field,
-            fieldKey: field.props.name,
+            fieldKey,
             fieldName: field.title,
-            value: field.value
+            value: field.value,
+            context: changeContextCollector.getContext(fieldKey)
           });
-          trigger(collector, formModel, field.props.name, field.value);
+          businessCollector.trigger(formModel, fieldKey, field.value);
+          formItemDepsCollector.trigger(fieldKey);
         });
       }
     });
@@ -51,11 +65,12 @@ var script = /* @__PURE__ */ defineComponent({
       scope: props.scope
     }).SchemaField);
     const { traverse } = useFieldVisitor();
-    const { transform } = useFieldList2Schema(collector);
+    const { transform } = useFieldList2Schema(businessCollector);
     const renderSchema = computed(() => {
       if (props.schema) {
         return props.schema;
-      } else if (props.fieldList) {
+      }
+      if (props.fieldList) {
         const _fieldList = traverse(cloneDeep(props.fieldList), props.fieldVisitor);
         return { type: "object", properties: transform(_fieldList) };
       }
@@ -72,19 +87,28 @@ var script = /* @__PURE__ */ defineComponent({
       setFieldState: formModel.setFieldState.bind(formModel)
     });
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("section", {
+      return openBlock(), createBlock(unref(NForm), {
         class: "form-render__wrapper",
         style: normalizeStyle({ "--column": __props.column })
-      }, [
-        createVNode(unref(FormProvider), { form: unref(formModel) }, {
-          default: withCtx(() => [
-            renderSlot(_ctx.$slots, "default", { schemaFiled: unref(SchemaField) }, () => [
-              createVNode(unref(SchemaField), { schema: unref(renderSchema) }, null, 8, ["schema"])
-            ])
-          ]),
-          _: 3
-        }, 8, ["form"])
-      ], 4);
+      }, {
+        default: withCtx(() => [
+          createVNode(unref(FormProvider), { form: unref(formModel) }, {
+            default: withCtx(() => [
+              renderSlot(_ctx.$slots, "default", { schemaFiled: unref(SchemaField) }, () => [
+                createVNode(unref(SchemaField), { schema: unref(renderSchema) }, null, 8, ["schema"])
+              ]),
+              __props.consumer ? (openBlock(), createBlock(unref(FormConsumer), { key: 0 }, {
+                default: withCtx(({ form }) => [
+                  createElementVNode("div", _hoisted_1, toDisplayString(JSON.stringify(form.values, null, 2)), 1)
+                ]),
+                _: 1
+              })) : createCommentVNode("v-if", true)
+            ]),
+            _: 3
+          }, 8, ["form"])
+        ]),
+        _: 3
+      }, 8, ["style"]);
     };
   }
 });

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

@@ -1,10 +1,14 @@
-import { AnyObject } from 'cnhis-design-vue/es/src/types';
+import { AnyObject, ArrayAble } from 'cnhis-design-vue/es/src/types';
 import { FormRequestType } from '../types';
 import { PropType } from 'vue';
+declare type DependKeyObj = {
+    paramName: string;
+    paramValue: string;
+};
 declare type UrlConfig = {
     method: FormRequestType;
     nameKey: string;
-    dependKey: string;
+    dependKey: ArrayAble<string> | ArrayAble<DependKeyObj>;
     url: string;
     valueKey: string;
 };
@@ -20,6 +24,8 @@ export declare const SEARCH_CASCADE: import("vue").DefineComponent<{
     urlConfig: {
         type: PropType<UrlConfig>;
     };
+    onChange: {};
+    value: {};
 }, () => 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<{
     options: {
         type: PropType<AnyObject[]>;
@@ -32,6 +38,8 @@ export declare const SEARCH_CASCADE: import("vue").DefineComponent<{
     urlConfig: {
         type: PropType<UrlConfig>;
     };
+    onChange: {};
+    value: {};
 }>> & {
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
 }, {

package/es/packages/form-render/src/components/cascader2.mjs

@@ -1,8 +1,10 @@
-import { defineComponent, ref, inject, computed, watch, createVNode, Fragment, mergeProps } from 'vue';
+import { defineComponent, ref, inject, computed, watch, createVNode } from 'vue';
+import { isObject, isString } from 'lodash-es';
 import { InjectAsyncQueue } from '../constants/index2.mjs';
-import { assignUpdateValue, formRenderLog } from '../utils/index2.mjs';
-import { isObject } from '@vueuse/core';
+import { assignUpdateValue, formRenderLog, arrayed } from '../utils/index2.mjs';
+import '@vueuse/core';
 import { useFormField } from '../hooks/useFormField2.mjs';
+import 'cnhis-design-vue/es/packages/form-render/src/utils';
 import { connect, mapProps } from '@formily/vue';
 import { NCascader } from 'naive-ui';
 
@@ -19,7 +21,9 @@ const script = defineComponent({
     },
     urlConfig: {
       type: Object
-    }
+    },
+    onChange: {},
+    value: {}
   },
   emits: ["update:value"],
   setup(props, {
@@ -50,11 +54,17 @@ const script = defineComponent({
         lvlnr: parentDepth + 1 + ""
       };
       if (option) {
-        if (!props.urlConfig.dependKey) {
-          formRenderLog(`invalid urlConfig.dependKey ${props.urlConfig.dependKey} in CASCADER => ${title.value}`, "warn");
+        if (!config.dependKey) {
+          formRenderLog(`invalid urlConfig.dependKey ${config.dependKey} in CASCADER => ${title.value}`, "warn");
           return;
         }
-        params[props.urlConfig.dependKey] = option[config.valueKey];
+        arrayed(config.dependKey).forEach((key) => {
+          if (isString(key)) {
+            params[key] = option[config.valueKey];
+          } else if (isObject(key)) {
+            params[key.paramName] = option[key.paramValue];
+          }
+        });
       }
       const data = await asyncQueue.addAsync({
         ...config,
@@ -75,18 +85,13 @@ const script = defineComponent({
     const renderOptions = computed(() => {
       return _options.value || props.options || [];
     });
-    watch(() => attrs.value, (n, o) => {
+    watch(() => props.value, (n, o) => {
       if (n != null && o == null) {
         fetchData();
       }
     }, {
       immediate: true
     });
-    function updateValue(v, _, options) {
-      var _a;
-      const payload = (_a = options == null ? void 0 : options.map((option) => option[labelKey.value])) == null ? void 0 : _a.join(" / ");
-      emit("update:value", payload);
-    }
     const labelKey = computed(() => {
       var _a, _b;
       return (_b = (_a = props.urlConfig) == null ? void 0 : _a.nameKey) != null ? _b : "text";
@@ -95,14 +100,27 @@ const script = defineComponent({
       var _a, _b;
       return (_b = (_a = props.urlConfig) == null ? void 0 : _a.valueKey) != null ? _b : "value";
     });
-    const _attrs = computed(() => {
-      return {
-        ...attrs,
-        onChange: void 0
-      };
+    const _value = computed(() => {
+      try {
+        const parsed = Array.isArray(props.value) ? props.value : JSON.parse(props.value || "");
+        if (Array.isArray(parsed)) {
+          return parsed.map((option) => option[labelKey.value]).join(" / ");
+        }
+      } catch (e) {
+        return "";
+      }
     });
+    function updateValue(v, _, options) {
+      const payload = Array.isArray(options) ? options.map((option) => ({
+        ...option,
+        label: option[labelKey.value],
+        children: void 0
+      })) : options;
+      emit("update:value", payload);
+    }
     return () => {
-      return createVNode(Fragment, null, [createVNode(NCascader, mergeProps(_attrs.value, {
+      return createVNode(NCascader, {
+        "value": _value.value,
         "onUpdate:value": updateValue,
         "remote": true,
         "labelField": labelKey.value,
@@ -111,7 +129,7 @@ const script = defineComponent({
         "checkStrategy": "child",
         "onLoad": fetchData,
         "onUpdate:show": (show) => show && fetchData()
-      }), slots)]);
+      }, slots);
     };
   }
 });

package/es/packages/form-render/src/components/combination2.mjs

@@ -71,11 +71,11 @@ const script = defineComponent({
       event.stopPropagation();
     }
     function onChange(idx, {
-      field,
+      fieldKey,
       value
     }) {
       !_values.value[idx] && (_values.value[idx] = {});
-      _values.value[idx][field] = value;
+      _values.value[idx][fieldKey] = value;
       emitChange();
     }
     const FormRenderComponent = script$1;

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

@@ -0,0 +1,13 @@
+export declare const COMPLEX: import("vue").DefineComponent<{
+    span: {
+        type: NumberConstructor;
+        default: number;
+    };
+}, () => 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<{
+    span: {
+        type: NumberConstructor;
+        default: number;
+    };
+}>>, {
+    span: number;
+}>;

package/es/packages/form-render/src/components/complex.mjs

@@ -0,0 +1 @@
+export { COMPLEX } from './complex2.mjs';

package/es/packages/form-render/src/components/complex2.mjs

@@ -0,0 +1,31 @@
+import { defineComponent, createVNode } from 'vue';
+import { connect, mapProps } from '@formily/vue';
+import { assignUpdateValue } from 'cnhis-design-vue/es/packages/form-render/src/utils';
+
+const script = defineComponent({
+  props: {
+    span: {
+      type: Number,
+      default: 6
+    }
+  },
+  setup(props, {
+    slots,
+    attrs
+  }) {
+    function onChange(e) {
+      e.stopPropagation();
+    }
+    return () => {
+      return createVNode("section", {
+        "class": "form-render__complex"
+      }, [createVNode("section", {
+        "class": "form-render__complexContent",
+        "onChange": onChange
+      }, [slots.default && slots.default()])]);
+    };
+  }
+});
+const COMPLEX = connect(script, mapProps(assignUpdateValue));
+
+export { COMPLEX };