cnhis-design-vue 3.1.17-beta.0 → 3.1.17-beta.1

package/es/packages/big-table/src/components/separate.js

@@ -3,7 +3,7 @@ import { useSeparateMap } from '../../../../packages/big-table/src/hooks/useSepa
 import _export_sfc from '../../../../_virtual/plugin-vue_export-helper.js';
 
 const _hoisted_1 = { class: "big-table__separate" };
-const _hoisted_2 = /* @__PURE__ */ createElementVNode("span", { class: "big-table__separatePlaceholder" }, "p", -1);
+const _hoisted_2 = /* @__PURE__ */ createElementVNode("span", { class: "big-table__separatePlaceholder" }, /* @__PURE__ */ toDisplayString(` `), -1);
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "separate",
   props: {

package/es/packages/big-table/src/hooks/useSeparateRow.js

@@ -89,7 +89,7 @@ function useSeparateRow(getColumnConfig, getFieldItem, $VXETable) {
           separateDataMap.value.set(row, {
             row,
             rawRow: rawData[dataIndex],
-            index,
+            index: dataIndex,
             separateData
           });
           row.$__SEPARATE_DATA = [separateData];
@@ -99,7 +99,7 @@ function useSeparateRow(getColumnConfig, getFieldItem, $VXETable) {
         separateDataMap.value.set(data2, {
           row: data2,
           rawRow: rawData[dataIndex],
-          index,
+          index: dataIndex,
           separateData
         });
         row.$__SEPARATE_DATA.push(separateData);

package/es/packages/fabric-chart/index.d.ts

@@ -52,6 +52,7 @@ declare const FabricChart: SFCWithInstall<import("vue").DefineComponent<{
         endY: number;
     }>;
     topList: import("vue").ComputedRef<import("./src/interface").IDate[]>;
+    getRightInfo: import("vue").ComputedRef<any>;
     propItems: any;
     computedYCell: (type: import("./src/interface").IPointType) => number;
     cumputedX: (value: string | number) => any;
@@ -81,6 +82,7 @@ declare const FabricChart: SFCWithInstall<import("vue").DefineComponent<{
     }) => void;
     setPopup: (point: any) => void;
     getEqualXTypes: (pointX: number) => import("./src/interface").IPointType[];
+    drawScaleValue: (yScaleValueList: any[]) => void;
     PopupTip: import("vue").DefineComponent<{
         show: {
             type: BooleanConstructor;

package/es/packages/fabric-chart/src/FabricChart.js

@@ -65,10 +65,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return grid.mainYCell * grid.subYCell + grid.surplusYCell;
     });
     const endX = computed(() => {
+      var _a;
       const { width, right = null, top } = props.data;
       if (!right)
         return width;
-      const endWidth = right.width || 50;
+      const endWidth = (_a = right.width) != null ? _a : 0;
       return width - endWidth;
     });
     const endXLimit = computed(() => {
@@ -148,7 +149,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     const event = computed(() => {
       var _a;
-      return ((_a = props.data.grid) == null ? void 0 : _a.event) || { selectable: true, evented: true };
+      return ((_a = props.data.grid) == null ? void 0 : _a.event) || { selectable: true, evented: true, hovered: true };
     });
     const itemList = computed(() => {
       const { left } = props.data;
@@ -214,6 +215,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       return topList2.sort((a, b) => a.seq - b.seq);
     });
+    const getRightInfo = computed(() => {
+      var _a;
+      const { left, right } = props.data;
+      const temperatureObj = left.yScaleValue.find((v) => v.type === "temperature");
+      const yScaleValue = (right == null ? void 0 : right.yScaleValue) || {};
+      if ((_a = temperatureObj == null ? void 0 : temperatureObj.list) == null ? void 0 : _a.length) {
+        Object.assign(yScaleValue, {
+          list: temperatureObj.list.map((v) => Math.floor((1.8 * v + 32) * 100) / 100),
+          spaceGridNumber: temperatureObj.spaceGridNumber
+        });
+      }
+      return yScaleValue;
+    });
     const propItems = reactive({
       canvasWidth: props.data.width,
       canvasHeight: props.data.height,
@@ -252,7 +266,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       temperatureYCell: temperatureYCell.value,
       painYCell: painYCell.value,
       event: event.value,
-      itemList: itemList.value
+      itemList: itemList.value,
+      getRightInfo: getRightInfo.value
     });
     function computedYCell(type) {
       const { yScaleValue } = props.data.left;
@@ -265,8 +280,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const { cumputedX, cumputedY, getXValue, getYValue } = useCumputedPoint(propItems);
     useTop(canvas, propItems);
     const { pointTipProps, pointMenuProps, clickMenu, setPopup, getEqualXTypes } = useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, getYValue, props.addRenderItem);
-    useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, getYValue, getEqualXTypes);
-    useRight(canvas, propItems);
+    const { drawScaleValue } = useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, getYValue, getEqualXTypes);
+    useRight(canvas, propItems, drawScaleValue);
     useBottom(canvas, propItems);
     useOther(canvas, propItems, cumputedX);
     onMounted(() => {

package/es/packages/fabric-chart/src/FabricChart.vue.d.ts

@@ -53,6 +53,7 @@ declare const _default: import("vue").DefineComponent<{
         endY: number;
     }>;
     topList: import("vue").ComputedRef<IDate[]>;
+    getRightInfo: import("vue").ComputedRef<any>;
     propItems: any;
     computedYCell: (type: IPointType) => number;
     cumputedX: (value: string | number) => any;
@@ -82,6 +83,7 @@ declare const _default: import("vue").DefineComponent<{
     }) => void;
     setPopup: (point: any) => void;
     getEqualXTypes: (pointX: number) => IPointType[];
+    drawScaleValue: (yScaleValueList: any[]) => void;
     PopupTip: import("vue").DefineComponent<{
         show: {
             type: BooleanConstructor;

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

@@ -31,8 +31,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     originY,
     endY,
     itemList,
-    painIndex,
-    painHeight,
+    event,
     vitalSignsOriginY,
     painOriginY
   } = propItems;
@@ -131,23 +130,23 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
   function setCanvasEvent() {
     if (!propItems.event.evented)
       return;
-    canvas.value.on("mouse:up", (event) => {
+    canvas.value.on("mouse:up", (event2) => {
       var _a;
-      if (event.button === 3) {
-        const { x = 0, y = 0 } = event.pointer || {};
+      if (event2.button === 3) {
+        const { x = 0, y = 0 } = event2.pointer || {};
         if (x >= originX && x <= endX && y >= originY && y <= endY) {
           pointTipProps.show = false;
           pointMenuProps.point = { x, y };
           pointMenuProps.show = true;
-          const { type } = ((_a = event.target) == null ? void 0 : _a.origin) || {};
-          if (event.target && (type === "temperature" || type === "pain")) {
+          const { type } = ((_a = event2.target) == null ? void 0 : _a.origin) || {};
+          if (event2.target && (type === "temperature" || type === "pain")) {
             if (type === "temperature") {
               pointMenuProps.list = [...TEMPERATURE_MENU];
             }
             if (type === "pain") {
               pointMenuProps.list = [...PAIN_MENU];
             }
-            pointMenuProps.target = event.target;
+            pointMenuProps.target = event2.target;
           } else {
             pointMenuProps.target = null;
             pointMenuProps.list = ["\u65B0\u589E\u8282\u70B9"];
@@ -162,7 +161,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
                     dataIndex: v.dataIndex,
                     key: v.key
                   },
-                  pointer: event.pointer
+                  pointer: event2.pointer
                 });
               }
             });
@@ -397,21 +396,23 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     });
   }
   function setPointEvent(point) {
-    point.on("mouseover", () => {
-      setPopup(point);
-    });
-    point.on("mouseout", () => {
-      pointTipProps.show = false;
-    });
+    if (event.hovered) {
+      point.on("mouseover", () => {
+        setPopup(point);
+      });
+      point.on("mouseout", () => {
+        pointTipProps.show = false;
+      });
+    }
     point.on("moving", () => {
       moveLimit(point);
       updateLine(point);
       canvas.value.renderAll();
-      setPopup(point);
+      event.hovered && setPopup(point);
     });
-    point.on("mouseup:before", (event) => {
+    point.on("mouseup:before", (event2) => {
       pointTipProps.show = false;
-      if (event.e.button === 0) {
+      if (event2.e.button === 0) {
         const { type } = point.origin;
         const value = getYValue(type, point.top);
         emits("change", {

package/es/packages/fabric-chart/src/hooks/useLeft.d.ts

@@ -1,4 +1,6 @@
 import { Ref } from 'vue';
 import { fabric } from '../utils';
 import { IPropItems } from '../interface';
-export declare function useLeft(canvas: Ref<fabric.Canvas>, propItems: IPropItems, emits: any, setPopup: Function, pointTipProps: any, getXValue: Function, getYValue: Function, getEqualXTypes: Function): void;
+export declare function useLeft(canvas: Ref<fabric.Canvas>, propItems: IPropItems, emits: any, setPopup: Function, pointTipProps: any, getXValue: Function, getYValue: Function, getEqualXTypes: Function): {
+    drawScaleValue: (yScaleValueList: any[]) => void;
+};

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

@@ -16,8 +16,8 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
     iconsWidth,
     itemList,
     painIndex,
-    canvasWidth,
-    canvasHeight
+    right,
+    getRightInfo
   } = propItems;
   const mainScaleWidth = 9;
   const subScaleWidth = 5;
@@ -88,13 +88,23 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
     canvas.value.add(title, ...list);
     title.sendToBack();
   }
-  function drawScaleValue() {
+  function drawScaleValue(yScaleValueList) {
+    var _a;
+    if (!(yScaleValueList == null ? void 0 : yScaleValueList.length))
+      return;
+    const { layout } = yScaleValueList[0];
+    let start = iconsWidth;
+    let end = originX;
+    if (layout === "right") {
+      start = endX;
+      end = endX + ((_a = right == null ? void 0 : right.width) != null ? _a : 0);
+    }
     const groupList = [];
-    const column = !painHeight ? left.yScaleValue.length : left.yScaleValue.length - 1;
-    const colWidth = (originX - iconsWidth) / column;
-    const residue = (originX - iconsWidth) % column;
+    const column = !painHeight || layout === "right" ? yScaleValueList.length : yScaleValueList.length - 1;
+    const colWidth = (end - start) / column;
+    const residue = (end - start) % column;
     const firstColWidth = colWidth + residue;
-    left.yScaleValue.forEach((item, index) => {
+    yScaleValueList.forEach((item, index) => {
       if (item.type === "pain") {
         drwaPainScaleValue(item);
         return;
@@ -108,7 +118,7 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
         list.push(line2);
       }
       const rectWidth = index === 0 ? firstColWidth : colWidth;
-      const rectLeft = index === 0 ? iconsWidth : firstColWidth + iconsWidth + (index - 1) * colWidth;
+      const rectLeft = index === 0 ? start : firstColWidth + start + (index - 1) * colWidth;
       const line = index > 0 ? new fabric.Line([rectLeft, painIndex == 0 ? vitalSignsOriginY.originY : originY, rectLeft, vitalSignsOriginY.endY], {
         ...defaultBorderStyle
       }) : null;
@@ -157,9 +167,9 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
     });
     groupList.push(new fabric.Rect({
       ...defaultRectStyle,
-      width: originX - iconsWidth,
-      height: endY - originY,
-      left: iconsWidth,
+      width: layout === "right" ? end - start - 1 : end - start,
+      height: layout === "right" ? endY - originY - 1 : endY - originY,
+      left: start,
       top: originY,
       originX: "left",
       originY: "top"
@@ -249,11 +259,19 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
   }
   onMounted(() => {
     nextTick(() => {
+      var _a;
       iconsWidth && drawIcons();
-      drawScaleValue();
+      const yScaleValueList = left.yScaleValue.filter((v) => v.layout === "left" || v.type === "pain");
+      if ((right == null ? void 0 : right.width) && ((_a = right == null ? void 0 : right.yScaleValue) == null ? void 0 : _a.layout) === "left") {
+        yScaleValueList.push(getRightInfo);
+      }
+      drawScaleValue(yScaleValueList);
       canvas.value.renderAll();
     });
   });
+  return {
+    drawScaleValue
+  };
 }
 
 export { useLeft };

package/es/packages/fabric-chart/src/hooks/useRight.d.ts

@@ -1,4 +1,4 @@
 import { Ref } from 'vue';
 import { fabric } from '../utils';
 import { IPropItems } from '../interface';
-export declare function useRight(canvas: Ref<fabric.Canvas>, propItems: IPropItems): void;
+export declare function useRight(canvas: Ref<fabric.Canvas>, propItems: IPropItems, drawScaleValue: Function): void;

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

@@ -1,77 +1,19 @@
 import { onMounted, nextTick } from 'vue';
 import { fabric } from '../utils/index.js';
-import { defaultBorderStyle, defaultRectStyle, defaultStyle } from './useDraw.js';
+import { defaultBorderStyle } from './useDraw.js';
 
-function useRight(canvas, propItems) {
-  const { endX, endY, temperatureYCell, canvasWidth, canvasHeight, left, right, breathingHeight, vitalSignsOriginY } = propItems;
-  function drawScaleValue() {
-    var _a, _b, _c;
-    if (!right) {
-      canvas.value.add(new fabric.Line([canvasWidth - 1, 0, canvasWidth - 1, canvasHeight], defaultBorderStyle));
-      return false;
-    }
-    const list = [];
-    list.push(new fabric.Rect({
-      ...defaultRectStyle,
-      width: canvasWidth - endX - 1,
-      height: endY + breathingHeight - 1,
-      left: endX,
-      top: 0,
-      originX: "left",
-      originY: "top"
-    }));
-    const difVal = 6;
-    const spaceScaleNumber = right.yScaleValue.spaceScaleNumber || 5;
-    const mainScaleWidth = 9;
-    const subScaleWidth = 5;
-    const cList = left.yScaleValue.find((v) => v.type === "temperature").list;
-    const minC = Math.min(...cList);
-    const h1 = right.yScaleValue.list[1];
-    const h0 = right.yScaleValue.list[0];
-    const c1 = 5 * (h1 - 32) / 9;
-    const c0 = 5 * (h0 - 32) / 9;
-    const top1 = vitalSignsOriginY.endY - (c1 - minC) * temperatureYCell - difVal;
-    const top0 = vitalSignsOriginY.endY - (c0 - minC) * temperatureYCell - difVal;
-    const spaceHVaule = (top0 - top1) / spaceScaleNumber;
-    let endTop = 0;
-    right.yScaleValue.list.forEach((v, i) => {
-      var _a2;
-      const c = 5 * (+v - 32) / 9;
-      const top = vitalSignsOriginY.endY - (c - minC) * temperatureYCell - difVal;
-      if (i === right.yScaleValue.list.length - 1)
-        endTop = top;
-      const text = new fabric.Text(`${v}\xB0`, {
-        left: endX + mainScaleWidth,
-        top: i === 0 ? vitalSignsOriginY.endY - 5 : top - 5,
-        originX: "left",
-        ...((_a2 = right.yScaleValue) == null ? void 0 : _a2.style) || {}
-      });
-      list.push(text);
-      const spaceHVaule0 = (vitalSignsOriginY.endY - top1) / spaceScaleNumber;
-      for (let k = 0; k < spaceScaleNumber; k++) {
-        const scaleTop = i === 0 ? vitalSignsOriginY.endY - k * spaceHVaule0 : top - k * spaceHVaule;
-        const line = new fabric.Line([endX, scaleTop, k > 0 ? endX + subScaleWidth : endX + mainScaleWidth, scaleTop], {
-          ...defaultBorderStyle
-        });
-        list.push(line);
-      }
-    });
-    const width = canvasWidth - endX;
-    const unit = right.yScaleValue.unit ? new fabric.Text((_b = (_a = right.yScaleValue) == null ? void 0 : _a.unit) == null ? void 0 : _b.split("").join("\n"), {
-      left: endX + width / 2,
-      top: endTop / 2,
-      originX: "center",
-      ...((_c = right.yScaleValue) == null ? void 0 : _c.style) || {}
-    }) : null;
-    unit && list.push(unit);
-    const group = list.length > 0 ? new fabric.Group([...list], { ...defaultStyle }) : null;
-    group && canvas.value.add(group);
-    group && group.sendToBack();
-  }
+function useRight(canvas, propItems, drawScaleValue) {
+  const { left, right, getRightInfo, canvasWidth, endY } = propItems;
   onMounted(() => {
     nextTick(() => {
-      drawScaleValue();
-      canvas.value.renderAll();
+      var _a;
+      const yScaleValueList = left.yScaleValue.filter((v) => v.layout === "right");
+      if ((right == null ? void 0 : right.width) && ((_a = right == null ? void 0 : right.yScaleValue) == null ? void 0 : _a.layout) === "right") {
+        yScaleValueList.push(getRightInfo);
+        const rightBorderLine = new fabric.Line([canvasWidth - 1, 0, canvasWidth - 1, endY], defaultBorderStyle);
+        canvas.value.add(rightBorderLine);
+      }
+      drawScaleValue(yScaleValueList);
     });
   });
 }

package/es/packages/fabric-chart/src/interface.d.ts

@@ -1,8 +1,10 @@
 import { InjectionKey, Ref } from 'vue';
 import { fabric } from './utils';
+import { AnyObject } from '../../../../es/src/types';
 interface IEvent {
     selectable: boolean;
     evented: boolean;
+    hovered: boolean;
 }
 interface ImainLineStyle {
     x: fabric.ILineOptions;
@@ -60,6 +62,7 @@ export interface IPropItems {
     painYCell: number;
     event: Partial<IEvent>;
     itemList: Array<any>;
+    getRightInfo: AnyObject;
 }
 export interface IPoint {
     time: string;

package/es/packages/form-config/src/components/FormConfigCreator.js

@@ -50,6 +50,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             ]),
             default: withCtx(() => [
               createVNode(unref(FormRender), {
+                column: "12",
                 ref_key: "lineBreakFormRef",
                 ref: lineBreakFormRef,
                 "initial-data": unref(pick)(initialData, ["layoutWidthEnum"]),
@@ -77,6 +78,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             ]),
             default: withCtx(() => [
               createVNode(unref(FormRender), {
+                column: "12",
                 ref_key: "linebarFormRef",
                 ref: linebarFormRef,
                 "initial-data": initialData,

package/es/packages/form-config/src/components/FormConfigEdit.js

@@ -54,6 +54,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return openBlock(), createElementBlock(Fragment, null, [
         (openBlock(), createBlock(unref(CFormRender), {
           key: key.value,
+          column: "12",
           ref_key: "formRenderRef",
           ref: formRenderRef,
           size: "small",

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.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/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/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>;
+};