cnhis-design-vue 3.1.33-beta.6 → 3.1.33-beta.8

package/es/components/fabric-chart/src/hooks/useBirthProcess.js

@@ -0,0 +1,123 @@
+import { onMounted, nextTick } from 'vue';
+import useGrid from './useGrid.js';
+import { drawText, defaultTextStyle, defaultRectStyle } from './useDraw.js';
+import { fabric } from '../utils/index.js';
+
+function useBirthProcess(canvas, propItems) {
+  useGrid(canvas, propItems, true);
+  function drawXScale() {
+    const { xAxis, grid, originX, originY, xCellWidth, endY } = propItems;
+    const { show, startTime, range = [0, 23], position = "top", style } = xAxis.time;
+    const { show: processTimeShow, range: processTimeRange = [0, 23], style: processTimeStyle } = xAxis.processTime;
+    if (show || processTimeShow) {
+      const timeList = [];
+      const processTimeList = [];
+      const timeTextList = [];
+      const processTimeTextList = [];
+      const left = originX + xCellWidth / 2;
+      for (let i = 0; i < grid.mainXCell; i++) {
+        if (show) {
+          const currentTime = i === 0 ? +startTime.slice(11, 13) : getCurrentTime(timeList.at(-1), range);
+          timeList.push(currentTime);
+          const top = position == "top" ? originY - 15 : endY + 15;
+          timeTextList.push(
+            drawText([left + i * xCellWidth, top], {
+              value: String(currentTime),
+              ...defaultTextStyle,
+              ...style || {}
+            })
+          );
+        }
+        if (processTimeShow) {
+          const currentProcessTime = i === 0 ? processTimeRange[0] : processTimeList.at(-1) + 1;
+          processTimeList.push(currentProcessTime);
+          const top = position == "top" ? endY + 15 : originY - 15;
+          processTimeTextList.push(
+            drawText([left + i * xCellWidth, top], {
+              value: String(currentProcessTime),
+              ...defaultTextStyle,
+              ...processTimeStyle || {}
+            })
+          );
+        }
+      }
+      const group = new fabric.Group([...timeTextList, ...processTimeTextList], {
+        evented: false,
+        selectable: false
+      });
+      canvas.value.add(group);
+      canvas.value.sendToBack(group);
+    }
+  }
+  function getCurrentTime(lastTime, range) {
+    return lastTime + 1 > range[1] ? range[0] : lastTime + 1;
+  }
+  function drawYScale() {
+    const { leftAddAreaWidth, leftScales, rightScales, originY, endY, yCellHeight, endX } = propItems;
+    let baseLeft = leftAddAreaWidth;
+    [...leftScales, ...rightScales].forEach((item, index) => {
+      const { range, spaceValue, width, title, titleStyle, layout } = item;
+      const textList = [];
+      if (layout === "right")
+        baseLeft = endX;
+      const left = baseLeft + width / 2;
+      const list = getScaleNumberList(range, spaceValue);
+      list.forEach((num, i) => {
+        const top = i === 0 ? endY - 8 : endY - i * yCellHeight;
+        textList.push(
+          drawText([left, top], {
+            value: String(num),
+            ...defaultTextStyle
+          })
+        );
+      });
+      const border = new fabric.Rect({
+        ...defaultRectStyle,
+        width,
+        height: endY,
+        left,
+        top: endY / 2
+      });
+      const titleText = originY > 0 ? drawText([left, originY - yCellHeight / 2], {
+        value: String(title),
+        ...defaultTextStyle,
+        ...titleStyle
+      }) : null;
+      const group = new fabric.Group([...textList, border, ...titleText ? [titleText] : []], {
+        evented: false,
+        selectable: false
+      });
+      canvas.value.add(group);
+      baseLeft += width;
+    });
+  }
+  function getScaleNumberList(range, spaceValue) {
+    const list = [];
+    const [min, max] = range;
+    for (let i = min; i <= max; i += spaceValue) {
+      list.push(i);
+    }
+    return list;
+  }
+  function drawBorder() {
+    const { canvasWidth, borderStyle, endY, leftAddAreaWidth, rightAddAreaWidth } = propItems;
+    const border = new fabric.Rect({
+      ...borderStyle,
+      width: canvasWidth - leftAddAreaWidth - rightAddAreaWidth,
+      height: endY,
+      left: leftAddAreaWidth,
+      top: 0,
+      fill: "transparent"
+    });
+    canvas.value.add(border);
+  }
+  onMounted(() => {
+    nextTick(() => {
+      drawYScale();
+      drawXScale();
+      drawBorder();
+    });
+  });
+}
+
+export { useBirthProcess };

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

