cnhis-design-vue 3.1.16 → 3.1.17-beta.2

package/es/packages/form-config/src/hooks/useConfigurationField.js

@@ -2,24 +2,24 @@ import { EditAbleField, widgetWidthOptionConfig, isShowOptionConfig, isNotFoldOp
 
 function useConfigurationField() {
   const fieldMap = /* @__PURE__ */ new Map([
-    [EditAbleField.NAME, { alias: "\u540D\u79F0", elem_width: 12, is_null: "0", html_type: "INPUT" }],
-    [EditAbleField.NOTES, { alias: "\u95EE\u53F7\u63D0\u793A", elem_width: 12, html_type: "INPUT" }],
+    [EditAbleField.NAME, { alias: "\u540D\u79F0", elem_width: 6, is_null: "0", html_type: "INPUT" }],
+    [EditAbleField.NOTES, { alias: "\u95EE\u53F7\u63D0\u793A", elem_width: 6, html_type: "INPUT" }],
     [
       EditAbleField.DEFAULT_VALUE,
-      { alias: "\u9ED8\u8BA4\u503C", elem_width: 12, html_type: "INPUT", validate: { max_length: 20 } }
+      { alias: "\u9ED8\u8BA4\u503C", elem_width: 6, html_type: "INPUT", validate: { max_length: 20 } }
     ],
     [
       EditAbleField.LAYOUT_WIDTH_ENUM,
-      { alias: "\u5BBD\u5EA6", fieldType: "number", html_type: "SELECT", elem_width: 12, ...widgetWidthOptionConfig() }
+      { alias: "\u5BBD\u5EA6", fieldType: "number", html_type: "SELECT", elem_width: 6, ...widgetWidthOptionConfig() }
     ],
-    [EditAbleField.DESC, { alias: "\u8BF4\u660E\u6587\u672C", elem_width: 12, html_type: "INPUT", validate: { max_length: 30 } }],
+    [EditAbleField.DESC, { alias: "\u8BF4\u660E\u6587\u672C", elem_width: 6, html_type: "INPUT", validate: { max_length: 30 } }],
     [
       EditAbleField.DEFAULT_EXPAND,
-      { alias: "\u662F\u5426\u9ED8\u8BA4\u5C55\u5F00", html_type: "SWITCH", elem_width: 12, ...isShowOptionConfig() }
+      { alias: "\u662F\u5426\u9ED8\u8BA4\u5C55\u5F00", html_type: "SWITCH", elem_width: 6, ...isShowOptionConfig() }
     ],
-    [EditAbleField.FOLD, { alias: "\u662F\u5426\u53EF\u6298\u53E0", html_type: "SWITCH", elem_width: 12, ...isNotFoldOptionConfig() }],
-    [EditAbleField.EDITABLE, { alias: "\u662F\u5426\u53EF\u7F16\u8F91", html_type: "SWITCH", elem_width: 12, ...isEditOptionConfig() }],
-    [EditAbleField.REQUIRED, { alias: "\u662F\u5426\u5FC5\u586B", html_type: "SWITCH", elem_width: 12, ...isNullOptionConfig() }]
+    [EditAbleField.FOLD, { alias: "\u662F\u5426\u53EF\u6298\u53E0", html_type: "SWITCH", elem_width: 6, ...isNotFoldOptionConfig() }],
+    [EditAbleField.EDITABLE, { alias: "\u662F\u5426\u53EF\u7F16\u8F91", html_type: "SWITCH", elem_width: 6, ...isEditOptionConfig() }],
+    [EditAbleField.REQUIRED, { alias: "\u662F\u5426\u5FC5\u586B", html_type: "SWITCH", elem_width: 6, ...isNullOptionConfig() }]
   ]);
   function generateFieldListByKeys(keyList) {
     return keyList.map((key) => {

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

@@ -112,7 +112,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
     lifeCycle: {
         type: import("vue").PropType<Partial<{
             onSetup(): void;
-            beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject>;
+            beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").UndefinedAble<import("../../../es/src/types").AnyObject>;
             afterRequest(fieldKey: string, payload?: any): import("../../../es/src/types").AnyObject[];
         }>>;
     };
@@ -227,7 +227,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
         lifeCycle: {
             type: import("vue").PropType<Partial<{
                 onSetup(): void;
-                beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject>;
+                beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").UndefinedAble<import("../../../es/src/types").AnyObject>;
                 afterRequest(fieldKey: string, payload?: any): import("../../../es/src/types").AnyObject[];
             }>>;
         };
@@ -1729,7 +1729,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
     lifeCycle: {
         type: import("vue").PropType<Partial<{
             onSetup(): void;
-            beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject>;
+            beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").UndefinedAble<import("../../../es/src/types").AnyObject>;
             afterRequest(fieldKey: string, payload?: any): import("../../../es/src/types").AnyObject[];
         }>>;
     };

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

@@ -7,7 +7,7 @@ export { useCommonLog } from './src/hooks/useCommonLog.js';
 export { useFormField } from './src/hooks/useFormField.js';
 export { AsyncQueue, useAsyncQueue } from './src/hooks/useAsyncQueue.js';
 export { useFieldVisitor } from './src/hooks/useFieldVisitor.js';
-export { useTypeNormalize } from './src/hooks/useTypeNormalize.js';
+export { useFieldNormalize } from './src/hooks/useFieldNormalize.js';
 export { useFormValidator } from './src/hooks/useFormValidator.js';
 export { BusinessCollector, useBusinessBinding } from './src/hooks/useBusinessBinding.js';
 export { ContextCollector, useChangeContext } from './src/hooks/useChangeContext.js';

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

@@ -25,7 +25,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     fieldList: { type: Array },
     initialData: { type: Object, default: () => ({}) },
     fieldVisitor: { type: Object },
-    column: { type: Number, default: 12 },
+    column: { type: Number, default: 24 },
     maxHeight: { type: [Number, String], default: "" },
     anchor: { type: Boolean, default: false },
     parallelism: { type: Number, default: 3 },

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

@@ -112,7 +112,7 @@ declare const _default: import("vue").DefineComponent<{
     lifeCycle: {
         type: PropType<Partial<{
             onSetup(): void;
-            beforeRequest(fieldKey: string, params?: AnyObject | undefined): void | import("../../../../es/src/types").WithUndefined<AnyObject>;
+            beforeRequest(fieldKey: string, params?: AnyObject | undefined): void | import("../../../../es/src/types").UndefinedAble<AnyObject>;
             afterRequest(fieldKey: string, payload?: any): AnyObject[];
         }>>;
     };
@@ -227,7 +227,7 @@ declare const _default: import("vue").DefineComponent<{
         lifeCycle: {
             type: PropType<Partial<{
                 onSetup(): void;
-                beforeRequest(fieldKey: string, params?: AnyObject | undefined): void | import("../../../../es/src/types").WithUndefined<AnyObject>;
+                beforeRequest(fieldKey: string, params?: AnyObject | undefined): void | import("../../../../es/src/types").UndefinedAble<AnyObject>;
                 afterRequest(fieldKey: string, payload?: any): AnyObject[];
             }>>;
         };
@@ -1729,7 +1729,7 @@ declare const _default: import("vue").DefineComponent<{
     lifeCycle: {
         type: PropType<Partial<{
             onSetup(): void;
-            beforeRequest(fieldKey: string, params?: AnyObject | undefined): void | import("../../../../es/src/types").WithUndefined<AnyObject>;
+            beforeRequest(fieldKey: string, params?: AnyObject | undefined): void | import("../../../../es/src/types").UndefinedAble<AnyObject>;
             afterRequest(fieldKey: string, payload?: any): AnyObject[];
         }>>;
     };

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

@@ -64,14 +64,13 @@ const script = defineComponent({
 const FORM_ITEM = connect(script, mapProps({
   title: "label"
 }, (props, field) => {
-  var _a;
   const feedback = !isVoidField(field) ? field.selfErrors.length ? field.selfErrors.join(",") : void 0 : void 0;
   return {
     ...props,
     required: isVoidField(field) ? void 0 : field.required,
     class: "form-render__formItem",
     style: {
-      "--form-item-column": (_a = props.span) != null ? _a : 3
+      "--form-item-column": props.span
     },
     feedback,
     "validation-status": feedback ? "error" : void 0

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

@@ -2,7 +2,7 @@ import { connect, mapProps } from '@formily/vue';
 import { NInputGroup } from 'naive-ui';
 
 const INPUT_GROUP = connect(NInputGroup, mapProps((props) => {
-  return { style: { "--column": props.span || 3 }, class: "form-render__inputGroup" };
+  return { style: { "--column": props.span }, class: "form-render__inputGroup" };
 }));
 
 export { INPUT_GROUP };

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

@@ -72,12 +72,12 @@ const script = defineComponent({
         try {
           traverseDependKey(config.dependKey, (dependKey, valueKey2, required) => {
             const _field = field2.query(dependKey).take();
-            if (isField(_field)) {
-              if (required && _field.value == null) {
-                throw `\u7F3A\u5C11\u5FC5\u987B\u7684\u53C2\u6570=>${dependKey}`;
-              }
-              _params[valueKey2] = _field.value;
+            if (!isField(_field))
+              return;
+            if (required && _field.value == null) {
+              throw `\u7F3A\u5C11\u5FC5\u987B\u7684\u53C2\u6570=>${dependKey}`;
             }
+            _params[valueKey2] = _field.value;
           });
         } catch (e) {
           return Promise.reject(e);
@@ -105,11 +105,14 @@ const script = defineComponent({
       }
     });
     const changeContextCollector = inject(InjectionChangeContextCollector);
-    changeContextCollector == null ? void 0 : changeContextCollector.setContext(fieldKey.value, async () => {
+    changeContextCollector.setContext(fieldKey.value, async () => {
       await nextTick();
       return {
-        currentOption: cloneDeep(parsedOptions.value.find((option) => option[valueKey.value] === valueRef.value))
+        currentOption: cloneDeep(getCurrentOption())
       };
+      function getCurrentOption() {
+        return parsedOptions.value.find((option) => option[valueKey.value] === valueRef.value);
+      }
     });
     const formItemDepsCollector = inject(InjectionFormItemDepsCollector);
     watch(() => props.urlConfig, (config, oldConfig) => {
@@ -120,7 +123,7 @@ const script = defineComponent({
         return;
       formItemDepsCollector.setDeps(fieldKey.value, config.dependKey || [], async () => {
         remoteOptions.value = null;
-        emit("update:value", null);
+        valueRef.value = null;
         !props.lazyRequest && await fetchData();
       });
       (valueRef.value || !props.lazyRequest) && fetchData();

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

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

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

@@ -4,7 +4,7 @@ export * from './useCommonLog';
 export * from './useFormField';
 export * from './useAsyncQueue';
 export * from './useFieldVisitor';
-export * from './useTypeNormalize';
+export * from './useFieldNormalize';
 export * from './useFormValidator';
 export * from './useBusinessBinding';
 export * from './useChangeContext';

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

@@ -4,7 +4,7 @@ export { useCommonLog } from './useCommonLog.js';
 export { useFormField } from './useFormField.js';
 export { AsyncQueue, useAsyncQueue } from './useAsyncQueue.js';
 export { useFieldVisitor } from './useFieldVisitor.js';
-export { useTypeNormalize } from './useTypeNormalize.js';
+export { useFieldNormalize } from './useFieldNormalize.js';
 export { useFormValidator } from './useFormValidator.js';
 export { BusinessCollector, useBusinessBinding } from './useBusinessBinding.js';
 export { ContextCollector, useChangeContext } from './useChangeContext.js';

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

@@ -1,8 +1,8 @@
-import { WithUndefined } from '../../../../../es/src/types';
+import { UndefinedAble } from '../../../../../es/src/types';
 import { ISchema } from '@formily/json-schema/esm/types';
 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): {
+export declare function useAnchor(props: Readonly<FormRenderProps>, scrollbarRef: Ref<UndefinedAble<HTMLElement>>, collector: FormItemDepsCollector): {
     currentAnchor: import("vue").WritableComputedRef<string>;
     onScroll: () => void;
     formHeight: import("vue").ComputedRef<string | undefined>;
@@ -11,6 +11,6 @@ export declare function useAnchor(props: Readonly<FormRenderProps>, scrollbarRef
         title: string;
     }[]>;
     generateAnchorList: (schema: ISchema) => void;
-    scrollbarRef: Ref<WithUndefined<HTMLElement>>;
+    scrollbarRef: Ref<UndefinedAble<HTMLElement>>;
     scrollTo: (id: string) => Promise<void>;
 };

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

@@ -1,8 +1,8 @@
-import { AnyObject, WithUndefined } from '../../../../../es/src/types';
+import { AnyObject, UndefinedAble } from '../../../../../es/src/types';
 import { FormAsyncQueueItem } from '../types';
 declare type ProcessorOption = Partial<{
     afterRequest(key: string, payload?: unknown): AnyObject[];
-    beforeRequest(key: string, params?: unknown): WithUndefined<AnyObject> | void;
+    beforeRequest(key: string, params?: unknown): UndefinedAble<AnyObject> | void;
 }>;
 interface EntryCallback {
     (err?: any, result?: any): void;

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

@@ -12,12 +12,11 @@ export declare class BusinessCollector {
     private getField;
     private getType;
     private getValueByField;
-    private getValueByType;
-    private setValueByType;
-    private handlerIdCardType;
-    private handlerBirthdayType;
-    private handlerAgeType;
-    private handlerChangeMap;
+    getValueByType(type: FIELD_BUSINESS_TYPE): unknown;
+    setValueByType(type: FIELD_BUSINESS_TYPE, value: unknown, force?: boolean): void;
+    registerChangeBusiness(type: FIELD_BUSINESS_TYPE, handler: () => void): this;
+    registerBlurBusiness(type: FIELD_BUSINESS_TYPE, handler: () => void): this;
+    private changeHandlerMap;
     private blurHandlerMap;
     trigger(fieldName: string, triggerType?: 'change' | 'blur'): void;
 }

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

@@ -10,14 +10,8 @@ class BusinessCollector {
     this.businessFormatter = businessFormatter;
     this.typeCollector = /* @__PURE__ */ new Map();
     this.fieldNameCollector = /* @__PURE__ */ new Map();
-    this.handlerChangeMap = /* @__PURE__ */ new Map([
-      [FIELD_BUSINESS_TYPE.ID_CARD, this.handlerIdCardType.bind(this)],
-      [FIELD_BUSINESS_TYPE.AGE_UNIT, this.handlerAgeType.bind(this)]
-    ]);
-    this.blurHandlerMap = /* @__PURE__ */ new Map([
-      [FIELD_BUSINESS_TYPE.BIRTHDAY, this.handlerBirthdayType.bind(this)],
-      [FIELD_BUSINESS_TYPE.AGE, this.handlerAgeType.bind(this)]
-    ]);
+    this.changeHandlerMap = /* @__PURE__ */ new Map([]);
+    this.blurHandlerMap = /* @__PURE__ */ new Map([]);
   }
   formatter(...args) {
     return isFunction(this.businessFormatter) ? this.businessFormatter(...args) : args[0].value;
@@ -48,7 +42,23 @@ class BusinessCollector {
       state.value = this.formatter({ value, type, fieldKey: field });
     });
   }
-  handlerIdCardType() {
+  registerChangeBusiness(type, handler) {
+    this.changeHandlerMap.set(type, handler);
+    return this;
+  }
+  registerBlurBusiness(type, handler) {
+    this.blurHandlerMap.set(type, handler);
+    return this;
+  }
+  trigger(fieldName, triggerType = "change") {
+    var _a, _b;
+    const type = this.getType(fieldName);
+    const handlerMaps = { change: this.changeHandlerMap, blur: this.blurHandlerMap };
+    type && ((_b = (_a = handlerMaps[triggerType]) == null ? void 0 : _a.get(type)) == null ? void 0 : _b.call(this));
+  }
+}
+function useBusinessBinding() {
+  function handlerIdCardType() {
     const idCard = this.getValueByType(FIELD_BUSINESS_TYPE.ID_CARD);
     if (!idCard || !isString(idCard) || !isIdCard(idCard))
       return;
@@ -59,7 +69,7 @@ class BusinessCollector {
     this.setValueByType(FIELD_BUSINESS_TYPE.SEX, info.sex);
     this.setValueByType(FIELD_BUSINESS_TYPE.BIRTHDAY, info.birthday);
   }
-  handlerBirthdayType() {
+  function handlerBirthdayType() {
     const birthday = this.getValueByType(FIELD_BUSINESS_TYPE.BIRTHDAY);
     if (!isString(birthday))
       return;
@@ -67,7 +77,7 @@ class BusinessCollector {
     this.setValueByType(FIELD_BUSINESS_TYPE.AGE_UNIT, ageUnit);
     this.setValueByType(FIELD_BUSINESS_TYPE.AGE, age);
   }
-  handlerAgeType() {
+  function handlerAgeType() {
     const age = this.getValueByType(FIELD_BUSINESS_TYPE.AGE);
     const ageUnit = this.getValueByType(FIELD_BUSINESS_TYPE.AGE_UNIT);
     if (!isString(age) && !isNumber(age) || age === "")
@@ -76,16 +86,8 @@ class BusinessCollector {
       return;
     this.setValueByType(FIELD_BUSINESS_TYPE.BIRTHDAY, parseAge2Birthday(+age, ageUnit), false);
   }
-  trigger(fieldName, triggerType = "change") {
-    var _a;
-    const type = this.getType(fieldName);
-    const handler = triggerType === "change" ? this.handlerChangeMap : triggerType === "blur" ? this.blurHandlerMap : null;
-    type && ((_a = handler == null ? void 0 : handler.get(type)) == null ? void 0 : _a());
-  }
-}
-function useBusinessBinding() {
   function create(formModel, formatter) {
-    return new BusinessCollector(formModel, formatter);
+    return new BusinessCollector(formModel, formatter).registerChangeBusiness(FIELD_BUSINESS_TYPE.ID_CARD, handlerIdCardType).registerChangeBusiness(FIELD_BUSINESS_TYPE.AGE_UNIT, handlerAgeType).registerBlurBusiness(FIELD_BUSINESS_TYPE.BIRTHDAY, handlerBirthdayType).registerBlurBusiness(FIELD_BUSINESS_TYPE.AGE, handlerAgeType);
   }
   return { create };
 }

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

@@ -1,6 +1,6 @@
 import { isObject } from '@vueuse/core';
-import { pick } from 'lodash-es';
-import { useFormValidator, useTypeNormalize } from '../../../../packages/form-render';
+import { cloneDeep, pick } from 'lodash-es';
+import { useFormValidator, useFieldNormalize } from '../../../../packages/form-render';
 import { arrayed, parseNumberFromMaybeString, formRenderLog } from '../utils/index.js';
 import { fieldKeyEscape, createLinebarId } from '../utils/schema.js';
 import { transformDateFormat } from '../utils/business.js';
@@ -208,12 +208,12 @@ function useFieldListAdaptor(collector) {
       properties: schemaAdaptor(fieldList)
     };
   };
-  const { normalize } = useTypeNormalize();
+  const { FieldNormalizeWaterfallHook } = useFieldNormalize();
   function schemaAdaptor(fieldList) {
     let prevLinebar = null;
     return fieldList.reduce((fin, cur, idx) => {
       var _a;
-      normalize(cur);
+      cur = FieldNormalizeWaterfallHook.call(cloneDeep(cur));
       const obj_type = (_a = cur.validate) == null ? void 0 : _a.obj_type;
       obj_type && collector.collect(obj_type, cur.val_key);
       if (cur.html_type === "LINEBAR") {

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

@@ -0,0 +1,5 @@
+import { SyncWaterfallHook } from '../../../../../es/src/utils/tapable';
+import { FieldItem } from '../types';
+export declare function useFieldNormalize(): {
+    FieldNormalizeWaterfallHook: SyncWaterfallHook<FieldItem, import("../../../../../es/src/utils/tapable").UnsetAdditionalOptions>;
+};

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

@@ -0,0 +1,58 @@
+import { SyncWaterfallHook } from '../../../../src/utils/tapable';
+import { FIELD_BUSINESS_TYPE } from '../../../../packages/form-render/src/constants';
+
+function useFieldNormalize() {
+  const FieldNormalizeWaterfallHook = new SyncWaterfallHook(["fieldItem"]);
+  FieldNormalizeWaterfallHook.tap("__block", (fieldItem) => {
+    if (["CHECKBOX_BLOCK", "RADIO_BLOCK"].includes(fieldItem.html_type)) {
+      fieldItem.__vertical = true;
+    }
+    return fieldItem;
+  });
+  FieldNormalizeWaterfallHook.tap("__line", (fieldItem) => {
+    if (["LINE_BREAKS"].includes(fieldItem.html_type)) {
+      fieldItem.__line = true;
+      fieldItem.is_show = "1";
+    }
+    return fieldItem;
+  });
+  FieldNormalizeWaterfallHook.tap("__age", (fieldItem) => {
+    if (fieldItem.html_type === "AGE") {
+      fieldItem.html_type = "INPUT_NUMBER";
+      fieldItem.suffixConfig = [
+        {
+          validate: { obj_type: FIELD_BUSINESS_TYPE.AGE_UNIT },
+          val_key: fieldItem.val_key_unit,
+          html_type: "SELECT",
+          option: fieldItem.option,
+          urlConfig: fieldItem.urlConfig
+        }
+      ];
+    }
+    return fieldItem;
+  });
+  const types = [
+    [["SEARCH", "PHONE_TYPE", "IDCARD_TYPE"], "SELECT"],
+    ["DIGITAL", "INPUT_NUMBER"],
+    ["CHECKBOX_BLOCK", "CHECKBOX"],
+    ["RADIO_BLOCK", "RADIO"],
+    [["DATE-INPUT", "DATETIME-INPUT"], "DATE"],
+    ["SWITCH_COMPONENT", "SWITCH"],
+    ["SLIDER_COMPONENT", "SLIDER"],
+    ["LINE_BREAKS", "LINEBAR"]
+  ];
+  FieldNormalizeWaterfallHook.tap("__normalize", (fieldItem) => {
+    types.some(([rule, target]) => {
+      const match = Array.isArray(rule) ? rule.includes(fieldItem.html_type) : rule === fieldItem.html_type;
+      return match && (fieldItem.html_type = target);
+    });
+    return fieldItem;
+  });
+  FieldNormalizeWaterfallHook.tap("__elem_width", (fieldItem) => {
+    fieldItem.elem_width = ~~((fieldItem.elem_width || 3) * 2);
+    return fieldItem;
+  });
+  return { FieldNormalizeWaterfallHook };
+}
+
+export { useFieldNormalize };

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

@@ -3,8 +3,6 @@ import { isFunction } from '@vueuse/core';
 
 function useFieldVisitor() {
   function traverse(fieldList, visitorMap, key = "val_key") {
-    if (!visitorMap)
-      return fieldList;
     return fieldList.reduce((fin, field) => {
       if (Array.isArray(field.children)) {
         field.children = traverse(field.children, visitorMap, key);
@@ -15,7 +13,7 @@ function useFieldVisitor() {
       if (field.suffixConfig) {
         field.suffixConfig = traverse(arrayed(field.suffixConfig), visitorMap, key);
       }
-      const visitor = visitorMap[field[key]];
+      const visitor = visitorMap == null ? void 0 : visitorMap[field[key]];
       let current = field;
       const before = [];
       const after = [];
@@ -31,8 +29,7 @@ function useFieldVisitor() {
           after.push(...arrayed(field2));
         }
       });
-      fin.push(...before, current, ...after);
-      return fin;
+      return fin.concat([...before, current, ...after]);
     }, []);
   }
   return { traverse };

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

@@ -1,13 +1,13 @@
-import { WithUndefined } from '../../../../../es/src/types';
+import { UndefinedAble } 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(fieldKey: string, params?: import("../../../../../es/src/types").AnyObject | undefined): void | WithUndefined<import("../../../../../es/src/types").AnyObject>;
+        beforeRequest(fieldKey: string, params?: import("../../../../../es/src/types").AnyObject | undefined): void | UndefinedAble<import("../../../../../es/src/types").AnyObject>;
         afterRequest(fieldKey: string, payload?: any): import("../../../../../es/src/types").AnyObject[];
-    }>>[T]> | undefined) => WithUndefined<ReturnType<Required<Partial<{
+    }>>[T]> | undefined) => UndefinedAble<ReturnType<Required<Partial<{
         onSetup(): void;
-        beforeRequest(fieldKey: string, params?: import("../../../../../es/src/types").AnyObject | undefined): void | WithUndefined<import("../../../../../es/src/types").AnyObject>;
+        beforeRequest(fieldKey: string, params?: import("../../../../../es/src/types").AnyObject | undefined): void | UndefinedAble<import("../../../../../es/src/types").AnyObject>;
         afterRequest(fieldKey: string, payload?: any): import("../../../../../es/src/types").AnyObject[];
     }>>[T]>>;
 };

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

@@ -1,7 +1,7 @@
-import { Func, WithNull } from '../../../../../es/src/types';
+import { Func, Nullable } from '../../../../../es/src/types';
 declare type RequestInstance = Record<string, Func>;
 export declare function useFormRequest(): {
-    getHttpInstance: () => WithNull<RequestInstance>;
+    getHttpInstance: () => Nullable<RequestInstance>;
     registGlobHttpInstance: (instance: RequestInstance) => void;
 };
 export {};

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

@@ -1,4 +1,4 @@
-import { AnyObject, WithUndefined } from '../../../../../es/src/types';
+import { AnyObject, UndefinedAble } from '../../../../../es/src/types';
 import { DataField, Field } from '@formily/core';
 import { ISchema } from '@formily/json-schema/esm/types';
 import { Component, FunctionalComponent } from 'vue';
@@ -52,7 +52,7 @@ export declare type DependKeyType = string | Record<string, string> | Array<{
 } | string>;
 export declare type FormRenderLifeCycle = Partial<{
     onSetup(): void;
-    beforeRequest(fieldKey: string, params?: AnyObject): WithUndefined<AnyObject> | void;
+    beforeRequest(fieldKey: string, params?: AnyObject): UndefinedAble<AnyObject> | void;
     afterRequest(fieldKey: string, payload?: any): AnyObject[];
 }>;
 export declare type FormRenderProps = Partial<{

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

@@ -1,6 +1,6 @@
-import { WithNull } from '../../../../../es/src/types';
+import { Nullable } from '../../../../../es/src/types';
 export declare function queryDecorator(key: string, wrapperElement: HTMLElement, formUUID: string): HTMLElement | null;
-export declare function queryInput(decoratorElement?: WithNull<HTMLElement>): {
+export declare function queryInput(decoratorElement?: Nullable<HTMLElement>): {
     widgetElement: HTMLInputElement | null | undefined;
     widgetElementList: HTMLInputElement[];
 };

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

@@ -1,4 +1,4 @@
-import { AnyObject, WithNull } from '../../../../../es/src/types';
+import { AnyObject } from '../../../../../es/src/types';
 import { GeneralField } from '@formily/core';
 import { ISchema } from '@formily/json-schema/esm/types';
 import { DependKeyType, FieldItem } from '../../../../../es/packages/form-render';
@@ -9,7 +9,7 @@ export declare function createLinebarId(id: string): string;
 export declare function traverseDependKey(dependKeys: DependKeyType, handler: {
     (dependKey: string, valueKey: string, required?: boolean): void;
 }): void;
-export declare function getParentLinebar(key: string, fieldList: FieldItem[]): WithNull<string>;
+export declare function getParentLinebar(key: string, fieldList: FieldItem[]): string | null;
 export declare function assignUpdateValue(props: AnyObject, field: GeneralField): {
     [x: string]: any;
 };

package/es/packages/index.js

@@ -46,7 +46,7 @@ export { useCommonLog } from './form-render/src/hooks/useCommonLog.js';
 export { useFormField } from './form-render/src/hooks/useFormField.js';
 export { AsyncQueue, useAsyncQueue } from './form-render/src/hooks/useAsyncQueue.js';
 export { useFieldVisitor } from './form-render/src/hooks/useFieldVisitor.js';
-export { useTypeNormalize } from './form-render/src/hooks/useTypeNormalize.js';
+export { useFieldNormalize } from './form-render/src/hooks/useFieldNormalize.js';
 export { useFormValidator } from './form-render/src/hooks/useFormValidator.js';
 export { BusinessCollector, useBusinessBinding } from './form-render/src/hooks/useBusinessBinding.js';
 export { ContextCollector, useChangeContext } from './form-render/src/hooks/useChangeContext.js';

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

@@ -1808,7 +1808,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
         lifeCycle: {
             type: import("vue").PropType<Partial<{
                 onSetup(): void;
-                beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject>;
+                beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").UndefinedAble<import("../../../es/src/types").AnyObject>;
                 afterRequest(fieldKey: string, payload?: any): import("../../../es/src/types").AnyObject[];
             }>>;
         };
@@ -1923,7 +1923,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
             lifeCycle: {
                 type: import("vue").PropType<Partial<{
                     onSetup(): void;
-                    beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject>;
+                    beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").UndefinedAble<import("../../../es/src/types").AnyObject>;
                     afterRequest(fieldKey: string, payload?: any): import("../../../es/src/types").AnyObject[];
                 }>>;
             };
@@ -3425,7 +3425,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
         lifeCycle: {
             type: import("vue").PropType<Partial<{
                 onSetup(): void;
-                beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject>;
+                beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").UndefinedAble<import("../../../es/src/types").AnyObject>;
                 afterRequest(fieldKey: string, payload?: any): import("../../../es/src/types").AnyObject[];
             }>>;
         };

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

@@ -1810,7 +1810,7 @@ declare const _default: import("vue").DefineComponent<{
         lifeCycle: {
             type: import("vue").PropType<Partial<{
                 onSetup(): void;
-                beforeRequest(fieldKey: string, params?: import("../../../../es/src/types").AnyObject | undefined): void | import("../../../../es/src/types").WithUndefined<import("../../../../es/src/types").AnyObject>;
+                beforeRequest(fieldKey: string, params?: import("../../../../es/src/types").AnyObject | undefined): void | import("../../../../es/src/types").UndefinedAble<import("../../../../es/src/types").AnyObject>;
                 afterRequest(fieldKey: string, payload?: any): import("../../../../es/src/types").AnyObject[];
             }>>;
         };
@@ -1925,7 +1925,7 @@ declare const _default: import("vue").DefineComponent<{
             lifeCycle: {
                 type: import("vue").PropType<Partial<{
                     onSetup(): void;
-                    beforeRequest(fieldKey: string, params?: import("../../../../es/src/types").AnyObject | undefined): void | import("../../../../es/src/types").WithUndefined<import("../../../../es/src/types").AnyObject>;
+                    beforeRequest(fieldKey: string, params?: import("../../../../es/src/types").AnyObject | undefined): void | import("../../../../es/src/types").UndefinedAble<import("../../../../es/src/types").AnyObject>;
                     afterRequest(fieldKey: string, payload?: any): import("../../../../es/src/types").AnyObject[];
                 }>>;
             };
@@ -3427,7 +3427,7 @@ declare const _default: import("vue").DefineComponent<{
         lifeCycle: {
             type: import("vue").PropType<Partial<{
                 onSetup(): void;
-                beforeRequest(fieldKey: string, params?: import("../../../../es/src/types").AnyObject | undefined): void | import("../../../../es/src/types").WithUndefined<import("../../../../es/src/types").AnyObject>;
+                beforeRequest(fieldKey: string, params?: import("../../../../es/src/types").AnyObject | undefined): void | import("../../../../es/src/types").UndefinedAble<import("../../../../es/src/types").AnyObject>;
                 afterRequest(fieldKey: string, payload?: any): import("../../../../es/src/types").AnyObject[];
             }>>;
         };

package/es/src/types/index.d.ts

@@ -4,7 +4,7 @@ export declare type SFCWithInstall<T> = T & {
 };
 export declare type AnyObject = Record<string, any>;
 export declare type Func<T extends Array<any> = any[], P = any> = (...args: T) => P;
-export declare type WithNull<T> = T | null;
-export declare type WithUndefined<T> = T | undefined;
+export declare type Nullable<T> = T | null | undefined;
+export declare type UndefinedAble<T> = T | undefined;
 export declare type ArrayAble<T> = T | T[];
 export declare type MapValue<T> = T extends Map<any, infer P> ? P : any;