cnhis-design-vue 3.1.16-beta.4 → 3.1.16-beta.7

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

@@ -3616,6 +3616,9 @@ declare const _default: import("vue").DefineComponent<{}, {
             type: NumberConstructor;
             default: number;
         };
+        businessFormatter: {
+            type: import("vue").PropType<import("../../../../../es/packages/form-render").FormBusinessFormatter>;
+        };
         schema: {
             type: import("vue").PropType<import("@formily/json-schema").Stringify<{
                 [key: symbol]: any;
@@ -3728,6 +3731,9 @@ declare const _default: import("vue").DefineComponent<{}, {
                 type: NumberConstructor;
                 default: number;
             };
+            businessFormatter: {
+                type: import("vue").PropType<import("../../../../../es/packages/form-render").FormBusinessFormatter>;
+            };
             schema: {
                 type: import("vue").PropType<import("@formily/json-schema").Stringify<{
                     [key: symbol]: any;
@@ -3817,9 +3823,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;
@@ -5227,6 +5231,9 @@ declare const _default: import("vue").DefineComponent<{}, {
             type: NumberConstructor;
             default: number;
         };
+        businessFormatter: {
+            type: import("vue").PropType<import("../../../../../es/packages/form-render").FormBusinessFormatter>;
+        };
         schema: {
             type: import("vue").PropType<import("@formily/json-schema").Stringify<{
                 [key: symbol]: any;

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

@@ -29,6 +29,9 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
         type: NumberConstructor;
         default: number;
     };
+    businessFormatter: {
+        type: import("vue").PropType<import("./src/types").FormBusinessFormatter>;
+    };
     schema: {
         type: import("vue").PropType<import("@formily/json-schema").Stringify<{
             [key: symbol]: any;
@@ -141,6 +144,9 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
             type: NumberConstructor;
             default: number;
         };
+        businessFormatter: {
+            type: import("vue").PropType<import("./src/types").FormBusinessFormatter>;
+        };
         schema: {
             type: import("vue").PropType<import("@formily/json-schema").Stringify<{
                 [key: symbol]: any;
@@ -230,9 +236,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;
@@ -1640,6 +1644,9 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
         type: NumberConstructor;
         default: number;
     };
+    businessFormatter: {
+        type: import("vue").PropType<import("./src/types").FormBusinessFormatter>;
+    };
     schema: {
         type: import("vue").PropType<import("@formily/json-schema").Stringify<{
             [key: symbol]: any;

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

@@ -1,7 +1,8 @@
 import { defineComponent, ref, computed, watch, openBlock, createBlock, unref, withCtx, createElementBlock, createVNode, isRef, Fragment, renderList, createCommentVNode, createElementVNode, normalizeStyle, renderSlot, toDisplayString, nextTick } from 'vue';
 import { createForm, onFieldValueChange, isField } from '@formily/core';
 import { FormProvider, FormConsumer } from '@formily/vue';
-import { cloneDeep, isArray, isObject } from 'lodash-es';
+import { isObject } from '@vue/shared';
+import { cloneDeep, isArray } from 'lodash-es';
 import { NForm, NTabs, NTabPane, NConfigProvider } from 'naive-ui';
 import { FormItemLineBarDepKeyPrepend } from '../../../packages/form-render/src/constants';
 import { useFormRenderLifeCycle } from '../../../packages/form-render/src/hooks/useFormRenderLifeCycle';
@@ -29,6 +30,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     maxHeight: { type: [Number, String], default: "" },
     anchor: { type: Boolean, default: false },
     parallelism: { type: Number, default: 3 },
+    businessFormatter: { type: Function },
     schema: { type: Object },
     components: {
       type: Object,
@@ -50,14 +52,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const formModel = createForm({
       initialValues: useInitialData().assignInitialData(props.initialData, props.fieldList),
       effects() {
-        onFieldValueChange("*", (field) => {
+        onFieldValueChange("*", async (field) => {
           const fieldKey = field.props.name.toString();
           emit("formChange", {
             fieldInstance: field,
             fieldKey,
             fieldName: field.title,
             value: field.value,
-            context: changeContextCollector.getContext(fieldKey)
+            context: await changeContextCollector.getContext(fieldKey)
           });
           businessCollector.trigger(fieldKey);
           formItemDepsCollector.trigger(fieldKey);
@@ -101,6 +103,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           return Promise.reject(Array.isArray(err) ? err.reduce(errInfoNormalize, []) : err);
         });
         function errInfoNormalize(result, error) {
+          if (!isObject(error))
+            return result;
           let hasChildMessage = false;
           if (isArray(error.messages)) {
             error.messages.forEach((message) => {

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

@@ -1,7 +1,7 @@
 /// <reference types="lodash" />
 import { AnyObject } from '../../../../es/src/types';
 import { Component, FunctionalComponent, nextTick, PropType } from 'vue';
-import { FieldItem, FieldVisitor } from './types';
+import { FieldItem, FieldVisitor, FormBusinessFormatter } from './types';
 declare const _default: import("vue").DefineComponent<{
     fieldList: {
         type: PropType<FieldItem[]>;
@@ -29,6 +29,9 @@ declare const _default: import("vue").DefineComponent<{
         type: NumberConstructor;
         default: number;
     };
+    businessFormatter: {
+        type: PropType<FormBusinessFormatter>;
+    };
     schema: {
         type: PropType<import("@formily/vue").Stringify<{
             [key: symbol]: any;
@@ -141,6 +144,9 @@ declare const _default: import("vue").DefineComponent<{
             type: NumberConstructor;
             default: number;
         };
+        businessFormatter: {
+            type: PropType<FormBusinessFormatter>;
+        };
         schema: {
             type: PropType<import("@formily/vue").Stringify<{
                 [key: symbol]: any;
@@ -230,9 +236,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;
@@ -1640,6 +1644,9 @@ declare const _default: import("vue").DefineComponent<{
         type: NumberConstructor;
         default: number;
     };
+    businessFormatter: {
+        type: PropType<FormBusinessFormatter>;
+    };
     schema: {
         type: PropType<import("@formily/vue").Stringify<{
             [key: symbol]: any;

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, onMounted, inject, createVNode } from 'vue';
+import { defineComponent, ref, inject, createVNode } from 'vue';
 import { connect, mapProps } from '@formily/vue';
 import { NDivider, NCollapseTransition } from 'naive-ui';
 import { useFormField } from '../../../../../packages/form-render';
@@ -28,9 +28,6 @@ const script = defineComponent({
     slots
   }) {
     const _show = ref(props.show);
-    onMounted(() => {
-      _show.value = props.show;
-    });
     function toggleShow() {
       if (props.disabled)
         return;

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

@@ -1,8 +1,8 @@
-import { defineComponent, ref, computed, inject, watch, createVNode } from 'vue';
+import { defineComponent, computed, ref, inject, nextTick, watch, createVNode } from 'vue';
 import { isField } from '@formily/core';
-import { isEqual, cloneDeep } from 'lodash-es';
+import { cloneDeep, isEqual } from 'lodash-es';
 import { useCommonInjection } from '../../../../../packages/form-render/src/hooks/useCommonInjection';
-import { InjectionChangeContextCollector, InjectAsyncQueue, InjectionFormItemDepsCollector } from '../../constants/index.js';
+import { InjectAsyncQueue, InjectionChangeContextCollector, InjectionFormItemDepsCollector } from '../../constants/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NSelect } from 'naive-ui';
 import { useFormField } from '../../hooks/useFormField.js';
@@ -35,6 +35,10 @@ const script = defineComponent({
     slots,
     emit
   }) {
+    const valueRef = computed({
+      get: () => props.value,
+      set: (v) => emit("update:value", v)
+    });
     const remoteOptions = ref(null);
     const lastSearch = ref("");
     const labelKey = computed(() => {
@@ -45,11 +49,6 @@ const script = defineComponent({
       var _a, _b;
       return (_b = (_a = props.urlConfig) == null ? void 0 : _a.valueKey) != null ? _b : "value";
     });
-    const changeContextCollector = inject(InjectionChangeContextCollector);
-    function update(v, option) {
-      changeContextCollector == null ? void 0 : changeContextCollector.setContext(fieldKey.value, "currentOption", cloneDeep(option));
-      emit("update:value", v);
-    }
     const {
       field,
       fieldKey
@@ -102,6 +101,13 @@ const script = defineComponent({
         });
       }
     });
+    const changeContextCollector = inject(InjectionChangeContextCollector);
+    changeContextCollector == null ? void 0 : changeContextCollector.setContext(fieldKey.value, async () => {
+      await nextTick();
+      return {
+        currentOption: cloneDeep(parsedOptions.value.find((option) => option[valueKey.value] === valueRef.value))
+      };
+    });
     const formItemDepsCollector = inject(InjectionFormItemDepsCollector);
     watch(() => props.urlConfig, (config, oldConfig) => {
       if (isEqual(config, oldConfig))
@@ -114,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
     });
@@ -122,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)) {
@@ -135,8 +141,8 @@ const script = defineComponent({
     return () => createVNode(NSelect, {
       "remote": true,
       "filterable": true,
-      "value": props.value,
-      "onUpdate:value": update,
+      "value": valueRef.value,
+      "onUpdate:value": ($event) => valueRef.value = $event,
       "labelField": labelKey.value,
       "valueField": valueKey.value,
       "options": parsedOptions.value,