cnhis-design-vue 3.1.18-beta.4 → 3.1.18-beta.5

package/es/components/form-render/src/FormRender.js

@@ -1,5 +1,5 @@
 import { defineComponent, ref, computed, watch, openBlock, createBlock, unref, withCtx, createElementBlock, createVNode, isRef, Fragment, renderList, createCommentVNode, createElementVNode, normalizeStyle, toDisplayString, nextTick } from 'vue';
-import { createForm, onFieldValueChange, isField } from '@formily/core';
+import { createForm, onFieldValueChange } from '@formily/core';
 import { FormProvider, FormConsumer } from '@formily/vue';
 import { isObject } from '@vue/shared';
 import { cloneDeep, isArray } from 'lodash-es';
@@ -146,17 +146,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         formModel.setFieldState(path, handler);
       },
       resetFields(path = "*") {
-        formModel.setFieldState(path, (field) => {
-          var _a;
-          if (isField(field)) {
-            field.modified = false;
-            field.visited = false;
-            field.feedbacks = [];
-            field.selfModified = false;
-            field.caches = {};
-            field.value = (_a = field.initialValue) != null ? _a : null;
-          }
-        });
+        formModel.reset(path);
       },
       async queryWidget(key) {
         return scrollbarRef.value ? await queryWidget(key, scrollbarRef.value, props.fieldList || []) : null;

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

@@ -8,7 +8,7 @@ import '../../../index.js';
 import '@formily/path';
 import '@vue/shared';
 import 'date-fns';
-import { assignUpdateValue, traverseDependKey } from '../../utils/schema.js';
+import { assignUpdateValue, assignValueBindKey, traverseDependKey } from '../../utils/schema.js';
 import { useFormField } from '../../hooks/useFormField.js';
 import '../../../../../shared/utils/tapable/SyncHook.js';
 import '../../../../../shared/utils/tapable/SyncBailHook.js';
@@ -203,6 +203,6 @@ const script = defineComponent({
 });
 const SEARCH_CASCADE = connect(script, mapProps({
   dataSource: "options"
-}, assignUpdateValue));
+}, assignUpdateValue, assignValueBindKey));
 
 export { SEARCH_CASCADE };

package/es/components/form-render/src/components/renderer/checkbox.js

@@ -3,7 +3,7 @@ import '@formily/path';
 import '@vue/shared';
 import 'lodash-es';
 import 'date-fns';
-import { assignUpdateValue } from '../../utils/schema.js';
+import { assignUpdateValue, assignValueBindKey } from '../../utils/schema.js';
 import { connect, mapProps } from '@formily/vue';
 import { NCheckboxGroup, NSpace, NCheckbox } from 'naive-ui';
 
@@ -40,6 +40,6 @@ const script = defineComponent({
 });
 const CHECKBOX = connect(script, mapProps({
   dataSource: "options"
-}, assignUpdateValue));
+}, assignUpdateValue, assignValueBindKey));
 
 export { CHECKBOX };

package/es/components/form-render/src/components/renderer/date.js

@@ -8,7 +8,7 @@ import { useCommonInjection } from '../../hooks/useCommonInjection.js';
 import '@formily/path';
 import '@vue/shared';
 import 'lodash-es';
-import { assignUpdateValue } from '../../utils/schema.js';
+import { assignUpdateValue, assignValueBindKey } from '../../utils/schema.js';
 
 const script = defineComponent({
   props: {
@@ -112,6 +112,6 @@ const script = defineComponent({
     }), null);
   }
 });
-const DATE = connect(script, mapProps(assignUpdateValue));
+const DATE = connect(script, mapProps(assignUpdateValue, assignValueBindKey));
 
 export { DATE };

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

@@ -1,15 +1,23 @@
 export declare const INPUT: import("vue").DefineComponent<{
+    value: {
+        type: StringConstructor;
+    };
     prefix: {
         type: StringConstructor;
     };
     suffix: {
         type: StringConstructor;
     };
-}, () => 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<{
+}, () => 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<{
+    value: {
+        type: StringConstructor;
+    };
     prefix: {
         type: StringConstructor;
     };
     suffix: {
         type: StringConstructor;
     };
-}>>, {}>;
+}>> & {
+    "onUpdate:value"?: ((...args: any[]) => any) | undefined;
+}, {}>;

package/es/components/form-render/src/components/renderer/input.js

@@ -1,4 +1,5 @@
-import { defineComponent, createVNode } from 'vue';
+import { defineComponent, computed, createVNode } from 'vue';
+import { useCommonInjection } from '../../hooks/useCommonInjection.js';
 import { createInputSlot } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NInput } from 'naive-ui';
