cnhis-design-vue 3.1.18-beta.6 → 3.1.18-beta.9

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

@@ -1,10 +1 @@
-import { formRenderLog } from '../utils/index.js';
-
-function useCommonLog() {
-  function invalidHttpInstanceLog() {
-    formRenderLog("before use http feature, you should regist http instance by useFormilyRequest.registGlobHttpInstance()", "warn");
-  }
-  return { invalidHttpInstanceLog };
-}
-
-export { useCommonLog };
+export { useCommonLog } from './useCommonLog2.js';

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

@@ -0,0 +1,10 @@
+import { formRenderLog } from '../utils/index.js';
+
+function useCommonLog() {
+  function invalidHttpInstanceLog() {
+    formRenderLog("before use http feature, you should regist http instance by useFormilyRequest.registGlobHttpInstance()");
+  }
+  return { invalidHttpInstanceLog };
+}
+
+export { useCommonLog };

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

@@ -1,243 +1 @@
-import { isObject } from '@vueuse/core';
-import { cloneDeep, omit, pick } from 'lodash-es';
-import '../../index.js';
-import { arrayed, parseNumberFromMaybeString, formRenderLog } from '../utils/index.js';
-import { useFieldNormalize } from './useFieldNormalize.js';
-import { fieldKeyEscape, createLinebarId } from '../utils/schema.js';
-import { transformDateFormat } from '../utils/business.js';
-import { useFormValidator } from './useFormValidator.js';
-
-function useFieldListAdaptor(collector) {
-  const { createValidatorSchema } = useFormValidator();
-  const createStandardSchema = (item) => {
-    var _a;
-    const result = {
-      name: item.val_key,
-      type: (_a = item.fieldType) != null ? _a : "string",
-      title: item.alias || item.name,
-      "x-component": item.html_type,
-      default: item.default_val,
-      "x-component-props": {
-        placeholder: item.placeholder,
-        clearable: item.is_empty === "0",
-        ...item.componentProps || {},
-        onBlur(...args) {
-          var _a2, _b;
-          collector.trigger(item.val_key, "blur");
-          (_b = (_a2 = item.componentProps) == null ? void 0 : _a2.onBlur) == null ? void 0 : _b.call(_a2, ...args);
-        }
-      },
-      "x-display": item.is_show === "0" ? "hidden" : "visible",
-      "x-pattern": item.is_edit === "0" ? "disabled" : "editable"
-    };
-    if (isObject(item.reactions)) {
-      result["x-reactions"] = item.reactions;
-    }
-    if (!item.noDecorator) {
-      Object.assign(result, {
-        "x-decorator": "FORM_ITEM",
-        "x-decorator-props": {
-          span: item.elem_width,
-          showLabel: item.hide_title !== "1",
-          propertyKey: item.val_key,
-          annotation: item.annotation,
-          ...item.decoratorProps || {}
-        }
-      });
-    }
-    const rules = createValidatorSchema(item);
-    rules && (result["x-validator"] = rules);
-    item.is_null === "0" && (result.required = true);
-    return result;
-  };
-  const createInputSchema = (item) => {
-    const schema = createStandardSchema(item);
-    Object.assign(schema["x-component-props"], {
-      ...pick(item, ["prefix", "suffix"])
-    });
-    return schema;
-  };
-  const createSelectSchema = (item) => {
-    const schema = createStandardSchema(item);
-    Object.assign(schema["x-component-props"], {
-      ...pick(item, ["lazyRequest", "urlConfig"]),
-      options: item.option,
-      multiple: item.multi_select === "0",
-      maxTagCount: parseNumberFromMaybeString(item.multi_select_value)
-    });
-    return schema;
-  };
-  const createRadioSchema = (item) => {
-    const schema = createStandardSchema(item);
-    Object.assign(schema["x-component-props"], {
-      options: item.option,
-      vertical: item.__vertical
-    });
-    return schema;
-  };
-  const createDateSchema = (item) => {
-    const schema = createStandardSchema(item);
-    Object.assign(schema["x-component-props"], {
-      valueFormat: item.date_format,
-      type: transformDateFormat(item.date_format),
-      validate: item.validate
-    });
-    return schema;
-  };
-  const createCascaderSchema = (item) => {
-    var _a;
-    const schema = createStandardSchema(item);
-    Object.assign(schema["x-component-props"], {
-      urlConfig: item.urlConfig,
-      depth: (_a = item.wordbook) == null ? void 0 : _a.level_num,
-      options: item.option
-    });
-    return schema;
-  };
-  const createSwitchSchema = (item) => {
-    const schema = createStandardSchema(item);
-    Object.assign(schema["x-component-props"], {
-      openDescription: item.open,
-      closeDescription: item.close
-    });
-    return schema;
-  };
-  const createCombinationSchema = (item) => {
-    const schema = createStandardSchema(item);
-    schema.type = "array";
-    if (item.jsonCombination !== false) {
-      schema["x-component"] = "JSON_COMBINATION";
-    }
-    Object.assign(schema["x-decorator-props"], {
-      showLabel: false,
-      showFeedback: false
-    });
-    Object.assign(schema["x-component-props"], {
-      title: item.alias || item.name,
-      maxGroupNum: item.maxGroupNum,
-      getProperties: () => item.children || []
-    });
-    return schema;
-  };
-  const createInputNumberSchema = (item) => {
-    const schema = createStandardSchema(item);
-    const { decimal_length, validate } = item;
-    Object.assign(schema["x-component-props"], {
-      precision: decimal_length || (validate == null ? void 0 : validate.decimal_length),
-      prefix: item.prefix,
-      suffix: item.suffix
-    });
-    return schema;
-  };
-  const createSliderSchema = (item) => {
-    const schema = createStandardSchema(item);
-    Object.assign(schema["x-component-props"], {
-      step: parseNumberFromMaybeString(item.step_length),
-      max: parseNumberFromMaybeString(item.max_length),
-      min: parseNumberFromMaybeString(item.min_length),
-      option: item.option
-    });
-    return schema;
-  };
-  const createCustomSchema = (item) => {
-    const schema = createStandardSchema(item);
-    Object.assign(schema["x-component-props"], {
-      fieldItem: omit(item, ["reactions"])
-    });
-    return schema;
-  };
-  const createLinebarSchema = (item) => {
-    return {
-      name: item.val_key,
-      type: "void",
-      title: item.alias || item.name,
-      "x-component": "LINEBAR",
-      "x-component-props": {
-        line: item.__line,
-        disabled: item.is_not_fold === "1",
-        id: createLinebarId(item.val_key),
-        show: item.is_show !== "0"
-      }
-    };
-  };
-  const createComplexSchema = (item) => {
-    const schema = createStandardSchema(item);
-    if (Array.isArray(item.properties)) {
-      formRenderLog("COMPLEX\u63A7\u4EF6\u7684properties\u5C5E\u6027\u5DF2\u7ECF\u5E9F\u5F03, \u8BF7\u4F7F\u7528children\u4F5C\u4E3A\u66FF\u4EE3, \u5728\u4E4B\u540E\u7684\u7248\u672C\u4E2Dproperties\u5C5E\u6027\u5C06\u4E0D\u518D\u652F\u6301", "warn");
-    }
-    const properties = Array.isArray(item.properties || item.children) ? schemaAdaptor(item.properties || item.children) : {};
-    schema.type = item.fieldType || "void";
-    schema.properties = properties;
-    Object.assign(schema["x-decorator-props"], { showFeedback: false });
-    Object.assign(schema["x-component-props"], pick(item, ["wrapperStyle", "display"]));
-    return schema;
-  };
-  const creatorMap = /* @__PURE__ */ new Map([
-    ["LINEBAR", createLinebarSchema],
-    ["INPUT", createInputSchema],
-    ["INPUT_NUMBER", createInputNumberSchema],
-    ["SELECT", createSelectSchema],
-    ["DATE", createDateSchema],
-    ["SEARCH_CASCADE", createCascaderSchema],
-    ["COMBINATION", createCombinationSchema],
-    ["RADIO", createRadioSchema],
-    ["CHECKBOX", createRadioSchema],
-    ["SWITCH", createSwitchSchema],
-    ["SLIDER", createSliderSchema],
-    ["COMPLEX", createComplexSchema]
-  ]);
-  const createWidgetSchema = (item) => {
-    if (item.suffixConfig)
-      return createWidgetCombinationSchema(item);
-    const creator = creatorMap.get(item.html_type) || createCustomSchema;
-    return creator(item);
-  };
-  const createWidgetCombinationSchema = (item) => {
-    if (!item.suffixConfig)
-      return createWidgetSchema(item);
-    const suffixList = arrayed(item.suffixConfig);
-    const fieldList = [{ ...item, suffixConfig: void 0 }].concat(suffixList.map((suffix) => {
-      return { ...suffix, is_show: item.is_show, alias: " " };
-    }));
-    return {
-      type: "void",
-      name: fieldKeyEscape(fieldList),
-      title: item.alias || item.name,
-      "x-component": "INPUT_GROUP",
-      "x-component-props": { span: item.elem_width },
-      properties: schemaAdaptor(fieldList)
-    };
-  };
-  const { FieldNormalizeWaterfallHook } = useFieldNormalize();
-  function schemaAdaptor(fieldList) {
-    let prevLinebar = null;
-    return fieldList.reduce((fin, cur, idx) => {
-      var _a;
-      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") {
-        fin[createFieldName(cur)] = bindIndex(createLinebarSchema(cur), idx);
-        prevLinebar = fin[createFieldName(cur)].properties = {};
-      } else if (prevLinebar) {
-        prevLinebar[createFieldName(cur)] = bindIndex(createWidgetSchema(cur), idx);
-      } else {
-        prevLinebar = null;
-        fin[createFieldName(cur)] = bindIndex(createWidgetSchema(cur), idx);
-      }
-      return fin;
-    }, {});
-    function bindIndex(schema, idx) {
-      return { ...schema, "x-index": idx };
-    }
-    function createFieldName(fieldItem) {
-      if (fieldItem.suffixConfig) {
-        return fieldKeyEscape([fieldItem, ...arrayed(fieldItem.suffixConfig)]);
-      }
-      return fieldItem.val_key;
-    }
-  }
-  return { schemaAdaptor };
-}
-
-export { useFieldListAdaptor };
+export { useFieldListAdaptor } from './useFieldListAdaptor2.js';

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