@@ -156,7 +156,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
           pointMenuProps.point = { x, y };
           pointMenuProps.show = true;
           const { type } = ((_a = event2.target) == null ? void 0 : _a.origin) || {};
-          if (event2.target && (type === "temperature" || type === "pain")) {
+          if (event2.target && ["temperature", "pain"].includes(type)) {
             if (type === "temperature") {
               pointMenuProps.list = [...TEMPERATURE_MENU];
             }

package/es/components/fabric-chart/src/hooks/useCumputedPoint.d.ts

@@ -1,7 +1,11 @@
 import { IPropItems, IPointType } from '../interface';
+import { AnyObject } from '../../../../../es/shared/types';
 export declare function useCumputedPoint(propItems: IPropItems): {
     cumputedX: (value: number | string, setAllCenter?: boolean) => any;
     cumputedY: (type: IPointType, scaleValueList: number[], value: number | string) => number;
     getXValue: (pointX: number) => string | undefined;
     getYValue: (type: IPointType, pointY: number) => number;
 };
+export declare function useBirthProcessCumputedPoint(propItems: AnyObject): {
+    cumputedX: (value: number | string) => any;
+};

package/es/components/fabric-chart/src/hooks/useCumputedPoint.js

@@ -56,5 +56,17 @@ function useCumputedPoint(propItems) {
     getYValue
   };
 }
+function useBirthProcessCumputedPoint(propItems) {
+  const { xAxis, originX, originY, xCellWidth } = propItems;
+  function cumputedX(value) {
+    const time = new Date(value).getTime();
+    const startTime = new Date(xAxis.time.startTime).getTime();
+    const timeCell = 1 * 60 * 60 * 1e3 / xCellWidth;
+    return (time - startTime) / timeCell + originX;
+  }
+  return {
+    cumputedX
+  };
+}
 
-export { useCumputedPoint };
+export { useBirthProcessCumputedPoint, useCumputedPoint };

package/es/components/fabric-chart/src/hooks/useGrid.d.ts

@@ -1,5 +1,4 @@
 import { Ref } from 'vue';
 import { fabric } from '../utils';
-import { IPropItems } from '../interface';
-export default function useGrid(canvas: Ref<fabric.Canvas>, propItems: IPropItems): void;
-export declare function useBirthProcessGrid(canvas: Ref<fabric.Canvas>, propItems: IPropItems): void;
+import { AnyObject } from '../../../../../es/shared/types';
+export default function useGrid(canvas: Ref<fabric.Canvas>, propItems: AnyObject, isBirthProcess?: boolean): void;

package/es/components/fabric-chart/src/hooks/useGrid.js

@@ -2,36 +2,46 @@ import { onMounted, nextTick } from 'vue';
 import { fabric } from '../utils/index.js';
 import { drawLine, defaultBorderStyle } from './useDraw.js';
 
-function useGrid(canvas, propItems) {
-  var _a, _b;
+function useGrid(canvas, propItems, isBirthProcess = false) {
+  var _a, _b, _c, _d;
   const { gridYNumber, originY, grid, originX, endX, xCellWidth, yCellHeight, gridXNumber, endY } = propItems;
   const yList = [];
   const xList = [];
   const mainList = /* @__PURE__ */ new Set();
   for (let i = 0; i <= gridYNumber; i++) {
     const y = originY + parseInt(String(yCellHeight * (gridYNumber - i)));
-    const style = i % grid.subYCell === 0 ? ((_a = grid.mainLineStyle) == null ? void 0 : _a.x) || {} : grid.subLineStyle || {};
-    const line = drawLine([originX, y, endX, y], style);
-    if (i % grid.subYCell === 0) {
-      mainList.add(line);
-    } else {
+    if (isBirthProcess) {
+      const line = drawLine([originX, y, endX, y], { ...defaultBorderStyle, ...((_a = grid.mainLineStyle) == null ? void 0 : _a.x) || {} });
       yList.push(line);
+    } else {
+      const style = i % grid.subYCell === 0 ? ((_b = grid.mainLineStyle) == null ? void 0 : _b.x) || {} : grid.subLineStyle || {};
+      const line = drawLine([originX, y, endX, y], style);
+      if (i % grid.subYCell === 0) {
+        mainList.add(line);
+      } else {
+        yList.push(line);
+      }
     }
   }
   for (let i = 0; i <= gridXNumber; i++) {
     const x = originX + parseInt(String(xCellWidth * i));
-    let style = grid.subLineStyle || {};
-    if (i % grid.subSecondXCell === 0) {
-      style = grid.subSecondLineStyle || {};
-    }
-    if (i % grid.subXCell === 0) {
-      style = i !== 0 && i !== gridXNumber ? ((_b = grid.mainLineStyle) == null ? void 0 : _b.y) || {} : defaultBorderStyle;
-    }
-    const line = drawLine([x, originY, x, endY], style);
-    if (i % grid.subXCell === 0 && i !== 0 && i !== gridXNumber) {
-      mainList.add(line);
-    } else {
+    if (isBirthProcess) {
+      const line = drawLine([x, originY, x, endY], { ...defaultBorderStyle, ...((_c = grid.mainLineStyle) == null ? void 0 : _c.y) || {} });
       xList.push(line);
+    } else {
+      let style = grid.subLineStyle || {};
+      if (i % grid.subSecondXCell === 0) {
+        style = grid.subSecondLineStyle || {};
+      }
+      if (i % grid.subXCell === 0) {
+        style = i !== 0 && i !== gridXNumber ? ((_d = grid.mainLineStyle) == null ? void 0 : _d.y) || {} : defaultBorderStyle;
+      }
+      const line = drawLine([x, originY, x, endY], style);
+      if (i % grid.subXCell === 0 && i !== 0 && i !== gridXNumber) {
+        mainList.add(line);
+      } else {
+        xList.push(line);
+      }
     }
   }
   const group = new fabric.Group([...xList, ...yList, ...mainList], {
@@ -45,31 +55,5 @@ function useGrid(canvas, propItems) {
     });
   });
 }
-function useBirthProcessGrid(canvas, propItems) {
-  var _a, _b;
-  const { gridYNumber, originY, grid, originX, endX, xCellWidth, yCellHeight, gridXNumber, endY } = propItems;
-  const yList = [];
-  const xList = [];
-  for (let i = 0; i <= gridYNumber; i++) {
-    const y = originY + parseInt(String(yCellHeight * (gridYNumber - i)));
-    const line = drawLine([originX, y, endX, y], { ...defaultBorderStyle, ...((_a = grid.mainLineStyle) == null ? void 0 : _a.x) || {} });
-    yList.push(line);
-  }
-  for (let i = 0; i <= gridXNumber; i++) {
-    const x = originX + parseInt(String(xCellWidth * i));
-    const line = drawLine([x, originY, x, endY], { ...defaultBorderStyle, ...((_b = grid.mainLineStyle) == null ? void 0 : _b.y) || {} });
-    xList.push(line);
-  }
-  const group = new fabric.Group([...xList, ...yList], {
-    evented: false,
-    selectable: false
-  });
-  onMounted(() => {
-    nextTick(() => {
-      canvas.value.add(group);
-      canvas.value.sendToBack(group);
-    });
-  });
-}
 
-export { useGrid as default, useBirthProcessGrid };
+export { useGrid as default };

package/es/components/iho-table/index.d.ts

@@ -275,9 +275,7 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
                     } | undefined;
                     autofocus?: string | undefined;
                     autoselect?: boolean | undefined;
-                    defaultValue?: string | number | object | any[] | ((params: {
-                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
-                    }) => any) | {
+                    defaultValue?: string | number | object | any[] | {
                         exec: (string: string) => RegExpExecArray | null;
                         test: (string: string) => boolean;
                         readonly source: string;
@@ -298,7 +296,9 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
                         [Symbol.search]: (string: string) => number;
                         [Symbol.split]: (string: string, limit?: number | undefined) => string[];
                         [Symbol.matchAll]: (str: string) => IterableIterator<RegExpMatchArray>;
-                    } | {
+                    } | ((params: {
+                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
+                    }) => any) | {
                         toString: () => string;
                         toDateString: () => string;
                         toTimeString: () => string;
@@ -578,9 +578,7 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
                     } | undefined;
                     autofocus?: string | undefined;
                     autoselect?: boolean | undefined;
-                    defaultValue?: string | number | object | any[] | ((params: {
-                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
-                    }) => any) | {
+                    defaultValue?: string | number | object | any[] | {
                         exec: (string: string) => RegExpExecArray | null;
                         test: (string: string) => boolean;
                         readonly source: string;
@@ -601,7 +599,9 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
                         [Symbol.search]: (string: string) => number;
                         [Symbol.split]: (string: string, limit?: number | undefined) => string[];
                         [Symbol.matchAll]: (str: string) => IterableIterator<RegExpMatchArray>;
-                    } | {
+                    } | ((params: {
+                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
+                    }) => any) | {
                         toString: () => string;
                         toDateString: () => string;
                         toTimeString: () => string;
@@ -1041,9 +1041,7 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
                     } | undefined;
                     autofocus?: string | undefined;
                     autoselect?: boolean | undefined;
-                    defaultValue?: string | number | object | any[] | ((params: {
-                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
-                    }) => any) | {
+                    defaultValue?: string | number | object | any[] | {
                         exec: (string: string) => RegExpExecArray | null;
                         test: (string: string) => boolean;
                         readonly source: string;
@@ -1064,7 +1062,9 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
                         [Symbol.search]: (string: string) => number;
                         [Symbol.split]: (string: string, limit?: number | undefined) => string[];
                         [Symbol.matchAll]: (str: string) => IterableIterator<RegExpMatchArray>;
-                    } | {
+                    } | ((params: {
+                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
+                    }) => any) | {
                         toString: () => string;
                         toDateString: () => string;
                         toTimeString: () => string;
@@ -1400,9 +1400,7 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
                     } | undefined;
                     autofocus?: string | undefined;
                     autoselect?: boolean | undefined;
-                    defaultValue?: string | number | object | any[] | ((params: {
-                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
-                    }) => any) | {
+                    defaultValue?: string | number | object | any[] | {
                         exec: (string: string) => RegExpExecArray | null;
                         test: (string: string) => boolean;
                         readonly source: string;
@@ -1423,7 +1421,9 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
                         [Symbol.search]: (string: string) => number;
                         [Symbol.split]: (string: string, limit?: number | undefined) => string[];
                         [Symbol.matchAll]: (str: string) => IterableIterator<RegExpMatchArray>;
-                    } | {
+                    } | ((params: {
+                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
+                    }) => any) | {
                         toString: () => string;
                         toDateString: () => string;
                         toTimeString: () => string;
@@ -2259,9 +2259,7 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
             } | undefined;
             autofocus?: string | undefined;
             autoselect?: boolean | undefined;
-            defaultValue?: string | number | object | any[] | ((params: {
-                column: import("vxe-table").VxeTableDefines.ColumnInfo;
-            }) => any) | {
+            defaultValue?: string | number | object | any[] | {
                 exec: (string: string) => RegExpExecArray | null;
                 test: (string: string) => boolean;
                 readonly source: string;
@@ -2282,7 +2280,9 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
                 [Symbol.search]: (string: string) => number;
                 [Symbol.split]: (string: string, limit?: number | undefined) => string[];
                 [Symbol.matchAll]: (str: string) => IterableIterator<RegExpMatchArray>;
-            } | {
+            } | ((params: {
+                column: import("vxe-table").VxeTableDefines.ColumnInfo;
+            }) => any) | {
                 toString: () => string;
                 toDateString: () => string;
                 toTimeString: () => string;
@@ -2721,9 +2721,7 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
                     } | undefined;
                     autofocus?: string | undefined;
                     autoselect?: boolean | undefined;
-                    defaultValue?: string | number | object | any[] | ((params: {
-                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
-                    }) => any) | {
+                    defaultValue?: string | number | object | any[] | {
                         exec: (string: string) => RegExpExecArray | null;
                         test: (string: string) => boolean;
                         readonly source: string;
@@ -2744,7 +2742,9 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
                         [Symbol.search]: (string: string) => number;
                         [Symbol.split]: (string: string, limit?: number | undefined) => string[];
                         [Symbol.matchAll]: (str: string) => IterableIterator<RegExpMatchArray>;
-                    } | {
+                    } | ((params: {
+                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
+                    }) => any) | {
                         toString: () => string;
                         toDateString: () => string;
                         toTimeString: () => string;
@@ -3024,9 +3024,7 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
                     } | undefined;
                     autofocus?: string | undefined;
                     autoselect?: boolean | undefined;
-                    defaultValue?: string | number | object | any[] | ((params: {
-                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
-                    }) => any) | {
+                    defaultValue?: string | number | object | any[] | {
                         exec: (string: string) => RegExpExecArray | null;
                         test: (string: string) => boolean;
                         readonly source: string;
@@ -3047,7 +3045,9 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
                         [Symbol.search]: (string: string) => number;
                         [Symbol.split]: (string: string, limit?: number | undefined) => string[];
                         [Symbol.matchAll]: (str: string) => IterableIterator<RegExpMatchArray>;
-                    } | {
+                    } | ((params: {
+                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
+                    }) => any) | {
                         toString: () => string;
                         toDateString: () => string;
                         toTimeString: () => string;
@@ -3487,9 +3487,7 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
                     } | undefined;
                     autofocus?: string | undefined;
                     autoselect?: boolean | undefined;
-                    defaultValue?: string | number | object | any[] | ((params: {
-                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
-                    }) => any) | {
+                    defaultValue?: string | number | object | any[] | {
                         exec: (string: string) => RegExpExecArray | null;
                         test: (string: string) => boolean;
                         readonly source: string;
@@ -3510,7 +3508,9 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
                         [Symbol.search]: (string: string) => number;
                         [Symbol.split]: (string: string, limit?: number | undefined) => string[];
                         [Symbol.matchAll]: (str: string) => IterableIterator<RegExpMatchArray>;
-                    } | {
+                    } | ((params: {
+                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
+                    }) => any) | {
                         toString: () => string;
                         toDateString: () => string;
                         toTimeString: () => string;
@@ -3846,9 +3846,7 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
                     } | undefined;
                     autofocus?: string | undefined;
                     autoselect?: boolean | undefined;
-                    defaultValue?: string | number | object | any[] | ((params: {
-                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
-                    }) => any) | {
+                    defaultValue?: string | number | object | any[] | {
                         exec: (string: string) => RegExpExecArray | null;
                         test: (string: string) => boolean;
                         readonly source: string;
@@ -3869,7 +3867,9 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
                         [Symbol.search]: (string: string) => number;
                         [Symbol.split]: (string: string, limit?: number | undefined) => string[];
                         [Symbol.matchAll]: (str: string) => IterableIterator<RegExpMatchArray>;
-                    } | {
+                    } | ((params: {
+                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
+                    }) => any) | {
                         toString: () => string;
                         toDateString: () => string;
                         toTimeString: () => string;

package/es/components/iho-table/src/IhoTable.vue.d.ts

@@ -274,9 +274,7 @@ declare const _default: import("vue").DefineComponent<{
                     } | undefined;
                     autofocus?: string | undefined;
                     autoselect?: boolean | undefined;
-                    defaultValue?: string | number | object | any[] | ((params: {
-                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
-                    }) => any) | {
+                    defaultValue?: string | number | object | any[] | {
                         exec: (string: string) => RegExpExecArray | null;
                         test: (string: string) => boolean;
                         readonly source: string;
@@ -297,7 +295,9 @@ declare const _default: import("vue").DefineComponent<{
                         [Symbol.search]: (string: string) => number;
                         [Symbol.split]: (string: string, limit?: number | undefined) => string[];
                         [Symbol.matchAll]: (str: string) => IterableIterator<RegExpMatchArray>;
-                    } | {
+                    } | ((params: {
+                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
+                    }) => any) | {
                         toString: () => string;
                         toDateString: () => string;
                         toTimeString: () => string;
@@ -577,9 +577,7 @@ declare const _default: import("vue").DefineComponent<{
                     } | undefined;
                     autofocus?: string | undefined;
                     autoselect?: boolean | undefined;
-                    defaultValue?: string | number | object | any[] | ((params: {
-                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
-                    }) => any) | {
+                    defaultValue?: string | number | object | any[] | {
                         exec: (string: string) => RegExpExecArray | null;
                         test: (string: string) => boolean;
                         readonly source: string;
@@ -600,7 +598,9 @@ declare const _default: import("vue").DefineComponent<{
                         [Symbol.search]: (string: string) => number;
                         [Symbol.split]: (string: string, limit?: number | undefined) => string[];
                         [Symbol.matchAll]: (str: string) => IterableIterator<RegExpMatchArray>;
-                    } | {
+                    } | ((params: {
+                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
+                    }) => any) | {
                         toString: () => string;
                         toDateString: () => string;
                         toTimeString: () => string;
@@ -1040,9 +1040,7 @@ declare const _default: import("vue").DefineComponent<{
                     } | undefined;
                     autofocus?: string | undefined;
                     autoselect?: boolean | undefined;
-                    defaultValue?: string | number | object | any[] | ((params: {
-                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
-                    }) => any) | {
+                    defaultValue?: string | number | object | any[] | {
                         exec: (string: string) => RegExpExecArray | null;
                         test: (string: string) => boolean;
                         readonly source: string;
@@ -1063,7 +1061,9 @@ declare const _default: import("vue").DefineComponent<{
                         [Symbol.search]: (string: string) => number;
                         [Symbol.split]: (string: string, limit?: number | undefined) => string[];
                         [Symbol.matchAll]: (str: string) => IterableIterator<RegExpMatchArray>;
-                    } | {
+                    } | ((params: {
+                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
+                    }) => any) | {
                         toString: () => string;
                         toDateString: () => string;
                         toTimeString: () => string;
@@ -1399,9 +1399,7 @@ declare const _default: import("vue").DefineComponent<{
                     } | undefined;
                     autofocus?: string | undefined;
                     autoselect?: boolean | undefined;
-                    defaultValue?: string | number | object | any[] | ((params: {
-                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
-                    }) => any) | {
+                    defaultValue?: string | number | object | any[] | {
                         exec: (string: string) => RegExpExecArray | null;
                         test: (string: string) => boolean;
                         readonly source: string;
@@ -1422,7 +1420,9 @@ declare const _default: import("vue").DefineComponent<{
                         [Symbol.search]: (string: string) => number;
                         [Symbol.split]: (string: string, limit?: number | undefined) => string[];
                         [Symbol.matchAll]: (str: string) => IterableIterator<RegExpMatchArray>;
-                    } | {
+                    } | ((params: {
+                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
+                    }) => any) | {
                         toString: () => string;
                         toDateString: () => string;
                         toTimeString: () => string;
@@ -2258,9 +2258,7 @@ declare const _default: import("vue").DefineComponent<{
             } | undefined;
             autofocus?: string | undefined;
             autoselect?: boolean | undefined;
-            defaultValue?: string | number | object | any[] | ((params: {
-                column: import("vxe-table").VxeTableDefines.ColumnInfo;
-            }) => any) | {
+            defaultValue?: string | number | object | any[] | {
                 exec: (string: string) => RegExpExecArray | null;
                 test: (string: string) => boolean;
                 readonly source: string;
@@ -2281,7 +2279,9 @@ declare const _default: import("vue").DefineComponent<{
                 [Symbol.search]: (string: string) => number;
                 [Symbol.split]: (string: string, limit?: number | undefined) => string[];
                 [Symbol.matchAll]: (str: string) => IterableIterator<RegExpMatchArray>;
-            } | {
+            } | ((params: {
+                column: import("vxe-table").VxeTableDefines.ColumnInfo;
+            }) => any) | {
                 toString: () => string;
                 toDateString: () => string;
                 toTimeString: () => string;
@@ -2720,9 +2720,7 @@ declare const _default: import("vue").DefineComponent<{
                     } | undefined;
                     autofocus?: string | undefined;
                     autoselect?: boolean | undefined;
-                    defaultValue?: string | number | object | any[] | ((params: {
-                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
-                    }) => any) | {
+                    defaultValue?: string | number | object | any[] | {
                         exec: (string: string) => RegExpExecArray | null;
                         test: (string: string) => boolean;
                         readonly source: string;
@@ -2743,7 +2741,9 @@ declare const _default: import("vue").DefineComponent<{
                         [Symbol.search]: (string: string) => number;
                         [Symbol.split]: (string: string, limit?: number | undefined) => string[];
                         [Symbol.matchAll]: (str: string) => IterableIterator<RegExpMatchArray>;
-                    } | {
+                    } | ((params: {
+                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
+                    }) => any) | {
                         toString: () => string;
                         toDateString: () => string;
                         toTimeString: () => string;
@@ -3023,9 +3023,7 @@ declare const _default: import("vue").DefineComponent<{
                     } | undefined;
                     autofocus?: string | undefined;
                     autoselect?: boolean | undefined;
-                    defaultValue?: string | number | object | any[] | ((params: {
-                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
-                    }) => any) | {
+                    defaultValue?: string | number | object | any[] | {
                         exec: (string: string) => RegExpExecArray | null;
                         test: (string: string) => boolean;
                         readonly source: string;
@@ -3046,7 +3044,9 @@ declare const _default: import("vue").DefineComponent<{
                         [Symbol.search]: (string: string) => number;
                         [Symbol.split]: (string: string, limit?: number | undefined) => string[];
                         [Symbol.matchAll]: (str: string) => IterableIterator<RegExpMatchArray>;
-                    } | {
+                    } | ((params: {
+                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
+                    }) => any) | {
                         toString: () => string;
                         toDateString: () => string;
                         toTimeString: () => string;
@@ -3486,9 +3486,7 @@ declare const _default: import("vue").DefineComponent<{
                     } | undefined;
                     autofocus?: string | undefined;
                     autoselect?: boolean | undefined;
-                    defaultValue?: string | number | object | any[] | ((params: {
-                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
-                    }) => any) | {
+                    defaultValue?: string | number | object | any[] | {
                         exec: (string: string) => RegExpExecArray | null;
                         test: (string: string) => boolean;
                         readonly source: string;
@@ -3509,7 +3507,9 @@ declare const _default: import("vue").DefineComponent<{
                         [Symbol.search]: (string: string) => number;
                         [Symbol.split]: (string: string, limit?: number | undefined) => string[];
                         [Symbol.matchAll]: (str: string) => IterableIterator<RegExpMatchArray>;
-                    } | {
+                    } | ((params: {
+                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
+                    }) => any) | {
                         toString: () => string;
                         toDateString: () => string;
                         toTimeString: () => string;
@@ -3845,9 +3845,7 @@ declare const _default: import("vue").DefineComponent<{
                     } | undefined;
                     autofocus?: string | undefined;
                     autoselect?: boolean | undefined;
-                    defaultValue?: string | number | object | any[] | ((params: {
-                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
-                    }) => any) | {
+                    defaultValue?: string | number | object | any[] | {
                         exec: (string: string) => RegExpExecArray | null;
                         test: (string: string) => boolean;
                         readonly source: string;
@@ -3868,7 +3866,9 @@ declare const _default: import("vue").DefineComponent<{
                         [Symbol.search]: (string: string) => number;
                         [Symbol.split]: (string: string, limit?: number | undefined) => string[];
                         [Symbol.matchAll]: (str: string) => IterableIterator<RegExpMatchArray>;
-                    } | {
+                    } | ((params: {
+                        column: import("vxe-table").VxeTableDefines.ColumnInfo;
+                    }) => any) | {
                         toString: () => string;
                         toDateString: () => string;
                         toTimeString: () => string;