@@ -7,6 +8,9 @@ import { assignUpdateValue } from '../../utils/schema.js';
 const script = defineComponent({
   name: "FormInput",
   props: {
+    value: {
+      type: String
+    },
     prefix: {
       type: String
     },
@@ -14,10 +18,22 @@ const script = defineComponent({
       type: String
     }
   },
-  setup(props) {
+  emits: ["update:value"],
+  setup(props, {
+    emit
+  }) {
+    const valueRef = computed({
+      get: () => props.value,
+      set: (v) => emit("update:value", v)
+    });
+    const key = useCommonInjection().injectValueBindKey(valueRef);
     const _slots = createInputSlot(props);
     return () => {
-      return createVNode(NInput, null, _slots.value);
+      return createVNode(NInput, {
+        "key": key.value,
+        "value": valueRef.value,
+        "onUpdate:value": ($event) => valueRef.value = $event
+      }, _slots.value);
     };
   }
 });

package/es/components/form-render/src/components/renderer/inputNumber.js

@@ -39,8 +39,10 @@ const script = defineComponent({
         return (_a = props.onChange) == null ? void 0 : _a.call(props, v);
       }
     });
+    const key = useCommonInjection().injectValueBindKey(valueRef);
     return () => {
       return createVNode(NInputNumber, {
+        "key": key.value,
         "value": valueRef.value,
         "onUpdate:value": ($event) => valueRef.value = $event,
         "show-button": false

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

@@ -5,7 +5,7 @@ import { NRadioGroup, NSpace, NRadio } from 'naive-ui';
 import '@formily/path';
 import '@vue/shared';
 import 'date-fns';
-import { assignUpdateValue } from '../../utils/schema.js';
+import { assignUpdateValue, assignValueBindKey } from '../../utils/schema.js';
 
 const script = defineComponent({
   props: {
@@ -64,6 +64,6 @@ const script = defineComponent({
 });
 const RADIO = connect(script, mapProps({
   dataSource: "options"
-}, assignUpdateValue));
+}, assignUpdateValue, assignValueBindKey));
 
 export { RADIO };

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

@@ -37,7 +37,7 @@ import './slider.js';
 import './complex.js';
 import './simpleComponent.js';
 import { NSelect } from 'naive-ui';
-import { assignUpdateValue, traverseDependKey } from '../../utils/schema.js';
+import { assignUpdateValue, assignValueBindKey, traverseDependKey } from '../../utils/schema.js';
 
 const script = defineComponent({
   name: "FormSelect",
@@ -190,6 +190,6 @@ const script = defineComponent({
 });
 const SELECT = connect(script, mapProps({
   dataSource: "options"
-}, assignUpdateValue));
+}, assignUpdateValue, assignValueBindKey));
 
 export { SELECT };

package/es/components/form-render/src/components/renderer/slider.js

@@ -2,7 +2,7 @@ import { defineComponent, computed, createVNode } from 'vue';
 import { connect, mapProps } from '@formily/vue';
 import { NSlider } from 'naive-ui';
 import { parseNumberFromMaybeString } from '../../utils/index.js';
-import { assignUpdateValue } from '../../utils/schema.js';
+import { assignUpdateValue, assignValueBindKey } from '../../utils/schema.js';
 
 const script = defineComponent({
   props: {
@@ -24,7 +24,7 @@ const script = defineComponent({
     }, null);
   }
 });
-const SLIDER = connect(script, mapProps((props, field) => {
+const SLIDER = connect(script, mapProps(assignUpdateValue, (props, field) => {
   const _props = assignUpdateValue(props, field);
   if (Array.isArray(_props.option)) {
     _props.marks = _props.option.reduce((fin, option) => {
@@ -33,6 +33,6 @@ const SLIDER = connect(script, mapProps((props, field) => {
     }, {});
   }
   return _props;
-}));
+}, assignValueBindKey));
 
 export { SLIDER };

package/es/components/form-render/src/components/renderer/switch.js

@@ -4,7 +4,7 @@ import '@formily/path';
 import '@vue/shared';
 import 'lodash-es';
 import 'date-fns';
-import { assignUpdateValue } from '../../utils/schema.js';
+import { assignUpdateValue, assignValueBindKey } from '../../utils/schema.js';
 import { connect, mapProps } from '@formily/vue';
 
 const script = defineComponent({
@@ -46,6 +46,6 @@ const script = defineComponent({
     };
   }
 });
-const SWITCH = connect(script, mapProps(assignUpdateValue));
+const SWITCH = connect(script, mapProps(assignUpdateValue, assignValueBindKey));
 
 export { SWITCH };

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

@@ -1,848 +1,11 @@
 export declare const TEXTAREA: import("vue").DefineComponent<{
-    bordered: {
-        type: import("vue").PropType<boolean | undefined>;
-        default: undefined;
+    value: {
+        type: StringConstructor;
     };
-    type: {
-        type: import("vue").PropType<"text" | "textarea" | "password">;
-        default: string;
+}, () => 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<{
+    value: {
+        type: StringConstructor;
     };
-    placeholder: import("vue").PropType<string | [string, string]>;
-    defaultValue: {
-        type: import("vue").PropType<string | [string, string] | null>;
-        default: null;
-    };
-    value: import("vue").PropType<string | [string, string] | null>;
-    disabled: {
-        type: import("vue").PropType<boolean | undefined>;
-        default: undefined;
-    };
-    size: import("vue").PropType<import("naive-ui/es/input/src/interface").Size>;
-    rows: {
-        type: import("vue").PropType<string | number>;
-        default: number;
-    };
-    round: BooleanConstructor;
-    minlength: import("vue").PropType<string | number>;
-    maxlength: import("vue").PropType<string | number>;
-    clearable: BooleanConstructor;
-    autosize: {
-        type: import("vue").PropType<boolean | {
-            minRows?: number | undefined;
-            maxRows?: number | undefined;
-        }>;
-        default: boolean;
-    };
-    pair: BooleanConstructor;
-    separator: StringConstructor;
-    readonly: {
-        type: (BooleanConstructor | StringConstructor)[];
-        default: boolean;
-    };
-    passivelyActivated: BooleanConstructor;
-    showPasswordOn: import("vue").PropType<"click" | "mousedown">;
-    stateful: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    autofocus: BooleanConstructor;
-    inputProps: import("vue").PropType<import("vue").InputHTMLAttributes | import("vue").TextareaHTMLAttributes>;
-    resizable: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    showCount: BooleanConstructor;
-    loading: {
-        type: BooleanConstructor;
-        default: undefined;
-    };
-    allowInput: import("vue").PropType<(value: string) => boolean>;
-    onMousedown: import("vue").PropType<(e: MouseEvent) => void>;
-    onKeydown: import("vue").PropType<(e: KeyboardEvent) => void>;
-    onKeyup: import("vue").PropType<(e: KeyboardEvent) => void>;
-    onInput: import("vue").PropType<import("naive-ui/es/input/src/interface").OnUpdateValue>;
-    onFocus: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: FocusEvent) => void>>;
-    onBlur: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: FocusEvent) => void>>;
-    onClick: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: MouseEvent) => void>>;
-    onChange: import("vue").PropType<import("naive-ui/es/input/src/interface").OnUpdateValue>;
-    onClear: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: MouseEvent) => void>>;
-    status: import("vue").PropType<import("naive-ui/es/form/src/interface").FormValidationStatus>;
-    'onUpdate:value': import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<import("naive-ui/es/input/src/interface").OnUpdateValue>>;
-    onUpdateValue: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<import("naive-ui/es/input/src/interface").OnUpdateValue>>;
-    textDecoration: import("vue").PropType<string | [string, string]>;
-    attrSize: {
-        type: NumberConstructor;
-        default: number;
-    };
-    onInputBlur: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: FocusEvent) => void>>;
-    onInputFocus: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: FocusEvent) => void>>;
-    onDeactivate: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<() => void>>;
-    onActivate: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<() => void>>;
-    onWrapperFocus: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: FocusEvent) => void>>;
-    onWrapperBlur: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: FocusEvent) => void>>;
-    internalDeactivateOnEnter: BooleanConstructor;
-    internalForceFocus: BooleanConstructor;
-    internalLoadingBeforeSuffix: BooleanConstructor;
-    showPasswordToggle: BooleanConstructor;
-    theme: import("vue").PropType<import("naive-ui/es/_mixins").Theme<"Input", {
-        countTextColor: string;
-        heightTiny: string;
-        heightSmall: string;
-        heightMedium: string;
-        heightLarge: string;
-        fontSizeTiny: string;
-        fontSizeSmall: string;
-        fontSizeMedium: string;
-        fontSizeLarge: string;
-        lineHeight: string;
-        lineHeightTextarea: string;
-        borderRadius: string;
-        iconSize: string;
-        groupLabelColor: string;
-        groupLabelTextColor: string;
-        textColor: string;
-        textColorDisabled: string;
-        textDecorationColor: string;
-        caretColor: string;
-        placeholderColor: string;
-        placeholderColorDisabled: string;
-        color: string;
-        colorDisabled: string;
-        colorFocus: string;
-        groupLabelBorder: string;
-        border: string;
-        borderHover: string;
-        borderDisabled: string;
-        borderFocus: string;
-        boxShadowFocus: string;
-        loadingColor: string;
-        loadingColorWarning: string;
-        borderWarning: string;
-        borderHoverWarning: string;
-        colorFocusWarning: string;
-        borderFocusWarning: string;
-        boxShadowFocusWarning: string;
-        caretColorWarning: string;
-        loadingColorError: string;
-        borderError: string;
-        borderHoverError: string;
-        colorFocusError: string;
-        borderFocusError: string;
-        boxShadowFocusError: string;
-        caretColorError: string;
-        clearColor: string;
-        clearColorHover: string;
-        clearColorPressed: string;
-        iconColor: string;
-        iconColorDisabled: string;
-        iconColorHover: string;
-        iconColorPressed: string;
-        suffixTextColor: string;
-        paddingTiny: string;
-        paddingSmall: string;
-        paddingMedium: string;
-        paddingLarge: string;
-        clearSize: string;
-    }, any>>;
-    themeOverrides: import("vue").PropType<import("naive-ui/es/_mixins/use-theme").ExtractThemeOverrides<import("naive-ui/es/_mixins").Theme<"Input", {
-        countTextColor: string;
-        heightTiny: string;
-        heightSmall: string;
-        heightMedium: string;
-        heightLarge: string;
-        fontSizeTiny: string;
-        fontSizeSmall: string;
-        fontSizeMedium: string;
-        fontSizeLarge: string;
-        lineHeight: string;
-        lineHeightTextarea: string;
-        borderRadius: string;
-        iconSize: string;
-        groupLabelColor: string;
-        groupLabelTextColor: string;
-        textColor: string;
-        textColorDisabled: string;
-        textDecorationColor: string;
-        caretColor: string;
-        placeholderColor: string;
-        placeholderColorDisabled: string;
-        color: string;
-        colorDisabled: string;
-        colorFocus: string;
-        groupLabelBorder: string;
-        border: string;
-        borderHover: string;
-        borderDisabled: string;
-        borderFocus: string;
-        boxShadowFocus: string;
-        loadingColor: string;
-        loadingColorWarning: string;
-        borderWarning: string;
-        borderHoverWarning: string;
-        colorFocusWarning: string;
-        borderFocusWarning: string;
-        boxShadowFocusWarning: string;
-        caretColorWarning: string;
-        loadingColorError: string;
-        borderError: string;
-        borderHoverError: string;
-        colorFocusError: string;
-        borderFocusError: string;
-        boxShadowFocusError: string;
-        caretColorError: string;
-        clearColor: string;
-        clearColorHover: string;
-        clearColorPressed: string;
-        iconColor: string;
-        iconColorDisabled: string;
-        iconColorHover: string;
-        iconColorPressed: string;
-        suffixTextColor: string;
-        paddingTiny: string;
-        paddingSmall: string;
-        paddingMedium: string;
-        paddingLarge: string;
-        clearSize: string;
-    }, any>>>;
-    builtinThemeOverrides: import("vue").PropType<import("naive-ui/es/_mixins/use-theme").ExtractThemeOverrides<import("naive-ui/es/_mixins").Theme<"Input", {
-        countTextColor: string;
-        heightTiny: string;
-        heightSmall: string;
-        heightMedium: string;
-        heightLarge: string;
-        fontSizeTiny: string;
-        fontSizeSmall: string;
-        fontSizeMedium: string;
-        fontSizeLarge: string;
-        lineHeight: string;
-        lineHeightTextarea: string;
-        borderRadius: string;
-        iconSize: string;
-        groupLabelColor: string;
-        groupLabelTextColor: string;
-        textColor: string;
-        textColorDisabled: string;
-        textDecorationColor: string;
-        caretColor: string;
-        placeholderColor: string;
-        placeholderColorDisabled: string;
-        color: string;
-        colorDisabled: string;
-        colorFocus: string;
-        groupLabelBorder: string;
-        border: string;
-        borderHover: string;
-        borderDisabled: string;
-        borderFocus: string;
-        boxShadowFocus: string;
-        loadingColor: string;
-        loadingColorWarning: string;
-        borderWarning: string;
-        borderHoverWarning: string;
-        colorFocusWarning: string;
-        borderFocusWarning: string;
-        boxShadowFocusWarning: string;
-        caretColorWarning: string;
-        loadingColorError: string;
-        borderError: string;
-        borderHoverError: string;
-        colorFocusError: string;
-        borderFocusError: string;
-        boxShadowFocusError: string;
-        caretColorError: string;
-        clearColor: string;
-        clearColorHover: string;
-        clearColorPressed: string;
-        iconColor: string;
-        iconColorDisabled: string;
-        iconColorHover: string;
-        iconColorPressed: string;
-        suffixTextColor: string;
-        paddingTiny: string;
-        paddingSmall: string;
-        paddingMedium: string;
-        paddingLarge: string;
-        clearSize: string;
-    }, any>>>;
-}, {
-    wrapperElRef: import("vue").Ref<HTMLElement | null>;
-    inputElRef: import("vue").Ref<HTMLInputElement | null>;
-    inputMirrorElRef: import("vue").Ref<HTMLElement | null>;
-    inputEl2Ref: import("vue").Ref<HTMLInputElement | null>;
-    textareaElRef: import("vue").Ref<HTMLTextAreaElement | null>;
-    textareaMirrorElRef: import("vue").Ref<HTMLElement | null>;
-    textareaScrollbarInstRef: import("vue").Ref<{
-        $el: HTMLElement;
-        containerRef: HTMLElement | null;
-        contentRef: HTMLElement | null;
-        containerScrollTop: number;
-        syncUnifiedContainer: () => void;
-        scrollTo: import("naive-ui/es/_internal/scrollbar/src/Scrollbar").ScrollTo;
-        scrollBy: import("naive-ui/es/_internal/scrollbar/src/Scrollbar").ScrollBy;
-        sync: () => void;
-        handleMouseEnterWrapper: () => void;
-        handleMouseLeaveWrapper: () => void;
-    } | null>;
-    rtlEnabled: import("vue").Ref<import("naive-ui/es/config-provider/src/internal-interface").RtlItem | undefined> | undefined;
-    uncontrolledValue: import("vue").Ref<string | [string, string] | null>;
-    mergedValue: import("vue").ComputedRef<string | [string, string] | null>;
-    passwordVisible: import("vue").Ref<boolean>;
-    mergedPlaceholder: import("vue").ComputedRef<[string, string] | [string]>;
-    showPlaceholder1: import("vue").ComputedRef<string | false>;
-    showPlaceholder2: import("vue").ComputedRef<boolean | "" | undefined>;
-    mergedFocus: import("vue").ComputedRef<boolean>;
-    isComposing: import("vue").Ref<boolean>;
-    activated: import("vue").Ref<boolean>;
-    showClearButton: import("vue").ComputedRef<boolean>;
-    mergedSize: import("vue").ComputedRef<"small" | "medium" | "tiny" | "large">;
-    mergedDisabled: import("vue").ComputedRef<boolean>;
-    textDecorationStyle: import("vue").ComputedRef<string[] | {
-        textDecoration: string;
-    }[]>;
-    mergedClsPrefix: import("vue").ComputedRef<string>;
-    mergedBordered: import("vue").ComputedRef<boolean>;
-    mergedShowPasswordOn: import("vue").ComputedRef<"click" | "mousedown" | undefined>;
-    placeholderStyle: import("vue").Ref<{
-        top: string;
-    }>;
-    mergedStatus: import("vue").ComputedRef<import("naive-ui/es/form/src/interface").FormValidationStatus | undefined>;
-    textAreaScrollContainerWidth: import("vue").Ref<number | undefined>;
-    handleTextAreaScroll: (e: Event) => void;
-    handleCompositionStart: () => void;
-    handleCompositionEnd: (e: CompositionEvent) => void;
-    handleInput: (e: Event | CompositionEvent | InputEvent, index?: 0 | 1 | undefined, event?: string | undefined) => void;
-    handleInputBlur: (e: FocusEvent) => void;
-    handleInputFocus: (e: FocusEvent, index: number) => void;
-    handleWrapperBlur: (e: FocusEvent) => void;
-    handleWrapperFocus: (e: FocusEvent) => void;
-    handleMouseEnter: () => void;
-    handleMouseLeave: () => void;
-    handleMouseDown: (e: MouseEvent) => void;
-    handleChange: (e: Event, index?: 0 | 1 | undefined) => void;
-    handleClick: (e: MouseEvent) => void;
-    handleClear: (e: MouseEvent) => void;
-    handlePasswordToggleClick: () => void;
-    handlePasswordToggleMousedown: (e: MouseEvent) => void;
-    handleWrapperKeydown: (e: KeyboardEvent) => void;
-    handleTextAreaMirrorResize: () => void;
-    getTextareaScrollContainer: () => HTMLTextAreaElement | null;
-    mergedTheme: import("vue").ComputedRef<{
-        common: {
-            baseColor: string;
-            primaryColor: string;
-            primaryColorHover: string;
-            primaryColorPressed: string;
-            primaryColorSuppl: string;
-            infoColor: string;
-            infoColorHover: string;
-            infoColorPressed: string;
-            infoColorSuppl: string;
-            successColor: string;
-            successColorHover: string;
-            successColorPressed: string;
-            successColorSuppl: string;
-            warningColor: string;
-            warningColorHover: string;
-            warningColorPressed: string;
-            warningColorSuppl: string;
-            errorColor: string;
-            errorColorHover: string;
-            errorColorPressed: string;
-            errorColorSuppl: string;
-            textColorBase: string;
-            textColor1: string;
-            textColor2: string;
-            textColor3: string;
-            textColorDisabled: string;
-            placeholderColor: string;
-            placeholderColorDisabled: string;
-            iconColor: string;
-            iconColorHover: string;
-            iconColorPressed: string;
-            iconColorDisabled: string;
-            opacity1: string;
-            opacity2: string;
-            opacity3: string;
-            opacity4: string;
-            opacity5: string;
-            dividerColor: string;
-            borderColor: string;
-            closeIconColor: string;
-            closeIconColorHover: string;
-            closeIconColorPressed: string;
-            closeColorHover: string;
-            closeColorPressed: string;
-            clearColor: string;
-            clearColorHover: string;
-            clearColorPressed: string;
-            scrollbarColor: string;
-            scrollbarColorHover: string;
-            scrollbarWidth: string;
-            scrollbarHeight: string;
-            scrollbarBorderRadius: string;
-            progressRailColor: string;
-            railColor: string;
-            popoverColor: string;
-            tableColor: string;
-            cardColor: string;
-            modalColor: string;
-            bodyColor: string;
-            tagColor: string;
-            avatarColor: string;
-            invertedColor: string;
-            inputColor: string;
-            codeColor: string;
-            tabColor: string;
-            actionColor: string;
-            tableHeaderColor: string;
-            hoverColor: string;
-            tableColorHover: string;
-            tableColorStriped: string;
-            pressedColor: string;
-            opacityDisabled: string;
-            inputColorDisabled: string;
-            buttonColor2: string;
-            buttonColor2Hover: string;
-            buttonColor2Pressed: string;
-            boxShadow1: string;
-            boxShadow2: string;
-            boxShadow3: string;
-            fontFamily: string;
-            fontFamilyMono: string;
-            fontWeight: string;
-            fontWeightStrong: string;
-            cubicBezierEaseInOut: string;
-            cubicBezierEaseOut: string;
-            cubicBezierEaseIn: string;
-            borderRadius: string;
-            borderRadiusSmall: string;
-            fontSize: string;
-            fontSizeMini: string;
-            fontSizeTiny: string;
-            fontSizeSmall: string;
-            fontSizeMedium: string;
-            fontSizeLarge: string;
-            fontSizeHuge: string;
-            lineHeight: string;
-            heightMini: string;
-            heightTiny: string;
-            heightSmall: string;
-            heightMedium: string;
-            heightLarge: string;
-            heightHuge: string;
-            name: "common";
-        };
-        self: {
-            countTextColor: string;
-            heightTiny: string;
-            heightSmall: string;
-            heightMedium: string;
-            heightLarge: string;
-            fontSizeTiny: string;
-            fontSizeSmall: string;
-            fontSizeMedium: string;
-            fontSizeLarge: string;
-            lineHeight: string;
-            lineHeightTextarea: string;
-            borderRadius: string;
-            iconSize: string;
-            groupLabelColor: string;
-            groupLabelTextColor: string;
-            textColor: string;
-            textColorDisabled: string;
-            textDecorationColor: string;
-            caretColor: string;
-            placeholderColor: string;
-            placeholderColorDisabled: string;
-            color: string;
-            colorDisabled: string;
-            colorFocus: string;
-            groupLabelBorder: string;
-            border: string;
-            borderHover: string;
-            borderDisabled: string;
-            borderFocus: string;
-            boxShadowFocus: string;
-            loadingColor: string;
-            loadingColorWarning: string;
-            borderWarning: string;
-            borderHoverWarning: string;
-            colorFocusWarning: string;
-            borderFocusWarning: string;
-            boxShadowFocusWarning: string;
-            caretColorWarning: string;
-            loadingColorError: string;
-            borderError: string;
-            borderHoverError: string;
-            colorFocusError: string;
-            borderFocusError: string;
-            boxShadowFocusError: string;
-            caretColorError: string;
-            clearColor: string;
-            clearColorHover: string;
-            clearColorPressed: string;
-            iconColor: string;
-            iconColorDisabled: string;
-            iconColorHover: string;
-            iconColorPressed: string;
-            suffixTextColor: string;
-            paddingTiny: string;
-            paddingSmall: string;
-            paddingMedium: string;
-            paddingLarge: string;
-            clearSize: string;
-        };
-        peers: any;
-        peerOverrides: {
-            [x: string]: any;
-        };
-    }>;
-    cssVars: import("vue").ComputedRef<{
-        '--n-bezier': string;
-        '--n-count-text-color': string;
-        '--n-color': string;
-        '--n-font-size': string;
-        '--n-border-radius': string;
-        '--n-height': string;
-        '--n-padding-left': string;
-        '--n-padding-right': string;
-        '--n-text-color': string;
-        '--n-caret-color': string;
-        '--n-text-decoration-color': string;
-        '--n-border': string;
-        '--n-border-disabled': string;
-        '--n-border-hover': string;
-        '--n-border-focus': string;
-        '--n-placeholder-color': string;
-        '--n-placeholder-color-disabled': string;
-        '--n-icon-size': string;
-        '--n-line-height-textarea': string;
-        '--n-color-disabled': string;
-        '--n-color-focus': string;
-        '--n-text-color-disabled': string;
-        '--n-box-shadow-focus': string;
-        '--n-loading-color': string;
-        '--n-caret-color-warning': string;
-        '--n-color-focus-warning': string;
-        '--n-box-shadow-focus-warning': string;
-        '--n-border-warning': string;
-        '--n-border-focus-warning': string;
-        '--n-border-hover-warning': string;
-        '--n-loading-color-warning': string;
-        '--n-caret-color-error': string;
-        '--n-color-focus-error': string;
-        '--n-box-shadow-focus-error': string;
-        '--n-border-error': string;
-        '--n-border-focus-error': string;
-        '--n-border-hover-error': string;
-        '--n-loading-color-error': string;
-        '--n-clear-color': string;
-        '--n-clear-size': string;
-        '--n-clear-color-hover': string;
-        '--n-clear-color-pressed': string;
-        '--n-icon-color': string;
-        '--n-icon-color-hover': string;
-        '--n-icon-color-pressed': string;
-        '--n-icon-color-disabled': string;
-        '--n-suffix-text-color': string;
-    }> | undefined;
-    themeClass: import("vue").Ref<string> | undefined;
-    onRender: (() => void) | undefined;
-    isCompositing: import("vue").Ref<boolean>;
-    blur: () => void;
-    focus: () => void;
-    select: () => void;
-    activate: () => void;
-    deactivate: () => void;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    bordered: {
-        type: import("vue").PropType<boolean | undefined>;
-        default: undefined;
-    };
-    type: {
-        type: import("vue").PropType<"text" | "textarea" | "password">;
-        default: string;
-    };
-    placeholder: import("vue").PropType<string | [string, string]>;
-    defaultValue: {
-        type: import("vue").PropType<string | [string, string] | null>;
-        default: null;
-    };
-    value: import("vue").PropType<string | [string, string] | null>;
-    disabled: {
-        type: import("vue").PropType<boolean | undefined>;
-        default: undefined;
-    };
-    size: import("vue").PropType<import("naive-ui/es/input/src/interface").Size>;
-    rows: {
-        type: import("vue").PropType<string | number>;
-        default: number;
-    };
-    round: BooleanConstructor;
-    minlength: import("vue").PropType<string | number>;
-    maxlength: import("vue").PropType<string | number>;
-    clearable: BooleanConstructor;
-    autosize: {
-        type: import("vue").PropType<boolean | {
-            minRows?: number | undefined;
-            maxRows?: number | undefined;
-        }>;
-        default: boolean;
-    };
-    pair: BooleanConstructor;
-    separator: StringConstructor;
-    readonly: {
-        type: (BooleanConstructor | StringConstructor)[];
-        default: boolean;
-    };
-    passivelyActivated: BooleanConstructor;
-    showPasswordOn: import("vue").PropType<"click" | "mousedown">;
-    stateful: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    autofocus: BooleanConstructor;
-    inputProps: import("vue").PropType<import("vue").InputHTMLAttributes | import("vue").TextareaHTMLAttributes>;
-    resizable: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    showCount: BooleanConstructor;
-    loading: {
-        type: BooleanConstructor;
-        default: undefined;
-    };
-    allowInput: import("vue").PropType<(value: string) => boolean>;
-    onMousedown: import("vue").PropType<(e: MouseEvent) => void>;
-    onKeydown: import("vue").PropType<(e: KeyboardEvent) => void>;
-    onKeyup: import("vue").PropType<(e: KeyboardEvent) => void>;
-    onInput: import("vue").PropType<import("naive-ui/es/input/src/interface").OnUpdateValue>;
-    onFocus: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: FocusEvent) => void>>;
-    onBlur: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: FocusEvent) => void>>;
-    onClick: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: MouseEvent) => void>>;
-    onChange: import("vue").PropType<import("naive-ui/es/input/src/interface").OnUpdateValue>;
-    onClear: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: MouseEvent) => void>>;
-    status: import("vue").PropType<import("naive-ui/es/form/src/interface").FormValidationStatus>;
-    'onUpdate:value': import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<import("naive-ui/es/input/src/interface").OnUpdateValue>>;
-    onUpdateValue: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<import("naive-ui/es/input/src/interface").OnUpdateValue>>;
-    textDecoration: import("vue").PropType<string | [string, string]>;
-    attrSize: {
-        type: NumberConstructor;
-        default: number;
-    };
-    onInputBlur: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: FocusEvent) => void>>;
-    onInputFocus: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: FocusEvent) => void>>;
-    onDeactivate: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<() => void>>;
-    onActivate: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<() => void>>;
-    onWrapperFocus: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: FocusEvent) => void>>;
-    onWrapperBlur: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: FocusEvent) => void>>;
-    internalDeactivateOnEnter: BooleanConstructor;
-    internalForceFocus: BooleanConstructor;
-    internalLoadingBeforeSuffix: BooleanConstructor;
-    showPasswordToggle: BooleanConstructor;
-    theme: import("vue").PropType<import("naive-ui/es/_mixins").Theme<"Input", {
-        countTextColor: string;
-        heightTiny: string;
-        heightSmall: string;
-        heightMedium: string;
-        heightLarge: string;
-        fontSizeTiny: string;
-        fontSizeSmall: string;
-        fontSizeMedium: string;
-        fontSizeLarge: string;
-        lineHeight: string;
-        lineHeightTextarea: string;
-        borderRadius: string;
-        iconSize: string;
-        groupLabelColor: string;
-        groupLabelTextColor: string;
-        textColor: string;
-        textColorDisabled: string;
-        textDecorationColor: string;
-        caretColor: string;
-        placeholderColor: string;
-        placeholderColorDisabled: string;
-        color: string;
-        colorDisabled: string;
-        colorFocus: string;
-        groupLabelBorder: string;
-        border: string;
-        borderHover: string;
-        borderDisabled: string;
-        borderFocus: string;
-        boxShadowFocus: string;
-        loadingColor: string;
-        loadingColorWarning: string;
-        borderWarning: string;
-        borderHoverWarning: string;
-        colorFocusWarning: string;
-        borderFocusWarning: string;
-        boxShadowFocusWarning: string;
-        caretColorWarning: string;
-        loadingColorError: string;
-        borderError: string;
-        borderHoverError: string;
-        colorFocusError: string;
-        borderFocusError: string;
-        boxShadowFocusError: string;
-        caretColorError: string;
-        clearColor: string;
-        clearColorHover: string;
-        clearColorPressed: string;
-        iconColor: string;
-        iconColorDisabled: string;
-        iconColorHover: string;
-        iconColorPressed: string;
-        suffixTextColor: string;
-        paddingTiny: string;
-        paddingSmall: string;
-        paddingMedium: string;
-        paddingLarge: string;
-        clearSize: string;
-    }, any>>;
-    themeOverrides: import("vue").PropType<import("naive-ui/es/_mixins/use-theme").ExtractThemeOverrides<import("naive-ui/es/_mixins").Theme<"Input", {
-        countTextColor: string;
-        heightTiny: string;
-        heightSmall: string;
-        heightMedium: string;
-        heightLarge: string;
-        fontSizeTiny: string;
-        fontSizeSmall: string;
-        fontSizeMedium: string;
-        fontSizeLarge: string;
-        lineHeight: string;
-        lineHeightTextarea: string;
-        borderRadius: string;
-        iconSize: string;
-        groupLabelColor: string;
-        groupLabelTextColor: string;
-        textColor: string;
-        textColorDisabled: string;
-        textDecorationColor: string;
-        caretColor: string;
-        placeholderColor: string;
-        placeholderColorDisabled: string;
-        color: string;
-        colorDisabled: string;
-        colorFocus: string;
-        groupLabelBorder: string;
-        border: string;
-        borderHover: string;
-        borderDisabled: string;
-        borderFocus: string;
-        boxShadowFocus: string;
-        loadingColor: string;
-        loadingColorWarning: string;
-        borderWarning: string;
-        borderHoverWarning: string;
-        colorFocusWarning: string;
-        borderFocusWarning: string;
-        boxShadowFocusWarning: string;
-        caretColorWarning: string;
-        loadingColorError: string;
-        borderError: string;
-        borderHoverError: string;
-        colorFocusError: string;
-        borderFocusError: string;
-        boxShadowFocusError: string;
-        caretColorError: string;
-        clearColor: string;
-        clearColorHover: string;
-        clearColorPressed: string;
-        iconColor: string;
-        iconColorDisabled: string;
-        iconColorHover: string;
-        iconColorPressed: string;
-        suffixTextColor: string;
-        paddingTiny: string;
-        paddingSmall: string;
-        paddingMedium: string;
-        paddingLarge: string;
-        clearSize: string;
-    }, any>>>;
-    builtinThemeOverrides: import("vue").PropType<import("naive-ui/es/_mixins/use-theme").ExtractThemeOverrides<import("naive-ui/es/_mixins").Theme<"Input", {
-        countTextColor: string;
-        heightTiny: string;
-        heightSmall: string;
-        heightMedium: string;
-        heightLarge: string;
-        fontSizeTiny: string;
-        fontSizeSmall: string;
-        fontSizeMedium: string;
-        fontSizeLarge: string;
-        lineHeight: string;
-        lineHeightTextarea: string;
-        borderRadius: string;
-        iconSize: string;
-        groupLabelColor: string;
-        groupLabelTextColor: string;
-        textColor: string;
-        textColorDisabled: string;
-        textDecorationColor: string;
-        caretColor: string;
-        placeholderColor: string;
-        placeholderColorDisabled: string;
-        color: string;
-        colorDisabled: string;
-        colorFocus: string;
-        groupLabelBorder: string;
-        border: string;
-        borderHover: string;
-        borderDisabled: string;
-        borderFocus: string;
-        boxShadowFocus: string;
-        loadingColor: string;
-        loadingColorWarning: string;
-        borderWarning: string;
-        borderHoverWarning: string;
-        colorFocusWarning: string;
-        borderFocusWarning: string;
-        boxShadowFocusWarning: string;
-        caretColorWarning: string;
-        loadingColorError: string;
-        borderError: string;
-        borderHoverError: string;
-        colorFocusError: string;
-        borderFocusError: string;
-        boxShadowFocusError: string;
-        caretColorError: string;
-        clearColor: string;
-        clearColorHover: string;
-        clearColorPressed: string;
-        iconColor: string;
-        iconColorDisabled: string;
-        iconColorHover: string;
-        iconColorPressed: string;
-        suffixTextColor: string;
-        paddingTiny: string;
-        paddingSmall: string;
-        paddingMedium: string;
-        paddingLarge: string;
-        clearSize: string;
-    }, any>>>;
-}>>, {
-    type: "text" | "textarea" | "password";
-    readonly: string | boolean;
-    round: boolean;
-    disabled: boolean | undefined;
-    autofocus: boolean;
-    autosize: boolean | {
-        minRows?: number | undefined;
-        maxRows?: number | undefined;
-    };
-    loading: boolean;
-    bordered: boolean | undefined;
-    clearable: boolean;
-    defaultValue: string | [string, string] | null;
-    resizable: boolean;
-    pair: boolean;
-    rows: string | number;
-    passivelyActivated: boolean;
-    stateful: boolean;
-    showCount: boolean;
-    attrSize: number;
-    internalDeactivateOnEnter: boolean;
-    internalForceFocus: boolean;
-    internalLoadingBeforeSuffix: boolean;
-    showPasswordToggle: boolean;
-}>;
+}>> & {
+    "onUpdate:value"?: ((...args: any[]) => any) | undefined;
+}, {}>;