@@ -0,0 +1,243 @@
+import { isObject } from '@vueuse/core';
+import { cloneDeep, omit, pick } from 'lodash-es';
+import '../../index2.js';
+import { arrayed, parseNumberFromMaybeString, formRenderLog } from '../utils/index.js';
+import { useFieldNormalize } from './useFieldNormalize2.js';
+import { fieldKeyEscape, createLinebarId } from '../utils/schema2.js';
+import { transformDateFormat } from '../utils/business2.js';
+import { useFormValidator } from './useFormValidator2.js';
+
+function useFieldListAdaptor(collector) {
+  const { createValidatorSchema } = useFormValidator();
+  const createStandardSchema = (item) => {
+    var _a;
+    const result = {
+      name: item.val_key,
+      type: (_a = item.fieldType) != null ? _a : "string",
+      title: item.alias || item.name,
+      "x-component": item.html_type,
+      default: item.default_val,
+      "x-component-props": {
+        placeholder: item.placeholder,
+        clearable: item.is_empty === "0",
+        ...item.componentProps || {},
+        onBlur(...args) {
+          var _a2, _b;
+          collector.trigger(item.val_key, "blur");
+          (_b = (_a2 = item.componentProps) == null ? void 0 : _a2.onBlur) == null ? void 0 : _b.call(_a2, ...args);
+        }
+      },
+      "x-display": item.is_show === "0" ? "hidden" : "visible",
+      "x-pattern": item.is_edit === "0" ? "disabled" : "editable"
+    };
+    if (isObject(item.reactions)) {
+      result["x-reactions"] = item.reactions;
+    }
+    if (!item.noDecorator) {
+      Object.assign(result, {
+        "x-decorator": "FORM_ITEM",
+        "x-decorator-props": {
+          span: item.elem_width,
+          showLabel: item.hide_title !== "1",
+          propertyKey: item.val_key,
+          annotation: item.annotation,
+          ...item.decoratorProps || {}
+        }
+      });
+    }
+    const rules = createValidatorSchema(item);
+    rules && (result["x-validator"] = rules);
+    item.is_null === "0" && (result.required = true);
+    return result;
+  };
+  const createInputSchema = (item) => {
+    const schema = createStandardSchema(item);
+    Object.assign(schema["x-component-props"], {
+      ...pick(item, ["prefix", "suffix"])
+    });
+    return schema;
+  };
+  const createSelectSchema = (item) => {
+    const schema = createStandardSchema(item);
+    Object.assign(schema["x-component-props"], {
+      ...pick(item, ["lazyRequest", "urlConfig"]),
+      options: item.option,
+      multiple: item.multi_select === "0",
+      maxTagCount: parseNumberFromMaybeString(item.multi_select_value)
+    });
+    return schema;
+  };
+  const createRadioSchema = (item) => {
+    const schema = createStandardSchema(item);
+    Object.assign(schema["x-component-props"], {
+      options: item.option,
+      vertical: item.__vertical
+    });
+    return schema;
+  };
+  const createDateSchema = (item) => {
+    const schema = createStandardSchema(item);
+    Object.assign(schema["x-component-props"], {
+      valueFormat: item.date_format,
+      type: transformDateFormat(item.date_format),
+      validate: item.validate
+    });
+    return schema;
+  };
+  const createCascaderSchema = (item) => {
+    var _a;
+    const schema = createStandardSchema(item);
+    Object.assign(schema["x-component-props"], {
+      urlConfig: item.urlConfig,
+      depth: (_a = item.wordbook) == null ? void 0 : _a.level_num,
+      options: item.option
+    });
+    return schema;
+  };
+  const createSwitchSchema = (item) => {
+    const schema = createStandardSchema(item);
+    Object.assign(schema["x-component-props"], {
+      openDescription: item.open,
+      closeDescription: item.close
+    });
+    return schema;
+  };
+  const createCombinationSchema = (item) => {
+    const schema = createStandardSchema(item);
+    schema.type = "array";
+    if (item.jsonCombination !== false) {
+      schema["x-component"] = "JSON_COMBINATION";
+    }
+    Object.assign(schema["x-decorator-props"], {
+      showLabel: false,
+      showFeedback: false
+    });
+    Object.assign(schema["x-component-props"], {
+      title: item.alias || item.name,
+      maxGroupNum: item.maxGroupNum,
+      getProperties: () => item.children || []
+    });
+    return schema;
+  };
+  const createInputNumberSchema = (item) => {
+    const schema = createStandardSchema(item);
+    const { decimal_length, validate } = item;
+    Object.assign(schema["x-component-props"], {
+      precision: decimal_length || (validate == null ? void 0 : validate.decimal_length),
+      prefix: item.prefix,
+      suffix: item.suffix
+    });
+    return schema;
+  };
+  const createSliderSchema = (item) => {
+    const schema = createStandardSchema(item);
+    Object.assign(schema["x-component-props"], {
+      step: parseNumberFromMaybeString(item.step_length),
+      max: parseNumberFromMaybeString(item.max_length),
+      min: parseNumberFromMaybeString(item.min_length),
+      option: item.option
+    });
+    return schema;
+  };
+  const createCustomSchema = (item) => {
+    const schema = createStandardSchema(item);
+    Object.assign(schema["x-component-props"], {
+      fieldItem: omit(item, ["reactions"])
+    });
+    return schema;
+  };
+  const createLinebarSchema = (item) => {
+    return {
+      name: item.val_key,
+      type: "void",
+      title: item.alias || item.name,
+      "x-component": "LINEBAR",
+      "x-component-props": {
+        line: item.__line,
+        disabled: item.is_not_fold === "1",
+        id: createLinebarId(item.val_key),
+        show: item.is_show !== "0"
+      }
+    };
+  };
+  const createComplexSchema = (item) => {
+    const schema = createStandardSchema(item);
+    if (Array.isArray(item.properties)) {
+      formRenderLog("COMPLEX\u63A7\u4EF6\u7684properties\u5C5E\u6027\u5DF2\u7ECF\u5E9F\u5F03, \u8BF7\u4F7F\u7528children\u4F5C\u4E3A\u66FF\u4EE3, \u5728\u4E4B\u540E\u7684\u7248\u672C\u4E2Dproperties\u5C5E\u6027\u5C06\u4E0D\u518D\u652F\u6301");
+    }
+    const properties = Array.isArray(item.properties || item.children) ? schemaAdaptor(item.properties || item.children) : {};
+    schema.type = item.fieldType || "void";
+    schema.properties = properties;
+    Object.assign(schema["x-decorator-props"], { showFeedback: false });
+    Object.assign(schema["x-component-props"], pick(item, ["wrapperStyle", "display"]));
+    return schema;
+  };
+  const creatorMap = /* @__PURE__ */ new Map([
+    ["LINEBAR", createLinebarSchema],
+    ["INPUT", createInputSchema],
+    ["INPUT_NUMBER", createInputNumberSchema],
+    ["SELECT", createSelectSchema],
+    ["DATE", createDateSchema],
+    ["SEARCH_CASCADE", createCascaderSchema],
+    ["COMBINATION", createCombinationSchema],
+    ["RADIO", createRadioSchema],
+    ["CHECKBOX", createRadioSchema],
+    ["SWITCH", createSwitchSchema],
+    ["SLIDER", createSliderSchema],
+    ["COMPLEX", createComplexSchema]
+  ]);
+  const createWidgetSchema = (item) => {
+    if (item.suffixConfig)
+      return createWidgetCombinationSchema(item);
+    const creator = creatorMap.get(item.html_type) || createCustomSchema;
+    return creator(item);
+  };
+  const createWidgetCombinationSchema = (item) => {
+    if (!item.suffixConfig)
+      return createWidgetSchema(item);
+    const suffixList = arrayed(item.suffixConfig);
+    const fieldList = [{ ...item, suffixConfig: void 0 }].concat(suffixList.map((suffix) => {
+      return { ...suffix, is_show: item.is_show, alias: " " };
+    }));
+    return {
+      type: "void",
+      name: fieldKeyEscape(fieldList),
+      title: item.alias || item.name,
+      "x-component": "INPUT_GROUP",
+      "x-component-props": { span: item.elem_width },
+      properties: schemaAdaptor(fieldList)
+    };
+  };
+  const { FieldNormalizeWaterfallHook } = useFieldNormalize();
+  function schemaAdaptor(fieldList) {
+    let prevLinebar = null;
+    return fieldList.reduce((fin, cur, idx) => {
+      var _a;
+      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") {
+        fin[createFieldName(cur)] = bindIndex(createLinebarSchema(cur), idx);
+        prevLinebar = fin[createFieldName(cur)].properties = {};
+      } else if (prevLinebar) {
+        prevLinebar[createFieldName(cur)] = bindIndex(createWidgetSchema(cur), idx);
+      } else {
+        prevLinebar = null;
+        fin[createFieldName(cur)] = bindIndex(createWidgetSchema(cur), idx);
+      }
+      return fin;
+    }, {});
+    function bindIndex(schema, idx) {
+      return { ...schema, "x-index": idx };
+    }
+    function createFieldName(fieldItem) {
+      if (fieldItem.suffixConfig) {
+        return fieldKeyEscape([fieldItem, ...arrayed(fieldItem.suffixConfig)]);
+      }
+      return fieldItem.val_key;
+    }
+  }
+  return { schemaAdaptor };
+}
+
+export { useFieldListAdaptor };

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

