cnhis-design-vue 3.1.16-beta.5 → 3.1.16-beta.6

package/es/packages/fabric-chart/src/hooks/useLeft.js

@@ -65,12 +65,14 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
     const list = [];
     if (item.showScale || item.showNumber) {
       const { lineXMain, textLeft } = getScaleInfo(item.position, iconsWidth, originX - iconsWidth);
+      const listLen = item.list.length;
       item.list.forEach((v, i) => {
         let top = painOriginY.endY - i * yCellHeight * item.spaceGridNumber;
         if (i === 0) {
           top = endY - 5;
         }
-        if (item.showNumber) {
+        const isMaxMinNumber = i === 0 || i === listLen - 1;
+        if (item.showNumber && (isMaxMinNumber ? item.showMaxMinNumber : true)) {
           list.push(drawScaleNumber(v, item, textLeft, top));
         }
         if (item.showScale && i !== 0) {
@@ -117,20 +119,22 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
         const spaceScale = spaceGridNumber * yCellHeight / 5;
         const position = item.position || "center";
         const { lineXMain, lineXSub, textLeft } = getScaleInfo(item.position, rectLeft, rectWidth);
+        const listLen = item.list.length;
         item.list.forEach((v, i) => {
           const top = vitalSignsOriginY.endY - i * yCellHeight * spaceGridNumber;
-          if (item.showNumber) {
+          const isMaxMinNumber = i === 0 || i === listLen - 1;
+          if (item.showNumber && (isMaxMinNumber ? item.showMaxMinNumber : true)) {
             const text = drawScaleNumber(v, item, textLeft, i === 0 ? top - 5 : top);
             list.push(text);
           }
-          if (item.showScale && i !== item.list.length - 1) {
+          if (item.showScale && i !== listLen - 1) {
             for (let j = 0; j < 5; j++) {
               if (j > 0 || !item.showNumber || position !== "center") {
                 const x1 = j == 0 ? lineXMain[0] : lineXSub[0];
                 const x2 = j == 0 ? lineXMain[1] : lineXSub[1];
                 const y = top - j * spaceScale;
                 createLine([x1, y, x2, y]);
-                if (i == item.list.length - 2 && j == 4) {
+                if (i == listLen - 2 && j == 4) {
                   createLine([lineXMain[0], y - spaceScale, lineXMain[1], y - spaceScale]);
                 }
               }

package/es/packages/form-config/index.d.ts

@@ -14,9 +14,9 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
         [x: `on${string}`]: ((...args: any[]) => any) | ((...args: unknown[]) => any) | undefined;
     }>>;
     commonConfig: {
-        onMove: ({ to, from }: Sortable.SortableEvent) => void;
-        onChoose: ({ target, item }: Sortable.SortableEvent) => void;
-        onUnchoose: ({ from, to, target, item }: Sortable.SortableEvent) => void;
+        onMove: ({ to, from }: import("sortablejs").SortableEvent) => void;
+        onChoose: ({ target, item }: import("sortablejs").SortableEvent) => void;
+        onUnchoose: ({ from, to, target, item }: import("sortablejs").SortableEvent) => void;
         tag: string;
         animation: string;
         'item-key': string;
@@ -7239,9 +7239,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
             }>>;
             emit: (event: "formChange", ...args: any[]) => void;
             nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-            formModel: import("@formily/core").Form<{
-                [x: string]: any;
-            }>;
+            formModel: import("@formily/core").Form<any>;
             SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
             businessCollector: import("..").BusinessCollector;
             formItemDepsCollector: import("..").FormItemDepsCollector;
@@ -12317,9 +12315,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
             }>>;
             emit: (event: "formChange", ...args: any[]) => void;
             nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-            formModel: import("@formily/core").Form<{
-                [x: string]: any;
-            }>;
+            formModel: import("@formily/core").Form<any>;
             SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
             businessCollector: import("..").BusinessCollector;
             formItemDepsCollector: import("..").FormItemDepsCollector;

package/es/packages/form-config/src/FormConfig.vue.d.ts

@@ -16,9 +16,9 @@ declare const _default: import("vue").DefineComponent<{
         [x: `on${string}`]: ((...args: any[]) => any) | ((...args: unknown[]) => any) | undefined;
     }>>;
     commonConfig: {
-        onMove: ({ to, from }: Sortable.SortableEvent) => void;
-        onChoose: ({ target, item }: Sortable.SortableEvent) => void;
-        onUnchoose: ({ from, to, target, item }: Sortable.SortableEvent) => void;
+        onMove: ({ to, from }: import("sortablejs").SortableEvent) => void;
+        onChoose: ({ target, item }: import("sortablejs").SortableEvent) => void;
+        onUnchoose: ({ from, to, target, item }: import("sortablejs").SortableEvent) => void;
         tag: string;
         animation: string;
         'item-key': string;
@@ -7241,9 +7241,7 @@ declare const _default: import("vue").DefineComponent<{
             }>>;
             emit: (event: "formChange", ...args: any[]) => void;
             nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-            formModel: import("@formily/core").Form<{
-                [x: string]: any;
-            }>;
+            formModel: import("@formily/core").Form<any>;
             SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
             businessCollector: import("../../../../es/packages/form-render").BusinessCollector;
             formItemDepsCollector: import("../../../../es/packages/form-render").FormItemDepsCollector;
@@ -12319,9 +12317,7 @@ declare const _default: import("vue").DefineComponent<{
             }>>;
             emit: (event: "formChange", ...args: any[]) => void;
             nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-            formModel: import("@formily/core").Form<{
-                [x: string]: any;
-            }>;
+            formModel: import("@formily/core").Form<any>;
             SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
             businessCollector: import("../../../../es/packages/form-render").BusinessCollector;
             formItemDepsCollector: import("../../../../es/packages/form-render").FormItemDepsCollector;

package/es/packages/form-config/src/components/FormConfigCreator.vue.d.ts

@@ -3571,9 +3571,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         }>>;
         emit: (event: "formChange", ...args: any[]) => void;
         nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-        formModel: import("@formily/core").Form<{
-            [x: string]: any;
-        }>;
+        formModel: import("@formily/core").Form<any>;
         SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
         businessCollector: import("../../../../../es/packages/form-render").BusinessCollector;
         formItemDepsCollector: import("../../../../../es/packages/form-render").FormItemDepsCollector;

package/es/packages/form-config/src/components/FormConfigEdit.vue.d.ts

@@ -3817,9 +3817,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         }>>;
         emit: (event: "formChange", ...args: any[]) => void;
         nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-        formModel: import("@formily/core").Form<{
-            [x: string]: any;
-        }>;
+        formModel: import("@formily/core").Form<any>;
         SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
         businessCollector: import("../../../../../es/packages/form-render").BusinessCollector;
         formItemDepsCollector: import("../../../../../es/packages/form-render").FormItemDepsCollector;

package/es/packages/form-config/src/hooks/useSortable.d.ts

@@ -1,3 +1,4 @@
+import Sortable from 'sortablejs';
 export declare function useSortable(): {
     commonConfig: {
         onMove: ({ to, from }: Sortable.SortableEvent) => void;

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

@@ -230,9 +230,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
     }>>;
     emit: (event: "formChange", ...args: any[]) => void;
     nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-    formModel: import("@formily/core").Form<{
-        [x: string]: any;
-    }>;
+    formModel: import("@formily/core").Form<any>;
     SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
     businessCollector: import("./src/hooks").BusinessCollector;
     formItemDepsCollector: import("./src/hooks").FormItemDepsCollector;

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

@@ -230,9 +230,7 @@ declare const _default: import("vue").DefineComponent<{
     }>>;
     emit: (event: "formChange", ...args: any[]) => void;
     nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-    formModel: import("@formily/core").Form<{
-        [x: string]: any;
-    }>;
+    formModel: import("@formily/core").Form<any>;
     SchemaField: Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
     businessCollector: import("./hooks").BusinessCollector;
     formItemDepsCollector: import("./hooks").FormItemDepsCollector;

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

@@ -46,7 +46,7 @@ const script = defineComponent({
       var _a, _b;
       return (_b = (_a = props.urlConfig) == null ? void 0 : _a.valueKey) != null ? _b : "value";
     });
-    const _value = computed(() => {
+    const valueRef = computed(() => {
       try {
         const parsed = Array.isArray(props.value) ? props.value : JSON.parse(props.value || "");
         if (!Array.isArray(parsed) || !parsed.length)
@@ -158,7 +158,7 @@ const script = defineComponent({
         "checkStrategy": "child",
         "show": !!show.value,
         "onUpdate:show": updateShow,
-        "value": _value.value,
+        "value": valueRef.value,
         "onUpdate:value": updateValue,
         "labelField": labelKey.value,
         "valueField": valueKey.value,

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

@@ -1,7 +1,9 @@
 import { PropType } from 'vue';
 export declare const DATE: import("vue").DefineComponent<{
     onChange: {};
-    value: {};
+    value: {
+        type: StringConstructor;
+    };
     validate: {
         type: PropType<Partial<{
             [key: string]: any;
@@ -16,9 +18,15 @@ export declare const DATE: import("vue").DefineComponent<{
             regular_error_tip: string;
         }>>;
     };
-}, () => 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<{
+    valueFormat: {
+        type: StringConstructor;
+        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<{
     onChange: {};
-    value: {};
+    value: {
+        type: StringConstructor;
+    };
     validate: {
         type: PropType<Partial<{
             [key: string]: any;
@@ -33,4 +41,12 @@ export declare const DATE: import("vue").DefineComponent<{
             regular_error_tip: string;
         }>>;
     };
-}>>, {}>;
+    valueFormat: {
+        type: StringConstructor;
+        default: string;
+    };
+}>> & {
+    "onUpdate:value"?: ((...args: any[]) => any) | undefined;
+}, {
+    valueFormat: string;
+}>;

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

@@ -1,19 +1,29 @@
-import { defineComponent, computed, createVNode } from 'vue';
-import { isField } from '@formily/core';
+import { defineComponent, computed, watch, createVNode, mergeProps } from 'vue';
 import { connect, mapProps } from '@formily/vue';
 import { isObject } from '@vueuse/core';
+import { format } from 'date-fns';
 import { NDatePicker } from 'naive-ui';
 import { useCommonInjection } from '../../../../../packages/form-render/src/hooks/useCommonInjection';
+import { assignUpdateValue } from '../../../../../packages/form-render/src/utils';
 
 const script = defineComponent({
   props: {
     onChange: {},
-    value: {},
+    value: {
+      type: String
+    },
     validate: {
       type: Object
+    },
+    valueFormat: {
+      type: String,
+      default: "yyyy-MM-dd"
     }
   },
-  setup(props) {
+  emits: ["update:value"],
+  setup(props, {
+    emit
+  }) {
     useCommonInjection().injectValueValidate(() => props.value);
     function minCurrentDate() {
       var _a;
@@ -56,7 +66,9 @@ const script = defineComponent({
       }
     }
     const validateConfig = computed(() => {
-      const result = {};
+      const result = {
+        valueFormat: props.valueFormat
+      };
       if (isObject(props.validate)) {
         const {
           min_date,
@@ -69,22 +81,26 @@ const script = defineComponent({
       }
       return result;
     });
-    return () => createVNode(NDatePicker, validateConfig.value, null);
-  }
-});
-const DATE = connect(script, mapProps((props, field) => {
-  const _props = {
-    ...props
-  };
-  if (isField(field)) {
-    Object.assign(_props, {
-      "formatted-value": field.value,
-      "onUpdate:formatted-value"(v) {
-        field.setValue(v);
-      }
+    function formatDate(value) {
+      if (!value)
+        return value;
+      return format(new Date(value), props.valueFormat);
+    }
+    watch(() => props.value, (value) => {
+      if (!value || formatDate(value) === value)
+        return;
+      emit("update:value", formatDate(value));
+    });
+    const valueRef = computed({
+      get: () => formatDate(props.value),
+      set: (value) => emit("update:value", value)
     });
+    return () => createVNode(NDatePicker, mergeProps(validateConfig.value, {
+      "formatted-value": valueRef.value,
+      "onUpdate:formatted-value": ($event) => valueRef.value = $event
+    }), null);
   }
-  return _props;
-}));
+});
+const DATE = connect(script, mapProps(assignUpdateValue));
 
 export { DATE };

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

@@ -1,6 +1,6 @@
 import { defineComponent, computed, ref, inject, nextTick, watch, createVNode } from 'vue';
 import { isField } from '@formily/core';
-import { isEqual } from 'lodash-es';
+import { cloneDeep, isEqual } from 'lodash-es';
 import { useCommonInjection } from '../../../../../packages/form-render/src/hooks/useCommonInjection';
 import { InjectAsyncQueue, InjectionChangeContextCollector, InjectionFormItemDepsCollector } from '../../constants/index.js';
 import { connect, mapProps } from '@formily/vue';
@@ -105,7 +105,7 @@ const script = defineComponent({
     changeContextCollector == null ? void 0 : changeContextCollector.setContext(fieldKey.value, async () => {
       await nextTick();
       return {
-        currentOption: parsedOptions.value.find((option) => option[valueKey.value] === props.value)
+        currentOption: cloneDeep(parsedOptions.value.find((option) => option[valueKey.value] === valueRef.value))
       };
     });
     const formItemDepsCollector = inject(InjectionFormItemDepsCollector);
@@ -120,7 +120,7 @@ const script = defineComponent({
         emit("update:value", null);
         !props.lazyRequest && await fetchData();
       });
-      (props.value || !props.lazyRequest) && fetchData();
+      (valueRef.value || !props.lazyRequest) && fetchData();
     }, {
       immediate: true
     });
@@ -128,8 +128,8 @@ const script = defineComponent({
       injectValueValidate,
       injectValueWatchFromEmpty
     } = useCommonInjection();
-    injectValueWatchFromEmpty(() => props.value, fetchData);
-    injectValueValidate(() => props.value);
+    injectValueWatchFromEmpty(valueRef, fetchData);
+    injectValueValidate(valueRef);
     function focusDecorator(onFocus) {
       return (...args) => {
         if (isField(field.value)) {

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

@@ -1,347 +1,11 @@
 export declare const SLIDER: import("vue").DefineComponent<{
-    readonly to: {
-        type: import("vue").PropType<string | boolean | HTMLElement>;
-        default: undefined;
+    value: {
+        type: (NumberConstructor | StringConstructor)[];
     };
-    readonly defaultValue: {
-        readonly type: import("vue").PropType<number | number[]>;
-        readonly default: 0;
+}, () => 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: (NumberConstructor | StringConstructor)[];
     };
-    readonly marks: import("vue").PropType<Record<string, string>>;
-    readonly disabled: {
-        readonly type: import("vue").PropType<boolean | undefined>;
-        readonly default: undefined;
-    };
-    readonly formatTooltip: import("vue").PropType<(value: number) => string | number>;
-    readonly min: {
-        readonly type: NumberConstructor;
-        readonly default: 0;
-    };
-    readonly max: {
-        readonly type: NumberConstructor;
-        readonly default: 100;
-    };
-    readonly step: {
-        readonly type: import("vue").PropType<number | "mark">;
-        readonly default: 1;
-    };
-    readonly range: BooleanConstructor;
-    readonly value: import("vue").PropType<number | number[]>;
-    readonly placement: import("vue").PropType<import("naive-ui").PopoverPlacement>;
-    readonly showTooltip: {
-        readonly type: import("vue").PropType<boolean | undefined>;
-        readonly default: undefined;
-    };
-    readonly tooltip: {
-        readonly type: BooleanConstructor;
-        readonly default: true;
-    };
-    readonly vertical: BooleanConstructor;
-    readonly reverse: BooleanConstructor;
-    readonly 'onUpdate:value': import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(value: number & number[]) => void>>;
-    readonly onUpdateValue: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(value: number & number[]) => void>>;
-    readonly theme: import("vue").PropType<import("naive-ui/es/_mixins").Theme<"Slider", {
-        fontSize: string;
-        railColor: string;
-        railColorHover: string;
-        fillColor: string;
-        fillColorHover: string;
-        opacityDisabled: string;
-        handleColor: string;
-        dotColor: string;
-        dotColorModal: string;
-        dotColorPopover: string;
-        handleBoxShadow: string;
-        handleBoxShadowHover: string;
-        handleBoxShadowActive: string;
-        handleBoxShadowFocus: string;
-        indicatorColor: string;
-        indicatorBoxShadow: string;
-        indicatorTextColor: string;
-        indicatorBorderRadius: string;
-        dotBorder: string;
-        dotBorderActive: string;
-        dotBoxShadow: string;
-        railHeight: string;
-        railWidthVertical: string;
-        handleSize: string;
-        dotHeight: string;
-        dotWidth: string;
-        dotBorderRadius: string;
-    }, any>>;
-    readonly themeOverrides: import("vue").PropType<import("naive-ui/es/_mixins/use-theme").ExtractThemeOverrides<import("naive-ui/es/_mixins").Theme<"Slider", {
-        fontSize: string;
-        railColor: string;
-        railColorHover: string;
-        fillColor: string;
-        fillColorHover: string;
-        opacityDisabled: string;
-        handleColor: string;
-        dotColor: string;
-        dotColorModal: string;
-        dotColorPopover: string;
-        handleBoxShadow: string;
-        handleBoxShadowHover: string;
-        handleBoxShadowActive: string;
-        handleBoxShadowFocus: string;
-        indicatorColor: string;
-        indicatorBoxShadow: string;
-        indicatorTextColor: string;
-        indicatorBorderRadius: string;
-        dotBorder: string;
-        dotBorderActive: string;
-        dotBoxShadow: string;
-        railHeight: string;
-        railWidthVertical: string;
-        handleSize: string;
-        dotHeight: string;
-        dotWidth: string;
-        dotBorderRadius: string;
-    }, any>>>;
-    readonly builtinThemeOverrides: import("vue").PropType<import("naive-ui/es/_mixins/use-theme").ExtractThemeOverrides<import("naive-ui/es/_mixins").Theme<"Slider", {
-        fontSize: string;
-        railColor: string;
-        railColorHover: string;
-        fillColor: string;
-        fillColorHover: string;
-        opacityDisabled: string;
-        handleColor: string;
-        dotColor: string;
-        dotColorModal: string;
-        dotColorPopover: string;
-        handleBoxShadow: string;
-        handleBoxShadowHover: string;
-        handleBoxShadowActive: string;
-        handleBoxShadowFocus: string;
-        indicatorColor: string;
-        indicatorBoxShadow: string;
-        indicatorTextColor: string;
-        indicatorBorderRadius: string;
-        dotBorder: string;
-        dotBorderActive: string;
-        dotBoxShadow: string;
-        railHeight: string;
-        railWidthVertical: string;
-        handleSize: string;
-        dotHeight: string;
-        dotWidth: string;
-        dotBorderRadius: string;
-    }, any>>>;
-}, {
-    mergedClsPrefix: import("vue").ComputedRef<string>;
-    namespace: import("vue").ComputedRef<string | undefined>;
-    uncontrolledValue: import("vue").Ref<number | number[]>;
-    mergedValue: import("vue").ComputedRef<number | number[]>;
-    mergedDisabled: import("vue").ComputedRef<boolean>;
-    mergedPlacement: import("vue").ComputedRef<import("naive-ui").PopoverPlacement>;
-    isMounted: Readonly<import("vue").Ref<boolean>>;
-    adjustedTo: import("vue").ComputedRef<string | HTMLElement>;
-    dotTransitionDisabled: import("vue").Ref<boolean>;
-    markInfos: import("vue").ComputedRef<{
-        active: boolean;
-        label: string;
-        style: import("vue").CSSProperties;
-    }[]>;
-    isShowTooltip: (index: number) => boolean;
-    shouldKeepTooltipTransition: (index: number) => boolean;
-    handleRailRef: import("vue").Ref<HTMLElement | null>;
-    setHandleRefs: (key: number) => (el: any) => void;
-    setFollowerRefs: (key: number) => (el: any) => void;
-    fillStyle: import("vue").ComputedRef<{
-        [x: string]: string;
-        height: string;
-        width?: undefined;
-    } | {
-        [x: string]: string;
-        width: string;
-        height?: undefined;
-    } | undefined>;
-    getHandleStyle: (value: number, index: number) => Record<string, any>;
-    activeIndex: import("vue").Ref<number>;
-    arrifiedValues: import("vue").ComputedRef<number[]>;
-    followerEnabledIndexSet: import("vue").Ref<Set<number>>;
-    handleRailMouseDown: (event: MouseEvent | TouchEvent) => void;
-    handleHandleFocus: (index: number) => void;
-    handleHandleBlur: (index: number) => void;
-    handleHandleMouseEnter: (index: number) => void;
-    handleHandleMouseLeave: (index: number) => void;
-    handleRailKeyDown: (e: KeyboardEvent) => void;
-    indicatorCssVars: import("vue").ComputedRef<{
-        '--n-font-size': string;
-        '--n-indicator-border-radius': string;
-        '--n-indicator-box-shadow': string;
-        '--n-indicator-color': string;
-        '--n-indicator-text-color': string;
-    }> | undefined;
-    indicatorThemeClass: import("vue").Ref<string> | undefined;
-    indicatorOnRender: (() => void) | undefined;
-    cssVars: import("vue").ComputedRef<{
-        '--n-bezier': string;
-        '--n-dot-border': string;
-        '--n-dot-border-active': string;
-        '--n-dot-border-radius': string;
-        '--n-dot-box-shadow': string;
-        '--n-dot-color': string;
-        '--n-dot-color-modal': string;
-        '--n-dot-color-popover': string;
-        '--n-dot-height': string;
-        '--n-dot-width': string;
-        '--n-fill-color': string;
-        '--n-fill-color-hover': string;
-        '--n-font-size': string;
-        '--n-handle-box-shadow': string;
-        '--n-handle-box-shadow-active': string;
-        '--n-handle-box-shadow-focus': string;
-        '--n-handle-box-shadow-hover': string;
-        '--n-handle-color': string;
-        '--n-handle-size': string;
-        '--n-opacity-disabled': string;
-        '--n-rail-color': string;
-        '--n-rail-color-hover': string;
-        '--n-rail-height': string;
-        '--n-rail-width-vertical': string;
-    }> | undefined;
-    themeClass: import("vue").Ref<string> | undefined;
-    onRender: (() => void) | undefined;
-}, 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 to: {
-        type: import("vue").PropType<string | boolean | HTMLElement>;
-        default: undefined;
-    };
-    readonly defaultValue: {
-        readonly type: import("vue").PropType<number | number[]>;
-        readonly default: 0;
-    };
-    readonly marks: import("vue").PropType<Record<string, string>>;
-    readonly disabled: {
-        readonly type: import("vue").PropType<boolean | undefined>;
-        readonly default: undefined;
-    };
-    readonly formatTooltip: import("vue").PropType<(value: number) => string | number>;
-    readonly min: {
-        readonly type: NumberConstructor;
-        readonly default: 0;
-    };
-    readonly max: {
-        readonly type: NumberConstructor;
-        readonly default: 100;
-    };
-    readonly step: {
-        readonly type: import("vue").PropType<number | "mark">;
-        readonly default: 1;
-    };
-    readonly range: BooleanConstructor;
-    readonly value: import("vue").PropType<number | number[]>;
-    readonly placement: import("vue").PropType<import("naive-ui").PopoverPlacement>;
-    readonly showTooltip: {
-        readonly type: import("vue").PropType<boolean | undefined>;
-        readonly default: undefined;
-    };
-    readonly tooltip: {
-        readonly type: BooleanConstructor;
-        readonly default: true;
-    };
-    readonly vertical: BooleanConstructor;
-    readonly reverse: BooleanConstructor;
-    readonly 'onUpdate:value': import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(value: number & number[]) => void>>;
-    readonly onUpdateValue: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(value: number & number[]) => void>>;
-    readonly theme: import("vue").PropType<import("naive-ui/es/_mixins").Theme<"Slider", {
-        fontSize: string;
-        railColor: string;
-        railColorHover: string;
-        fillColor: string;
-        fillColorHover: string;
-        opacityDisabled: string;
-        handleColor: string;
-        dotColor: string;
-        dotColorModal: string;
-        dotColorPopover: string;
-        handleBoxShadow: string;
-        handleBoxShadowHover: string;
-        handleBoxShadowActive: string;
-        handleBoxShadowFocus: string;
-        indicatorColor: string;
-        indicatorBoxShadow: string;
-        indicatorTextColor: string;
-        indicatorBorderRadius: string;
-        dotBorder: string;
-        dotBorderActive: string;
-        dotBoxShadow: string;
-        railHeight: string;
-        railWidthVertical: string;
-        handleSize: string;
-        dotHeight: string;
-        dotWidth: string;
-        dotBorderRadius: string;
-    }, any>>;
-    readonly themeOverrides: import("vue").PropType<import("naive-ui/es/_mixins/use-theme").ExtractThemeOverrides<import("naive-ui/es/_mixins").Theme<"Slider", {
-        fontSize: string;
-        railColor: string;
-        railColorHover: string;
-        fillColor: string;
-        fillColorHover: string;
-        opacityDisabled: string;
-        handleColor: string;
-        dotColor: string;
-        dotColorModal: string;
-        dotColorPopover: string;
-        handleBoxShadow: string;
-        handleBoxShadowHover: string;
-        handleBoxShadowActive: string;
-        handleBoxShadowFocus: string;
-        indicatorColor: string;
-        indicatorBoxShadow: string;
-        indicatorTextColor: string;
-        indicatorBorderRadius: string;
-        dotBorder: string;
-        dotBorderActive: string;
-        dotBoxShadow: string;
-        railHeight: string;
-        railWidthVertical: string;
-        handleSize: string;
-        dotHeight: string;
-        dotWidth: string;
-        dotBorderRadius: string;
-    }, any>>>;
-    readonly builtinThemeOverrides: import("vue").PropType<import("naive-ui/es/_mixins/use-theme").ExtractThemeOverrides<import("naive-ui/es/_mixins").Theme<"Slider", {
-        fontSize: string;
-        railColor: string;
-        railColorHover: string;
-        fillColor: string;
-        fillColorHover: string;
-        opacityDisabled: string;
-        handleColor: string;
-        dotColor: string;
-        dotColorModal: string;
-        dotColorPopover: string;
-        handleBoxShadow: string;
-        handleBoxShadowHover: string;
-        handleBoxShadowActive: string;
-        handleBoxShadowFocus: string;
-        indicatorColor: string;
-        indicatorBoxShadow: string;
-        indicatorTextColor: string;
-        indicatorBorderRadius: string;
-        dotBorder: string;
-        dotBorderActive: string;
-        dotBoxShadow: string;
-        railHeight: string;
-        railWidthVertical: string;
-        handleSize: string;
-        dotHeight: string;
-        dotWidth: string;
-        dotBorderRadius: string;
-    }, any>>>;
-}>>, {
-    readonly range: boolean;
-    readonly reverse: boolean;
-    readonly vertical: boolean;
-    readonly tooltip: boolean;
-    readonly disabled: boolean | undefined;
-    readonly step: number | "mark";
-    readonly max: number;
-    readonly min: number;
-    readonly to: string | boolean | HTMLElement;
-    readonly defaultValue: number | number[];
-    readonly showTooltip: boolean | undefined;
-}>;
+}>> & {
+    "onUpdate:value"?: ((...args: any[]) => any) | undefined;
+}, {}>;

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

@@ -1,8 +1,30 @@
+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';
 
-const SLIDER = connect(NSlider, mapProps((props, field) => {
+const script = defineComponent({
+  props: {
+    value: {
+      type: [Number, String]
+    }
+  },
+  emits: ["update:value"],
+  setup(props, {
+    emit
+  }) {
+    const valueRef = computed({
+      get: () => parseNumberFromMaybeString(props.value),
+      set: (v) => emit("update:value", v)
+    });
+    return () => createVNode(NSlider, {
+      "value": valueRef.value,
+      "onUpdate:value": ($event) => valueRef.value = $event
+    }, null);
+  }
+});
+const SLIDER = connect(script, mapProps((props, field) => {
   const _props = assignUpdateValue(props, field);
   if (Array.isArray(_props.option)) {
     _props.marks = _props.option.reduce((fin, option) => {

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

@@ -37,7 +37,7 @@ function useAnchor(props, scrollbarRef, collector) {
         doAnimation(scrollbarRef.value.scrollTop, targetAnchor.offsetTop, 300, (top) => {
           var _a;
           (_a = scrollbarRef.value) == null ? void 0 : _a.scrollTo({ top });
-        }, "easeInSine", resolve);
+        }, "easeInSine", () => setTimeout(resolve, 300));
       });
     } finally {
       scrollLock = false;
@@ -48,11 +48,14 @@ function useAnchor(props, scrollbarRef, collector) {
     if (scrollLock || !scrollbarRef.value)
       return;
     const { scrollTop, clientHeight } = scrollbarRef.value;
-    const result = anchorIdList.value.find((anchor) => {
-      const node = scrollbarRef.value.querySelector(`#${createLinebarId(anchor.name)}`);
+    const result = anchorIdList.value.find((anchor, idx, arr) => {
+      const nextAnchor = arr[idx + 1];
+      if (!nextAnchor)
+        return true;
+      const node = scrollbarRef.value.querySelector(`#${createLinebarId(nextAnchor.name)}`);
       if (!node)
         return;
-      return node.offsetTop >= scrollTop || node.offsetTop < scrollTop && node.clientHeight + node.offsetTop > scrollTop + clientHeight;
+      return node.offsetTop > scrollTop + clientHeight / 2;
     }) || anchorIdList.value[anchorIdList.value.length - 1];
     __currentAnchor.value = (_a = result == null ? void 0 : result.name) != null ? _a : "";
   }, 300);

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

@@ -128,9 +128,9 @@ function useFieldListAdaptor(collector, uuid) {
   const createSliderSchema = (item) => {
     const schema = createStandardSchema(item);
     Object.assign(schema["x-component-props"], {
-      step: Number(item.step_length),
-      max: +item.max_length,
-      min: +item.min_length,
+      step: parseNumberFromMaybeString(item.step_length),
+      max: parseNumberFromMaybeString(item.max_length),
+      min: parseNumberFromMaybeString(item.min_length),
       option: item.option
     });
     return schema;

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

@@ -1,16 +1,26 @@
+import { isString } from 'lodash-es';
 import { arrayed } from '../utils/index.js';
 import { isFunction } from '@vueuse/core';
+import { isIdCard } from '../utils/business.js';
 
 function useFormValidator() {
   const validateMap = /* @__PURE__ */ new Map([
     ["mobile", ({ validate }) => ({ format: "phone", message: validate == null ? void 0 : validate.message })],
     ["integer", ({ validate }) => ({ format: "integer", message: validate == null ? void 0 : validate.message })],
     ["number", ({ validate }) => ({ format: "number", message: validate == null ? void 0 : validate.message })],
-    ["id_card", ({ validate }) => ({ format: "idcard", message: validate == null ? void 0 : validate.message })],
+    [
+      "id_card",
+      ({ validate }) => ({
+        validator(value) {
+          var _a;
+          if (!isString(value) || !isIdCard(value))
+            return (_a = validate == null ? void 0 : validate.message) != null ? _a : "\u8BE5\u5B57\u6BB5\u4E0D\u662F\u5408\u6CD5\u7684\u8EAB\u4EFD\u8BC1\u683C\u5F0F";
+        }
+      })
+    ],
     [
       "regular",
-      (field) => {
-        const { validate, regular_expression, regular_error_tip } = field;
+      ({ validate, regular_expression, regular_error_tip }) => {
         const pattern = regular_expression || (validate == null ? void 0 : validate.regular_expression) || "";
         const message = regular_error_tip || (validate == null ? void 0 : validate.regular_error_tip) || (validate == null ? void 0 : validate.message) || "\u683C\u5F0F\u9519\u8BEF";
         return { pattern, message };

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

@@ -1,5 +1,5 @@
 import { AnyObject } from '../../../../../es/src/types';
 import { FieldItem } from '../types';
 export declare function useInitialData(): {
-    assignInitialData: (initialData?: AnyObject, fieldList?: FieldItem[]) => AnyObject;
+    assignInitialData: (initialData?: AnyObject, fieldList?: FieldItem[]) => any;
 };

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

@@ -1,9 +1,14 @@
+import { Path } from '@formily/path';
+import { mergeWith } from 'lodash-es';
+import { traverseFieldList } from '../../../../packages/form-render/src/utils';
+
 function useInitialData() {
   function assignInitialData(initialData, fieldList) {
-    return Object.assign({}, initialData, fieldList == null ? void 0 : fieldList.reduce((fin, cur) => {
-      cur.default_val != void 0 && (fin[cur.val_key] = cur.default_val);
-      return fin;
-    }, {}));
+    const defaultVal = {};
+    fieldList && traverseFieldList(fieldList, (field) => {
+      field.default_val != void 0 && Path.setIn(defaultVal, field.val_key, field.default_val);
+    });
+    return mergeWith({}, initialData, defaultVal);
   }
   return { assignInitialData };
 }

package/es/packages/form-render/src/utils/business.js

@@ -9,7 +9,7 @@ function parseIdCard(idCardNo) {
     const year = (birthYearSpan == 2 ? "19" : "") + certificateNo.substr(6, birthYearSpan);
     const month = certificateNo.substr(6 + birthYearSpan, 2);
     const day = certificateNo.substr(8 + birthYearSpan, 2);
-    res.birthday = year + "-" + month + "-" + day;
+    res.birthday = year + "-" + month + "-" + day + " 00:00:00";
     const d = new Date();
     const monthFloor = d.getMonth() + 1 < parseInt(month, 10) || d.getMonth() + 1 == parseInt(month, 10) && d.getDate() < parseInt(day, 10) ? 1 : 0;
     Object.assign(res, parseBirthday(res.birthday));
@@ -26,8 +26,21 @@ function transformDateFormat(format2 = "") {
     return "month";
   return format2.includes("HH") ? "datetime" : "date";
 }
+function validIdCard(cardNo) {
+  if (!cardNo || cardNo.length !== 18) {
+    return false;
+  }
+  const w = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2];
+  const v = ["1", "0", "X", "9", "8", "7", "6", "5", "4", "3", "2"];
+  let sum = 0;
+  for (let i = 0; i < 17; i++) {
+    sum += +cardNo[i] * w[i];
+  }
+  return cardNo.charAt(17).toUpperCase() === v[sum % 11];
+}
+const idcardMatcher = /^\d{6}(((19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2]\d|3[0-1])\d{3}(\d|x|X))|(\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2]\d|3[0-1])\d{3}))$/;
 function isIdCard(idCardNo) {
-  return /^\d{6}(((19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2]\d|3[0-1])\d{3}(\d|x|X))|(\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2]\d|3[0-1])\d{3}))$/.test(idCardNo);
+  return idcardMatcher.test(idCardNo) && validIdCard(idCardNo);
 }
 function isMobile(mobile) {
   return /^1(3\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\d|9[0-35-9])\d{8}$/.test(mobile);

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

@@ -8,7 +8,7 @@ export declare function formRenderLog(message: string, type?: keyof Console): vo
 export declare function arrayed<T>(maybeArray: T): T extends Array<any> ? T : [T];
 export declare function mergeDeepProperties(target: AnyObject, fieldList: FieldItem[], traverseProperties?: string[], property?: string, targetProperty?: string): AnyObject;
 export declare function injectOrProvide<T>(key: InjectionKey<T>, creator: () => T): T;
-export declare function parseNumberFromMaybeString(value: unknown): unknown;
+export declare function parseNumberFromMaybeString<T>(value: T): T extends number | string ? number : T;
 export declare function uuidGenerator(): string;
 export declare function createSlot(renderer: unknown, props: AnyObject): Record<string, () => ArrayAble<VNode>> | {
     default(): any;

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

@@ -3,7 +3,7 @@ import { isObject } from '@vue/shared';
 import { isNumber, isString, isFunction } from 'lodash-es';
 export { isIdCard, isMobile, parseAge2Birthday, parseAge2FromContext, parseBirthday, parseIdCard, transformDateFormat } from './business.js';
 export { queryDecorator, queryInput } from './dom.js';
-export { assignUpdateValue, createLinebarId, elementIdEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema } from './schema.js';
+export { assignUpdateValue, createLinebarId, elementIdEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseFieldList, traverseSchema } from './schema.js';
 
 function formRenderLog(message, type = "log") {
   console[type](`[FormRender]: ${message}`);
@@ -56,10 +56,13 @@ function parseNumberFromMaybeString(value) {
   return value;
 }
 function uuidGenerator() {
-  return "key" + "xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
+  if (window.isSecureContext && window.crypto)
+    return `key${window.crypto.randomUUID()}`;
+  const uuid = "xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
     const r = Math.random() * 16 | 0, v = c == "x" ? r : r & 3 | 8;
     return v.toString(16);
   });
+  return `key${uuid}`;
 }
 function createSlot(renderer, props) {
   if (isObject(renderer) && !isFunction(renderer)) {

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

@@ -13,3 +13,4 @@ export declare function getParentLinebar(key: string, fieldList: FieldItem[]): W
 export declare function assignUpdateValue(props: AnyObject, field: GeneralField): {
     [x: string]: any;
 };
+export declare function traverseFieldList(fieldList: FieldItem[], handler: (field: FieldItem) => void): void;

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

@@ -79,5 +79,16 @@ function assignUpdateValue(props, field) {
   }
   return _props;
 }
+function traverseFieldList(fieldList, handler) {
+  function traverse(fieldList2) {
+    if (!isArray(fieldList2))
+      return;
+    fieldList2.forEach((field) => {
+      handler(field);
+      traverse(field.properties);
+    });
+  }
+  traverse(fieldList);
+}
 
-export { assignUpdateValue, createLinebarId, elementIdEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema };
+export { assignUpdateValue, createLinebarId, elementIdEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseFieldList, traverseSchema };

package/es/packages/shortcut-setter/index.d.ts

@@ -1925,9 +1925,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
         }>>;
         emit: (event: "formChange", ...args: any[]) => void;
         nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-        formModel: import("@formily/core").Form<{
-            [x: string]: any;
-        }>;
+        formModel: import("@formily/core").Form<any>;
         SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
         businessCollector: import("..").BusinessCollector;
         formItemDepsCollector: import("..").FormItemDepsCollector;

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

@@ -1927,9 +1927,7 @@ declare const _default: import("vue").DefineComponent<{
         }>>;
         emit: (event: "formChange", ...args: any[]) => void;
         nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-        formModel: import("@formily/core").Form<{
-            [x: string]: any;
-        }>;
+        formModel: import("@formily/core").Form<any>;
         SchemaField: Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
         businessCollector: import("../../../../es/packages/form-render").BusinessCollector;
         formItemDepsCollector: import("../../../../es/packages/form-render").FormItemDepsCollector;

package/global.d.ts

@@ -1,8 +1,8 @@
-import * as NaiveUI from 'naive-ui';
-
-declare module 'naive-ui' {
-  // @ts-ignore
-  export const NTree: any;
-}
-
-export {};
+import * as NaiveUI from 'naive-ui';
+
+declare module 'naive-ui' {
+  // @ts-ignore
+  export const NTree: any;
+}
+
+export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.16-beta.5",
+  "version": "3.1.16-beta.6",
   "license": "ISC",
   "module": "es/packages/index.js",
   "main": "es/packages/index.js",