cnhis-design-vue 3.1.15-beta.2 → 3.1.15-beta.5

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

@@ -1,18 +1,75 @@
-import { defineComponent, createVNode } from 'vue';
+import { defineComponent, computed, createVNode } from 'vue';
 import { isField } from '@formily/core';
 import { connect, mapProps } from '@formily/vue';
 import { isObject } from '@vueuse/core';
 import { NDatePicker } from 'naive-ui';
+import { useCommonInjection } from '../../../../../packages/form-render/src/hooks/useCommonInjection';
 
 const script = defineComponent({
   props: {
     onChange: {},
-    value: {}
+    value: {},
+    validate: {
+      type: Object
+    }
   },
-  setup(_) {
-    return () => {
-      return createVNode(NDatePicker, null, null);
-    };
+  setup(props) {
+    useCommonInjection().injectValueValidate(() => props.value);
+    function minCurrentDate() {
+      var _a;
+      return ((_a = props.validate) == null ? void 0 : _a.min_date) === "currTime";
+    }
+    function maxCurrentDate() {
+      var _a;
+      return ((_a = props.validate) == null ? void 0 : _a.max_date) === "currTime";
+    }
+    function isDateDisabled(time) {
+      return minCurrentDate() && time < yesterday() || maxCurrentDate() && time > Date.now();
+      function yesterday() {
+        return Date.now() - 24 * 60 * 60 * 1e3;
+      }
+    }
+    function isTimeDisabled(time) {
+      const checkDate = new Date(time);
+      const currentDate = new Date();
+      return {
+        isHourDisabled,
+        isMinuteDisabled
+      };
+      function checkHour() {
+        return checkDate.getHours();
+      }
+      function currentHour() {
+        return currentDate.getHours();
+      }
+      function currentMinute() {
+        return currentDate.getMinutes();
+      }
+      function isHourDisabled(hour) {
+        return minCurrentDate() && hour < currentHour() || maxCurrentDate() && hour > currentHour();
+      }
+      function isMinuteDisabled(minute) {
+        if (checkHour() === currentHour()) {
+          return minCurrentDate() && minute < currentMinute() || maxCurrentDate() && minute > currentMinute();
+        }
+        return minCurrentDate() && checkHour() < currentHour() || maxCurrentDate() && checkHour() > currentHour();
+      }
+    }
+    const validateConfig = computed(() => {
+      const result = {};
+      if (isObject(props.validate)) {
+        const {
+          min_date,
+          max_date
+        } = props.validate;
+        if (min_date || max_date) {
+          result.isDateDisabled = isDateDisabled;
+          result.isTimeDisabled = isTimeDisabled;
+        }
+      }
+      return result;
+    });
+    return () => createVNode(NDatePicker, validateConfig.value, null);
   }
 });
 const DATE = connect(script, mapProps((props, field) => {
@@ -26,58 +83,8 @@ const DATE = connect(script, mapProps((props, field) => {
         field.setValue(v);
       }
     });
-    if (isObject(props.validate)) {
-      const {
-        min_date,
-        max_date
-      } = props.validate;
-      if (min_date || max_date) {
-        _props.isDateDisabled = isDateDisabled;
-        _props.isTimeDisabled = isTimeDisabled;
-      }
-    }
   }
   return _props;
-  function minCurrentDate() {
-    var _a;
-    return ((_a = props.validate) == null ? void 0 : _a.min_date) === "currTime";
-  }
-  function maxCurrentDate() {
-    var _a;
-    return ((_a = props.validate) == null ? void 0 : _a.max_date) === "currTime";
-  }
-  function isDateDisabled(time) {
-    return minCurrentDate() && time < yesterday() || maxCurrentDate() && time > Date.now();
-    function yesterday() {
-      return Date.now() - 24 * 60 * 60 * 1e3;
-    }
-  }
-  function isTimeDisabled(time) {
-    const checkDate = new Date(time);
-    const currentDate = new Date();
-    return {
-      isHourDisabled,
-      isMinuteDisabled
-    };
-    function checkHour() {
-      return checkDate.getHours();
-    }
-    function currentHour() {
-      return currentDate.getHours();
-    }
-    function currentMinute() {
-      return currentDate.getMinutes();
-    }
-    function isHourDisabled(hour) {
-      return minCurrentDate() && hour < currentHour() || maxCurrentDate() && hour > currentHour();
-    }
-    function isMinuteDisabled(minute) {
-      if (checkHour() === currentHour()) {
-        return minCurrentDate() && minute < currentMinute() || maxCurrentDate() && minute > currentMinute();
-      }
-      return minCurrentDate() && checkHour() < currentHour() || maxCurrentDate() && checkHour() > currentHour();
-    }
-  }
 }));
 
 export { DATE };

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

