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

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;

package/es/components/iho-table/src/plugins/filterPlugin/filter.vue.d.ts

@@ -55,7 +55,7 @@ declare const _default: import("vue").DefineComponent<{
     setSortStatus: (value: IHO_TABLE_FILTER_STATUS) => void;
     iconActive: import("vue").ComputedRef<number>;
     toggleFilter: () => void;
-    Filter: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
+    FunnelSharp: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
     ref: typeof ref;
     NButton: any;
     NButtonGroup: any;

package/es/components/iho-table/src/plugins/filterPlugin/filter.vue.js

@@ -1,15 +1,16 @@
 import { defineComponent, inject, toRefs, ref, onDeactivated, computed, openBlock, createElementBlock, createVNode, unref, withCtx, createTextVNode, toDisplayString, normalizeClass, createElementVNode, Fragment, renderList, isRef, normalizeStyle } from 'vue';
 import { widthAppend } from '../../../../../shared/utils/index.js';
-import { Filter } from '@vicons/ionicons5';
+import { FunnelSharp } from '@vicons/ionicons5';
 import { useVirtualList } from '@vueuse/core';
 import { InjectionIhoTableUUID, InjectionIhoTableEmits } from '../../constants/index.js';
 import { IHO_TABLE_FILTER_STATUS } from './types.js';
 import { NEllipsis, NPopover, NIcon, NInput, NCheckboxGroup, NCheckbox, NButtonGroup, NButton } from 'naive-ui';
 import _export_sfc from '../../../../../_virtual/plugin-vue_export-helper.js';
 
-const _hoisted_1 = { class: "iho-table__filterWrapper" };
-const _hoisted_2 = ["onClick"];
-const _hoisted_3 = { class: "iho-table__filterFooter" };
+const _hoisted_1 = { style: { "display": "flex", "align-items": "center" } };
+const _hoisted_2 = { class: "iho-table__filterWrapper" };
+const _hoisted_3 = ["onClick"];
+const _hoisted_4 = { class: "iho-table__filterFooter" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "filter",
   props: {
@@ -89,7 +90,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     }
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("section", null, [
+      return openBlock(), createElementBlock("section", _hoisted_1, [
         createVNode(unref(NEllipsis), { style: { "max-width": "calc(100% - 22px)" } }, {
           default: withCtx(() => [
             createTextVNode(toDisplayString(__props.payload.column.title), 1)
@@ -103,18 +104,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           trigger: withCtx(() => [
             createVNode(unref(NIcon), {
               class: normalizeClass(["iho-table__filterIcon", { "is-active": unref(iconActive) }]),
-              component: unref(Filter),
+              component: unref(FunnelSharp),
               onClick: toggleFilter
             }, null, 8, ["class", "component"])
           ]),
           default: withCtx(() => [
-            createElementVNode("section", _hoisted_1, [
+            createElementVNode("section", _hoisted_2, [
               (openBlock(), createElementBlock(Fragment, null, renderList(sortStatusList, (item) => {
                 return createElementVNode("div", {
                   key: item.status,
                   class: normalizeClass(["iho-table__filterButton", { "iho-table__filterButton--active": unref(sortStatus) === item.status }]),
                   onClick: ($event) => setSortStatus(item.status)
-                }, toDisplayString(item.text), 11, _hoisted_2);
+                }, toDisplayString(item.text), 11, _hoisted_3);
               }), 64)),
               createVNode(unref(NInput), {
                 value: searchFilterText.value,
@@ -150,7 +151,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 ]),
                 _: 1
               }, 8, ["value"]),
-              createElementVNode("footer", _hoisted_3, [
+              createElementVNode("footer", _hoisted_4, [
                 createElementVNode("section", null, toDisplayString(`\u5DF2\u9009\u62E9${unref(checked).length}\u9879`), 1),
                 createVNode(unref(NButtonGroup), { size: "tiny" }, {
                   default: withCtx(() => [