@@ -1,67 +1 @@
-import '../../../../shared/utils/tapable/SyncHook.js';
-import '../../../../shared/utils/tapable/SyncBailHook.js';
-import SyncWaterfallHook from '../../../../shared/utils/tapable/SyncWaterfallHook.js';
-import '../../../../shared/utils/tapable/SyncLoopHook.js';
-import '../../../../shared/utils/tapable/AsyncParallelHook.js';
-import '../../../../shared/utils/tapable/AsyncParallelBailHook.js';
-import '../../../../shared/utils/tapable/AsyncSeriesHook.js';
-import '../../../../shared/utils/tapable/AsyncSeriesBailHook.js';
-import '../../../../shared/utils/tapable/AsyncSeriesLoopHook.js';
-import '../../../../shared/utils/tapable/AsyncSeriesWaterfallHook.js';
-import { FIELD_BUSINESS_TYPE } from '../constants/index.js';
-
-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 };
+export { useFieldNormalize } from './useFieldNormalize2.js';

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

@@ -0,0 +1,67 @@
+import '../../../../shared/utils/tapable/SyncHook.js';
+import '../../../../shared/utils/tapable/SyncBailHook.js';
+import SyncWaterfallHook from '../../../../shared/utils/tapable/SyncWaterfallHook.js';
+import '../../../../shared/utils/tapable/SyncLoopHook.js';
+import '../../../../shared/utils/tapable/AsyncParallelHook.js';
+import '../../../../shared/utils/tapable/AsyncParallelBailHook.js';
+import '../../../../shared/utils/tapable/AsyncSeriesHook.js';
+import '../../../../shared/utils/tapable/AsyncSeriesBailHook.js';
+import '../../../../shared/utils/tapable/AsyncSeriesLoopHook.js';
+import '../../../../shared/utils/tapable/AsyncSeriesWaterfallHook.js';
+import { FIELD_BUSINESS_TYPE } from '../constants/index2.js';
+
+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/components/form-render/src/hooks/useFieldVisitor.js