@@ -7,7 +7,7 @@ export { LINEBAR } from './linebar.js';
 export { INPUT_GROUP } from './inputGroup.js';
 export { DATE } from './date.js';
 export { SEARCH_CASCADE } from './cascader.js';
-export { COMBINATION } from './combination.js';
+export { COMBINATION } from './combination/index.js';
 export { CHECKBOX } from './checkbox.js';
 export { SWITCH } from './switch.js';
 export { RADIO } from './radio.js';

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

@@ -1,5 +1,6 @@
 import { defineComponent, computed, createVNode } from 'vue';
 import { connect, mapProps } from '@formily/vue';
+import { isNumber } from 'lodash-es';
 import { NRadioGroup, NSpace, NRadio } from 'naive-ui';
 import { assignUpdateValue } from '../../utils/index.js';
 
@@ -23,7 +24,9 @@ const script = defineComponent({
     emit
   }) {
     function dangerousTypeTransform(value) {
-      return value + "";
+      if (isNumber(value))
+        return value + "";
+      return value;
     }
     const valueRef = computed({
       get() {

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

@@ -13,6 +13,10 @@ export declare const SELECT: import("vue").DefineComponent<{
     value: {
         type: StringConstructor;
     };
+    lazyRequest: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     options: {
         type: PropType<AnyObject[]>;
         default: () => never[];
@@ -28,6 +32,10 @@ export declare const SELECT: import("vue").DefineComponent<{
     value: {
         type: StringConstructor;
     };
+    lazyRequest: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     options: {
         type: PropType<AnyObject[]>;
         default: () => never[];
@@ -43,5 +51,6 @@ export declare const SELECT: import("vue").DefineComponent<{
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
 }, {
     options: AnyObject[];
+    lazyRequest: boolean;
 }>;
 export {};

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

@@ -1,6 +1,7 @@
 import { defineComponent, ref, computed, inject, watch, createVNode } from 'vue';
 import { isField } from '@formily/core';
 import { isEqual, cloneDeep } from 'lodash-es';
+import { useCommonInjection } from '../../../../../packages/form-render/src/hooks/useCommonInjection';
 import { InjectionChangeContextCollector, InjectAsyncQueue, InjectionFormItemDepsCollector } from '../../constants/index.js';
 import { assignUpdateValue, traverseDependKey } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
@@ -13,6 +14,10 @@ const script = defineComponent({
     value: {
       type: String
     },
+    lazyRequest: {
+      type: Boolean,
+      default: true
+    },
     options: {
       type: Array,
       default: () => []
@@ -102,17 +107,16 @@ const script = defineComponent({
         remoteOptions.value = null;
         emit("update:value", null);
       });
-      props.value && fetchData();
-    }, {
-      immediate: true
-    });
-    watch(() => props.value, (n, o) => {
-      var _a, _b;
-      o == null && n != null && fetchData();
-      isField(field.value) && field.value.visited && ((_b = (_a = field.value).validate) == null ? void 0 : _b.call(_a));
+      (props.value || !props.lazyRequest) && fetchData();
     }, {
       immediate: true
     });
+    const {
+      injectValueValidate,
+      injectValueWatchFromEmpty
+    } = useCommonInjection();
+    injectValueWatchFromEmpty(() => props.value, fetchData);
+    injectValueValidate(() => props.value);
     function focusDecorator(onFocus) {
       return (...args) => {
         if (isField(field.value)) {

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

@@ -1,3 +1,4 @@
+import { WithNull } from '../../../../../es/src/types';
 import { ContextCollector } from '../../../../../es/packages/form-render/src/hooks/useChangeContext';
 import { BusinessCollector, FormItemDepsCollector } from '../hooks';
 import { FormAsyncQueue } from '../types';
@@ -8,7 +9,7 @@ export declare const InjectionBusinessCollector: InjectionKey<BusinessCollector>
 export declare const InjectionChangeContextCollector: InjectionKey<ContextCollector>;
 export declare const InjectionFormItemDepsCollector: InjectionKey<FormItemDepsCollector>;
 export declare const InjectionFormUUID: InjectionKey<string>;
-export declare const InjectionAnnotation: InjectionKey<WritableComputedRef<Record<string, string>>>;
+export declare const InjectionAnnotation: InjectionKey<WritableComputedRef<WithNull<Record<string, string>>>>;
 export declare const FormItemLineBarDepKeyPrepend = "__dep_LINEBAR_";
 export declare enum FIELD_BUSINESS_TYPE {
     PASSWORD = "password",

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

@@ -1,15 +1,16 @@
-import { AnyObject } from '../../../../../es/src/types';
+import { WithUndefined } from '../../../../../es/src/types';
 import { ISchema } from '@formily/json-schema/esm/types';
-import { FormItemDepsCollector } from '../../../../../es/packages/form-render';
-export declare function useAnchor(props: Readonly<AnyObject>, collector: FormItemDepsCollector): {
+import { Ref } from 'vue';
+import { FormItemDepsCollector, FormRenderProps } from '../../../../../es/packages/form-render';
+export declare function useAnchor(props: Readonly<FormRenderProps>, scrollbarRef: Ref<WithUndefined<HTMLElement>>, collector: FormItemDepsCollector): {
     currentAnchor: import("vue").WritableComputedRef<string>;
     onScroll: () => void;
-    formHeight: import("vue").ComputedRef<any>;
-    anchorIdList: import("vue").Ref<{
+    formHeight: import("vue").ComputedRef<string | undefined>;
+    anchorIdList: Ref<{
         name: string;
         title: string;
     }[]>;
     generateAnchorList: (schema: ISchema) => void;
-    scrollbarRef: import("vue").Ref<HTMLElement | undefined>;
+    scrollbarRef: Ref<WithUndefined<HTMLElement>>;
     scrollTo: (id: string) => Promise<void>;
 };

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

@@ -5,7 +5,7 @@ import { ref, computed, watch, nextTick } from 'vue';
 import { FormItemLineBarDepKeyPrepend } from '../../../../packages/form-render/src/constants';
 import { createLinebarId, traverseSchema } from '../../../../packages/form-render/src/utils';
 
-function useAnchor(props, collector) {
+function useAnchor(props, scrollbarRef, collector) {
   const __currentAnchor = ref("");
   const formHeight = computed(() => {
     if (isNumber(props.maxHeight))
@@ -22,7 +22,6 @@ function useAnchor(props, collector) {
       }
     });
   }
-  const scrollbarRef = ref();
   let scrollLock = false;
   async function scrollTo(id) {
     scrollLock = true;

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

@@ -1,4 +1,9 @@
+import { AnyObject, WithUndefined } from '../../../../../es/src/types';
 import { FormAsyncQueueItem } from '../types';
+declare type ProcessorOption = Partial<{
+    afterRequest(payload?: AnyObject[]): WithUndefined<AnyObject[]> | void;
+    beforeRequest(params?: AnyObject): WithUndefined<AnyObject> | void;
+}>;
 interface EntryCallback {
     (err?: any, result?: any): void;
 }
@@ -32,7 +37,7 @@ export declare class AsyncQueue<T = any, K = any, R = any> {
     private _handlerResult;
 }
 export declare function useAsyncQueue(): {
-    create: (parallelism?: number) => AsyncQueue<FormAsyncQueueItem, any, {
+    create: (parallelism?: number, option?: ProcessorOption) => AsyncQueue<FormAsyncQueueItem, any, {
         label: string;
         value: unknown;
     }[]>;

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

@@ -1,3 +1,4 @@
+import { isFunction } from 'lodash-es';
 import { useFormRequest, useCommonLog } from '../../../../packages/form-render';
 
 class AsyncQueueEntry {
@@ -103,11 +104,12 @@ class AsyncQueue {
 }
 function useAsyncQueue() {
   const { getHttpInstance } = useFormRequest();
-  function create(parallelism = 3) {
+  function create(parallelism = 3, option) {
     return new AsyncQueue({
       name: "FormRenderAsyncQueue",
       parallelism,
       async processor({ method = "post", params, url }, cb, removeCache) {
+        var _a, _b;
         const http = getHttpInstance();
         if (!http) {
           useCommonLog().invalidHttpInstanceLog();
@@ -116,11 +118,18 @@ function useAsyncQueue() {
           return;
         }
         try {
+          if (option && isFunction(option.beforeRequest)) {
+            params = (_a = option.beforeRequest(params)) != null ? _a : {};
+          }
           const res = await http[method](url, params);
           const { data, success } = res;
           if (!success)
             throw res;
-          cb(void 0, Array.isArray(data) ? data : []);
+          let payload = Array.isArray(data) ? data : [];
+          if (option && isFunction(option.afterRequest)) {
+            payload = (_b = option.afterRequest(payload)) != null ? _b : [];
+          }
+          cb(void 0, payload);
         } catch (e) {
           cb(new Error(`Request error => ${e}`));
           removeCache();

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

@@ -0,0 +1,6 @@
+import { Func } from '../../../../../es/src/types';
+import { WatchSource } from '@vue/runtime-core';
+export declare function useCommonInjection(): {
+    injectValueValidate: (traverser: WatchSource) => void;
+    injectValueWatchFromEmpty: (traverser: WatchSource, trigger: Func) => void;
+};

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

@@ -0,0 +1,19 @@
+import { isField } from '@formily/core';
+import { watch } from 'vue';
+import { useFormField } from '../../../../packages/form-render';
+
+function useCommonInjection() {
+  function injectValueValidate(traverser) {
+    const { field } = useFormField();
+    watch(traverser, () => {
+      var _a, _b;
+      return isField(field.value) && field.value.visited && ((_b = (_a = field.value).validate) == null ? void 0 : _b.call(_a));
+    });
+  }
+  function injectValueWatchFromEmpty(traverser, trigger) {
+    watch(traverser, (n, o) => n != null && o == null && trigger(), { immediate: true });
+  }
+  return { injectValueValidate, injectValueWatchFromEmpty };
+}
+
+export { useCommonInjection };

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

@@ -44,16 +44,14 @@ function useFieldListAdaptor(collector, uuid) {
   const createInputSchema = (item) => {
     const schema = createStandardSchema(item);
     Object.assign(schema["x-component-props"], {
-      prefix: item.prefix,
-      suffix: item.suffix
+      ...pick(item, ["prefix", "suffix"])
     });
     return schema;
   };
   const createSelectSchema = (item) => {
     const schema = createStandardSchema(item);
     Object.assign(schema["x-component-props"], {
-      urlConfig: item.urlConfig,
-      options: item.option,
+      ...pick(item, ["lazyRequest", "urlConfig", "option"]),
       multiple: item.multi_select === "0",
       maxTagCount: +item.multi_select_value
     });

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

@@ -1,10 +1,10 @@
 import { ShallowReactive } from 'vue';
-import { AnyObject } from '../../../../../es/src/types';
-export declare function useFormContext(props: ShallowReactive<AnyObject>): {
+import { FormRenderProps } from '../../../../../es/packages/form-render';
+export declare function useFormContext(props: ShallowReactive<FormRenderProps>): {
     asyncQueue: import("../../../../../es/packages/form-render").FormAsyncQueue;
     SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
     businessCollector: import("../../../../../es/packages/form-render").BusinessCollector;
     changeContextCollector: import("../../../../../es/packages/form-render").ContextCollector;
     formItemDepsCollector: import("../../../../../es/packages/form-render").FormItemDepsCollector;
-    formUUID: any;
+    formUUID: string;
 };

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

@@ -1,14 +1,26 @@
-import { isObject } from 'lodash-es';
+import { isObject } from '@vue/shared';
+import { cloneDeep } from 'lodash-es';
 import { provide, computed, readonly } from 'vue';
 import { createSchemaField } from '@formily/vue';
 import { useAsyncQueue, useBusinessBinding, useChangeContext, useFormItemDeps } from '../../../../packages/form-render';
 import * as components from '../../../../packages/form-render/src/components/renderer';
+import { useFormRenderLifeCycle } from '../../../../packages/form-render/src/hooks/useFormRenderLifeCycle';
 import { usePresetScope } from '../../../../packages/form-render/src/hooks/usePresetScope';
 import { injectOrProvide, uuidGenerator } from '../../../../packages/form-render/src/utils';
 import { InjectAsyncQueue, InjectionSchemaField, InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectionFormUUID, InjectionAnnotation } from '../../../../packages/form-render/src/constants';
 
 function useFormContext(props) {
-  const asyncQueue = injectOrProvide(InjectAsyncQueue, () => useAsyncQueue().create(props.parallelism));
+  const { callLifeCycle } = useFormRenderLifeCycle(props);
+  const asyncQueue = injectOrProvide(InjectAsyncQueue, () => useAsyncQueue().create(props.parallelism, {
+    beforeRequest(params) {
+      var _a;
+      return (_a = callLifeCycle("beforeRequest", [cloneDeep(params)])) != null ? _a : params;
+    },
+    afterRequest(payload) {
+      var _a;
+      return (_a = callLifeCycle("afterRequest", [payload])) != null ? _a : payload;
+    }
+  }));
   const SchemaField = injectOrProvide(InjectionSchemaField, () => createSchemaField({
     components: {
       ...components,
@@ -29,7 +41,7 @@ function useFormContext(props) {
       return props.annotation ? readonly(props.annotation) : null;
     },
     set(payload) {
-      if (!isObject(props.annotation))
+      if (!isObject(props.annotation) || !isObject(payload))
         return;
       props.annotation[payload.property] = payload.value;
     }

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

@@ -0,0 +1,13 @@
+import { WithUndefined } from '../../../../../es/src/types';
+import { FormRenderLifeCycle, FormRenderProps } from '../../../../../es/packages/form-render';
+export declare function useFormRenderLifeCycle(props: FormRenderProps): {
+    callLifeCycle: <T extends "onSetup" | "beforeRequest" | "afterRequest">(lifeCycleName: T, payload?: Parameters<Required<Partial<{
+        onSetup(): void;
+        beforeRequest(params?: import("../../../../../es/src/types").AnyObject | undefined): void | WithUndefined<import("../../../../../es/src/types").AnyObject>;
+        afterRequest(payload?: import("../../../../../es/src/types").AnyObject[] | undefined): void | WithUndefined<import("../../../../../es/src/types").AnyObject[]>;
+    }>>[T]> | undefined) => WithUndefined<ReturnType<Required<Partial<{
+        onSetup(): void;
+        beforeRequest(params?: import("../../../../../es/src/types").AnyObject | undefined): void | WithUndefined<import("../../../../../es/src/types").AnyObject>;
+        afterRequest(payload?: import("../../../../../es/src/types").AnyObject[] | undefined): void | WithUndefined<import("../../../../../es/src/types").AnyObject[]>;
+    }>>[T]>>;
+};

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

@@ -0,0 +1,10 @@
+import { isFunction } from 'lodash-es';
+
+function useFormRenderLifeCycle(props) {
+  function callLifeCycle(lifeCycleName, payload) {
+    return props.lifeCycle && isFunction(props.lifeCycle[lifeCycleName]) && props.lifeCycle[lifeCycleName].apply(void 0, payload || []);
+  }
+  return { callLifeCycle };
+}
+
+export { useFormRenderLifeCycle };

package/es/packages/form-render/src/types/fieldItem.d.ts

@@ -156,6 +156,10 @@ export declare type FieldItem = {
      * BUTTON/TEXT控件内容
      */
     content: string | FormRenderer | Record<string, FormRenderer>;
+    /**
+     * 假使控件需要发送请求, 用于控制是否只在需要的时候发送请求
+     */
+    lazyRequest: boolean;
     /**
      * COMBINATION控件最大表单组数量
      */
@@ -176,6 +180,10 @@ export declare type FieldItem = {
      * FormItem额外的props
      */
     decoratorProps: AnyObject;
+    /**
+     * 是否不使用decorator组件(n-form-item)
+     */
+    noDecorator: Boolean;
     /**
      * COMPLEX控件布局类型
      */

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

@@ -1,5 +1,7 @@
-import { AnyObject, ArrayAble } from '../../../../../es/src/types';
+import { AnyObject, ArrayAble, WithUndefined } from '../../../../../es/src/types';
 import { DataField, Field } from '@formily/core';
+import { ISchema } from '@formily/json-schema/esm/types';
+import { Component, FunctionalComponent } from 'vue';
 import { FIELD_BUSINESS_TYPE } from '../../../../../es/packages/form-render/src/constants';
 import { FieldItem } from '../types';
 import { AsyncQueue } from '../hooks';
@@ -50,3 +52,25 @@ export declare type FormBusinessFilter = (payload: {
     context?: any;
 }) => unknown;
 export declare type DependKeyType = ArrayAble<string> | Record<string, string> | ArrayAble<Record<'paramName' | 'paramValue', string>>;
+export declare type FormRenderLifeCycle = Partial<{
+    onSetup(): void;
+    beforeRequest(params?: AnyObject): WithUndefined<AnyObject> | void;
+    afterRequest(payload?: AnyObject[]): WithUndefined<AnyObject[]> | void;
+}>;
+export declare type FormRenderProps = Partial<{
+    fieldList: FieldItem[];
+    initialData: AnyObject;
+    fieldVisitor: FieldVisitor;
+    column: number;
+    maxHeight: number | string;
+    anchor: boolean;
+    parallelism: number;
+    schema: ISchema;
+    components: Record<string, Component | FunctionalComponent>;
+    businessFilter: FormBusinessFilter;
+    scope: AnyObject;
+    annotation: AnyObject;
+    consumer: boolean;
+    uuid: string;
+    lifeCycle: FormRenderLifeCycle;
+}>;

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

@@ -1,4 +1,4 @@
-import { AnyObject, ArrayAble } from '../../../../../es/src/types';
+import { AnyObject, ArrayAble, WithNull } from '../../../../../es/src/types';
 import { ISchema } from '@formily/json-schema/esm/types';
 import { GeneralField } from '@formily/core';
 import { FunctionalComponent, InjectionKey, VNode } from 'vue';
@@ -24,11 +24,11 @@ export declare function createSlot(renderer: unknown, props: AnyObject): Record<
     default(): any;
 };
 export declare function queryDecorator(key: string, wrapperElement: HTMLElement, formUUID: string): HTMLElement | null;
-export declare function queryInput(decoratorElement?: HTMLElement | null): {
+export declare function queryInput(decoratorElement?: WithNull<HTMLElement>): {
     widgetElement: HTMLInputElement | null | undefined;
     widgetElementList: HTMLInputElement[];
 };
-export declare function getParentLinebar(key: string, fieldList: FieldItem[]): string | null;
+export declare function getParentLinebar(key: string, fieldList: FieldItem[]): WithNull<string>;
 export declare function elementIdEscape(id: string): string;
 export declare function createLinebarId(id: string): string;
 export declare function fieldKeyEscape(fieldList: FieldItem[]): string;

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

@@ -3,10 +3,7 @@ import { isObject } from '@vue/shared';
 import { isArray, isString, isFunction } from 'lodash-es';
 import { FIELD_SEX_VALUE } from '../constants/index.js';
 import { isField } from '@formily/core';
-import differenceInDays from '../../../../node_modules/date-fns/esm/differenceInDays/index.js';
-import differenceInMonths from '../../../../node_modules/date-fns/esm/differenceInMonths/index.js';
-import differenceInYears from '../../../../node_modules/date-fns/esm/differenceInYears/index.js';
-import '../../../../node_modules/date-fns/esm/parse/_lib/parsers/index.js';
+import { differenceInDays, differenceInMonths, differenceInYears } from 'date-fns';
 
 function formRenderLog(message, type = "log") {
   console[type](`[FormRender]: ${message}`);

package/es/packages/form-render/style/index.css

@@ -25,7 +25,8 @@
 .form-render__formItem {
   grid-column: span var(--form-item-column) / span var(--form-item-column);
 }
-.form-render__formItem .n-date-picker {
+.form-render__formItem .n-date-picker,
+.form-render__formItem .n-input-number {
   width: 100%;
 }
 .form-render__formItemLabel {
@@ -42,6 +43,15 @@
   transform: translateY(-50%);
   right: calc(var(--icon-right) * 1px);
 }
+.form-render__formItem .n-form-item-label {
+  display: inline-flex;
+}
+.form-render__formItem .n-form-item-label [annotation-hover-show='true'] {
+  visibility: hidden;
+}
+.form-render__formItem .n-form-item-label:hover [annotation-hover-show='true'] {
+  visibility: visible;
+}
 .form-render__linebar {
   grid-column: span var(--column) / span var(--column);
 }
@@ -131,12 +141,3 @@
   display: flex !important;
   gap: 0 8px;
 }
-.form-render .n-form-item-label {
-  display: inline-flex;
-}
-.form-render .n-form-item-label [annotation-hover-show='true'] {
-  visibility: hidden;
-}
-.form-render .n-form-item-label:hover [annotation-hover-show='true'] {
-  visibility: visible;
-}