package/es/components/form-render/src/components/renderer/textarea.js

@@ -1,4 +1,5 @@
-import 'vue';
+import { defineComponent, computed, createVNode } from 'vue';
+import { useCommonInjection } from '../../hooks/useCommonInjection.js';
 import '@formily/path';
 import '@vue/shared';
 import 'lodash-es';
@@ -7,10 +8,32 @@ import { assignUpdateValue } from '../../utils/schema.js';
 import { connect, mapProps } from '@formily/vue';
 import { NInput } from 'naive-ui';
 
-const TEXTAREA = connect(NInput, mapProps((props, field) => {
-  const _props = assignUpdateValue(props, field);
-  _props.type = "textarea";
-  return _props;
-}));
+const script = defineComponent({
+  name: "FormTextarea",
+  props: {
+    value: {
+      type: String
+    }
+  },
+  emits: ["update:value"],
+  setup(props, {
+    emit
+  }) {
+    const valueRef = computed({
+      get: () => props.value,
+      set: (v) => emit("update:value", v)
+    });
+    const key = useCommonInjection().injectValueBindKey(valueRef);
+    return () => {
+      return createVNode(NInput, {
+        "type": "textarea",
+        "key": key.value,
+        "value": valueRef.value,
+        "onUpdate:value": ($event) => valueRef.value = $event
+      }, null);
+    };
+  }
+});
+const TEXTAREA = connect(script, mapProps(assignUpdateValue));
 
 export { TEXTAREA };