@@ -1,38 +1 @@
-import { arrayed } from '../utils/index.js';
-import { isFunction } from '@vueuse/core';
-
-function useFieldVisitor() {
-  function traverse(fieldList, visitorMap, key = "val_key") {
-    return fieldList.reduce((fin, field) => {
-      if (Array.isArray(field.children)) {
-        field.children = traverse(field.children, visitorMap, key);
-      }
-      if (Array.isArray(field.properties)) {
-        field.properties = traverse(field.properties, visitorMap, key);
-      }
-      if (field.suffixConfig) {
-        field.suffixConfig = traverse(arrayed(field.suffixConfig), visitorMap, key);
-      }
-      const visitor = visitorMap == null ? void 0 : visitorMap[field[key]];
-      let current = field;
-      const before = [];
-      const after = [];
-      isFunction(visitor) && visitor({
-        field,
-        replace(field2) {
-          current = field2;
-        },
-        insertBefore(field2) {
-          before.push(...arrayed(field2));
-        },
-        insertAfter(field2) {
-          after.push(...arrayed(field2));
-        }
-      });
-      return fin.concat([...before, current, ...after]);
-    }, []);
-  }
-  return { traverse };
-}
-
-export { useFieldVisitor };
+export { useFieldVisitor } from './useFieldVisitor2.js';