package/es/components/form-render/src/hooks/useCommonInjection.d.ts

@@ -3,4 +3,5 @@ import { WatchSource } from '@vue/runtime-core';
 export declare function useCommonInjection(): {
     injectValueValidate: (traverser: WatchSource) => void;
     injectValueWatchFromEmpty: (traverser: WatchSource, trigger: Func) => void;
+    injectValueBindKey: (traverser: WatchSource) => import("vue").Ref<number>;
 };

package/es/components/form-render/src/hooks/useCommonInjection.js

@@ -1,5 +1,5 @@
 import { isField } from '@formily/core';
-import { watch } from 'vue';
+import { watch, ref } from 'vue';
 import '../../index.js';
 import { useFormField } from './useFormField.js';
 
@@ -17,7 +17,16 @@ function useCommonInjection() {
   function injectValueWatchFromEmpty(traverser, trigger) {
     watch(traverser, (n, o) => n != null && o == null && trigger(), { immediate: true });
   }
-  return { injectValueValidate, injectValueWatchFromEmpty };
+  function injectValueBindKey(traverser) {
+    const key = ref(1);
+    watch(traverser, (n, o) => {
+      if (n === void 0 && o !== void 0) {
+        key.value++;
+      }
+    });
+    return key;
+  }
+  return { injectValueValidate, injectValueWatchFromEmpty, injectValueBindKey };
 }
 
 export { useCommonInjection };

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

@@ -4,7 +4,7 @@ import { isObject } from '@vue/shared';
 import { 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, createObjSchema, dotEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema } from './schema.js';
+export { assignUpdateValue, assignValueBindKey, createLinebarId, createObjSchema, dotEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema } from './schema.js';
 
 function formRenderLog(message, type = "log") {
   console[type](`[FormRender]: ${message}`);

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

@@ -13,6 +13,9 @@ export declare function getParentLinebar(key: string, fieldList: FieldItem[]): s
 export declare function assignUpdateValue(props: AnyObject, field: GeneralField): {
     [x: string]: any;
 };
+export declare function assignValueBindKey(props: AnyObject, field: GeneralField): {
+    [x: string]: any;
+};
 export declare function createObjSchema(properties: Record<string, ISchema>): {
     type: string;
     properties: Record<string, import("@formily/json-schema/esm/types").Stringify<{

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

@@ -79,8 +79,15 @@ function assignUpdateValue(props, field) {
   }
   return _props;
 }
+function assignValueBindKey(props, field) {
+  const _props = { ...props };
+  if (isField(field)) {
+    _props.key = _props.value === void 0 ? 0 : 1;
+  }
+  return _props;
+}
 function createObjSchema(properties) {
   return { type: "object", properties };
 }
 
-export { assignUpdateValue, createLinebarId, createObjSchema, dotEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema };
+export { assignUpdateValue, assignValueBindKey, createLinebarId, createObjSchema, dotEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "3.1.18-beta.4",
+  "version": "3.1.18-beta.5",
   "license": "ISC",
   "module": "./es/components/index.js",
   "main": "./es/components/index.js",
@@ -65,5 +65,5 @@
     "iOS 7",
     "last 3 iOS versions"
   ],
-  "gitHead": "74f97589ab3118a2398496092cc07d6a47e2aa6e"
+  "gitHead": "c8b9bdb41b7894057f6f772db6c18f2f267cb61a"
 }