bkui-vue 2.0.1-beta.3 → 2.0.1-beta.30

package/lib/table/utils.d.ts

@@ -6,7 +6,7 @@ import { Column, GroupColumn, ISortPropShape, TablePropTypes } from './props';
  * @param args 如果是函数，传递参数
  * @returns
  */
-export declare const resolvePropVal: (prop: any, key: string | string[], args: any[]) => any;
+export declare const resolvePropVal: (prop: Record<string, unknown>, key: string | string[], args: unknown[]) => any;
 /**
  * 处理Props中的ActiveColumn，解析为统一的数组格式
  * @param props
@@ -19,7 +19,7 @@ export declare const resolveActiveColumns: (props: TablePropTypes) => number[];
  * @returns
  */
 export declare const resolveNumberToNumArray: (prop: number) => number[];
-export declare const resolveWidth: (propWidth: string | number) => string | number;
+export declare const resolveWidth: (propWidth: number | string) => string | number;
 /**
  * 解析可为数字或者字符串设置的样式配置
  * @param val 配置值
@@ -27,7 +27,7 @@ export declare const resolveWidth: (propWidth: string | number) => string | numb
  * @param offset 偏移量
  * @returns 标准化px string
  */
-export declare const resolveNumberOrStringToPix: (val: string | number, defaultValue?: string | number, offset?: any) => string | number;
+export declare const resolveNumberOrStringToPix: (val: number | string, defaultValue?: number | string, offset?: any) => string | number;
 /**
  * 格式化Border配置为标准Class
  * @param val
@@ -62,7 +62,7 @@ export declare const observerResize: (root: HTMLElement, callbackFn: () => void,
  * @param val
  * @returns
  */
-export declare const isPercentPixOrNumber: (val: string | number) => boolean;
+export declare const isPercentPixOrNumber: (val: number | string) => boolean;
 /**
  * Format Table Head Option
  * @param props
@@ -80,7 +80,7 @@ export declare const resolveHeadConfig: (props: TablePropTypes) => {
  * @param index 当前行Index
  * @returns
  */
-export declare const getRowText: (row: any, key: string, format?: string[] | (() => string | number | boolean)[]) => any;
+export declare const getRowText: (row: any, key: string, format?: (() => boolean | number | string)[] | string[]) => any;
 /**
  * 获取当前行指定列的值
  * @param row 当前行
@@ -94,7 +94,7 @@ export declare const getRowValue: (row: any, key: string) => any;
  * @param args 如果是function参数
  * @returns
  */
-export declare const formatPropAsArray: (prop: string | object | (() => any), args: any[]) => any;
+export declare const formatPropAsArray: (prop: (() => any) | object | string, args: any[]) => any;
 export declare const isRenderScrollBottomLoading: (props: TablePropTypes) => boolean;
 export declare const getRowKey: (item: any, props: TablePropTypes, index: number) => any;
 export declare const getRowKeyNull: (item: any, props: TablePropTypes, index: number) => unknown;
@@ -112,12 +112,12 @@ export declare const resolveCellSpan: (column: Column, colIndex: number, row: an
     rowspan: any;
 };
 export declare const skipThisColumn: (columns: Column[], colIndex: number, row: any, rowIndex: number) => number | false;
-export declare const getSortFn: (column: any, sortType: any, format?: any[]) => ((_a: any, _b: any) => boolean) | ((_a: any, _b: any) => number);
+export declare const getSortFn: (column: any, sortType: any, format?: any[]) => ((_a: any, _b: any) => boolean) | ((_a: any, _b: any, index0: any, index1: any) => number);
 export declare const getNextSortType: (sortType: string) => string;
 export declare const resolveSort: (sort: ISortPropShape, column: any, format?: any[]) => ({
-    sortFn: ((_a: any, _b: any) => boolean) | ((_a: any, _b: any) => number);
+    sortFn: ((_a: any, _b: any) => boolean) | ((_a: any, _b: any, index0: any, index1: any) => number);
 } & import("./props").ISortShape) | {
-    sortFn?: Function;
+    sortFn?: (...args: any[]) => boolean;
     sortScope?: import("./props").SortScope;
     value: string;
 };
@@ -129,8 +129,34 @@ export declare const isRowSelectEnable: (props: any, { row, index, isCheckAll }:
 export declare const getRowId: (row: any, defVal: any, props: any) => any;
 export declare const resolveColumnSortProp: (col: Column, props: TablePropTypes) => {
     type: string;
-    fn: Function | ((((_a: any, _b: any) => boolean) | ((_a: any, _b: any) => number)) & Function);
+    fn: ((...args: any[]) => boolean) | ((((_a: any, _b: any) => boolean) | ((_a: any, _b: any, index0: any, index1: any) => number)) & ((...args: any[]) => boolean));
     scope: import("./props").SortScope;
     active: boolean;
+    enabled: boolean;
+};
+export declare const resolveColumnFilterProp: (col: Column) => {
+    enabled: boolean;
+    list: {
+        label: string;
+        value: string;
+    }[];
+    filterFn?: (...args: any[]) => boolean;
+    match?: import("./props").FullEnum;
+    checked?: string[];
+    filterScope?: import("./props").SortScope;
+    btnSave?: string | boolean;
+    btnReset?: string | boolean;
+    height?: number;
+    maxHeight?: number;
+} | {
+    enabled: boolean;
+    checked: any[];
 };
 export declare const getRawData: (data: any) => any;
+/**
+ * 转换 px | % 为实际数值
+ * @param val
+ * @param parentVal
+ * @returns
+ */
+export declare const getNumberOrPercentValue: (val: number | string, parentVal?: number) => number;

package/lib/table-column/index.d.ts

@@ -13,34 +13,24 @@ declare const BkTableColumn: {
             default: string;
         };
         showOverflowTooltip: import("vue-types").VueTypeDef<import("../table/props").IOverflowTooltipProp>;
-        type: import("vue-types").VueTypeDef<"index" | "selection" | "expand" | "__COL_TYPE_NONE">;
+        type: import("vue-types").VueTypeDef<"index" | "expand" | "__COL_TYPE_NONE" | "selection">;
         resizable: import("vue-types").VueTypeValidableDef<boolean> & {
             default: boolean;
         } & {
             default: boolean;
         };
-        fixed: import("vue-types").VueTypeDef<boolean | "right" | "left"> & {
-            default: boolean | "right" | "left";
+        fixed: import("vue-types").VueTypeDef<boolean | "left" | "right"> & {
+            default: boolean | "left" | "right";
         };
         sort: import("vue-types").VueTypeDef<import("../table/props").ISortPropShape>;
         filter: import("vue-types").VueTypeDef<import("../table/props").IFilterPropShape>;
         colspan: import("vue-types").VueTypeDef<import("../table/props").SpanFunctionString> & {
-            default: (({ column, colIndex, row, rowIndex }: {
-                column: any;
-                colIndex: any;
-                row: any;
-                rowIndex: any;
-            }) => number) | (() => Number);
+            default: import("../table/props").SpanFunctionString;
         };
         rowspan: import("vue-types").VueTypeDef<import("../table/props").SpanFunctionString> & {
-            default: (({ column, colIndex, row, rowIndex }: {
-                column: any;
-                colIndex: any;
-                row: any;
-                rowIndex: any;
-            }) => number) | (() => Number);
+            default: import("../table/props").SpanFunctionString;
         };
-        align: import("vue-types").VueTypeDef<"" | "right" | "left" | "center">;
+        align: import("vue-types").VueTypeDef<"" | "left" | "right" | "center">;
         className: import("vue-types").VueTypeDef<import("../table/props").RowClassFunctionString>;
         prop: import("vue-types").VueTypeDef<import("../table/props").LabelFunctionString>;
         index: import("vue-types").VueTypeValidableDef<number> & {
@@ -48,80 +38,9 @@ declare const BkTableColumn: {
         } & {
             default: number;
         };
-    }>>, {
-        column: {
-            fixed?: boolean | "right" | "left";
-            resizable?: boolean;
-            minWidth?: string | number;
-            index?: number;
-            columnKey?: string;
-            colspan?: (({ column, colIndex, row, rowIndex }: {
-                column: any;
-                colIndex: any;
-                row: any;
-                rowIndex: any;
-            }) => number) | {
-                toString: (radix?: number) => string;
-                toFixed: (fractionDigits?: number) => string;
-                toExponential: (fractionDigits?: number) => string;
-                toPrecision: (precision?: number) => string;
-                valueOf: () => number;
-                toLocaleString: {
-                    (locales?: string | string[], options?: Intl.NumberFormatOptions): string;
-                    (locales?: Intl.LocalesArgument, options?: Intl.NumberFormatOptions): string;
-                };
-            };
-            rowspan?: (({ column, colIndex, row, rowIndex }: {
-                column: any;
-                colIndex: any;
-                row: any;
-                rowIndex: any;
-            }) => number) | {
-                toString: (radix?: number) => string;
-                toFixed: (fractionDigits?: number) => string;
-                toExponential: (fractionDigits?: number) => string;
-                toPrecision: (precision?: number) => string;
-                valueOf: () => number;
-                toLocaleString: {
-                    (locales?: string | string[], options?: Intl.NumberFormatOptions): string;
-                    (locales?: Intl.LocalesArgument, options?: Intl.NumberFormatOptions): string;
-                };
-            };
-            render?: import("../table/props").RenderFunctionString;
-            sort?: string | boolean | {
-                sortFn?: Function;
-                sortScope?: import("../table/props").SortScope;
-                value?: import("../table/const").SORT_OPTION;
-            };
-            filter?: string | boolean | {
-                list: any[];
-                filterFn?: Function;
-                match?: import("../table/props").FullEnum;
-                checked?: any[];
-                filterScope?: import("../table/props").SortScope;
-                btnSave?: string | boolean;
-                btnReset?: string | boolean;
-                height?: number;
-                maxHeight?: number;
-            };
-            type?: "index" | "selection" | "expand" | "__COL_TYPE_NONE";
-            label?: import("../table/props").LabelFunctionString;
-            width?: string | number;
-            className?: import("../table/props").RowClassFunctionString;
-            align?: "" | "right" | "left" | "center";
-            showOverflowTooltip?: boolean | {
-                content: string | ((col: import("../../bkui-vue").TableIColumn, row: any) => string);
-                disabled?: boolean | ((col: import("../../bkui-vue").TableIColumn, row: any) => boolean);
-                watchCellResize?: boolean;
-                mode?: "auto" | "static";
-                popoverOption?: any;
-                resizerWay?: import("../table/props").ResizerWay;
-                showHead?: boolean;
-            };
-            field: import("../table/props").LabelFunctionString;
-            prop?: import("../table/props").LabelFunctionString;
-        };
-    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & Readonly<import("vue").ExtractPropTypes<{
+    }>>, () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        [key: string]: any;
+    }>[], unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & Readonly<import("vue").ExtractPropTypes<{
         label: import("vue-types").VueTypeDef<import("../table/props").LabelFunctionString>;
         field: import("vue-types").VueTypeDef<import("../table/props").LabelFunctionString>;
         render: import("vue-types").VueTypeDef<import("../table/props").RenderFunctionString>;
@@ -135,34 +54,24 @@ declare const BkTableColumn: {
             default: string;
         };
         showOverflowTooltip: import("vue-types").VueTypeDef<import("../table/props").IOverflowTooltipProp>;
-        type: import("vue-types").VueTypeDef<"index" | "selection" | "expand" | "__COL_TYPE_NONE">;
+        type: import("vue-types").VueTypeDef<"index" | "expand" | "__COL_TYPE_NONE" | "selection">;
         resizable: import("vue-types").VueTypeValidableDef<boolean> & {
             default: boolean;
         } & {
             default: boolean;
         };
-        fixed: import("vue-types").VueTypeDef<boolean | "right" | "left"> & {
-            default: boolean | "right" | "left";
+        fixed: import("vue-types").VueTypeDef<boolean | "left" | "right"> & {
+            default: boolean | "left" | "right";
         };
         sort: import("vue-types").VueTypeDef<import("../table/props").ISortPropShape>;
         filter: import("vue-types").VueTypeDef<import("../table/props").IFilterPropShape>;
         colspan: import("vue-types").VueTypeDef<import("../table/props").SpanFunctionString> & {
-            default: (({ column, colIndex, row, rowIndex }: {
-                column: any;
-                colIndex: any;
-                row: any;
-                rowIndex: any;
-            }) => number) | (() => Number);
+            default: import("../table/props").SpanFunctionString;
         };
         rowspan: import("vue-types").VueTypeDef<import("../table/props").SpanFunctionString> & {
-            default: (({ column, colIndex, row, rowIndex }: {
-                column: any;
-                colIndex: any;
-                row: any;
-                rowIndex: any;
-            }) => number) | (() => Number);
+            default: import("../table/props").SpanFunctionString;
         };
-        align: import("vue-types").VueTypeDef<"" | "right" | "left" | "center">;
+        align: import("vue-types").VueTypeDef<"" | "left" | "right" | "center">;
         className: import("vue-types").VueTypeDef<import("../table/props").RowClassFunctionString>;
         prop: import("vue-types").VueTypeDef<import("../table/props").LabelFunctionString>;
         index: import("vue-types").VueTypeValidableDef<number> & {
@@ -171,7 +80,7 @@ declare const BkTableColumn: {
             default: number;
         };
     }>>, {
-        fixed: boolean | "right" | "left";
+        fixed: boolean | "left" | "right";
         resizable: boolean;
         minWidth: string | number;
         index: number;
@@ -199,34 +108,24 @@ declare const BkTableColumn: {
             default: string;
         };
         showOverflowTooltip: import("vue-types").VueTypeDef<import("../table/props").IOverflowTooltipProp>;
-        type: import("vue-types").VueTypeDef<"index" | "selection" | "expand" | "__COL_TYPE_NONE">;
+        type: import("vue-types").VueTypeDef<"index" | "expand" | "__COL_TYPE_NONE" | "selection">;
         resizable: import("vue-types").VueTypeValidableDef<boolean> & {
             default: boolean;
         } & {
             default: boolean;
         };
-        fixed: import("vue-types").VueTypeDef<boolean | "right" | "left"> & {
-            default: boolean | "right" | "left";
+        fixed: import("vue-types").VueTypeDef<boolean | "left" | "right"> & {
+            default: boolean | "left" | "right";
         };
         sort: import("vue-types").VueTypeDef<import("../table/props").ISortPropShape>;
         filter: import("vue-types").VueTypeDef<import("../table/props").IFilterPropShape>;
         colspan: import("vue-types").VueTypeDef<import("../table/props").SpanFunctionString> & {
-            default: (({ column, colIndex, row, rowIndex }: {
-                column: any;
-                colIndex: any;
-                row: any;
-                rowIndex: any;
-            }) => number) | (() => Number);
+            default: import("../table/props").SpanFunctionString;
         };
         rowspan: import("vue-types").VueTypeDef<import("../table/props").SpanFunctionString> & {
-            default: (({ column, colIndex, row, rowIndex }: {
-                column: any;
-                colIndex: any;
-                row: any;
-                rowIndex: any;
-            }) => number) | (() => Number);
+            default: import("../table/props").SpanFunctionString;
         };
-        align: import("vue-types").VueTypeDef<"" | "right" | "left" | "center">;
+        align: import("vue-types").VueTypeDef<"" | "left" | "right" | "center">;
         className: import("vue-types").VueTypeDef<import("../table/props").RowClassFunctionString>;
         prop: import("vue-types").VueTypeDef<import("../table/props").LabelFunctionString>;
         index: import("vue-types").VueTypeValidableDef<number> & {
@@ -234,81 +133,10 @@ declare const BkTableColumn: {
         } & {
             default: number;
         };
-    }>>, {
-        column: {
-            fixed?: boolean | "right" | "left";
-            resizable?: boolean;
-            minWidth?: string | number;
-            index?: number;
-            columnKey?: string;
-            colspan?: (({ column, colIndex, row, rowIndex }: {
-                column: any;
-                colIndex: any;
-                row: any;
-                rowIndex: any;
-            }) => number) | {
-                toString: (radix?: number) => string;
-                toFixed: (fractionDigits?: number) => string;
-                toExponential: (fractionDigits?: number) => string;
-                toPrecision: (precision?: number) => string;
-                valueOf: () => number;
-                toLocaleString: {
-                    (locales?: string | string[], options?: Intl.NumberFormatOptions): string;
-                    (locales?: Intl.LocalesArgument, options?: Intl.NumberFormatOptions): string;
-                };
-            };
-            rowspan?: (({ column, colIndex, row, rowIndex }: {
-                column: any;
-                colIndex: any;
-                row: any;
-                rowIndex: any;
-            }) => number) | {
-                toString: (radix?: number) => string;
-                toFixed: (fractionDigits?: number) => string;
-                toExponential: (fractionDigits?: number) => string;
-                toPrecision: (precision?: number) => string;
-                valueOf: () => number;
-                toLocaleString: {
-                    (locales?: string | string[], options?: Intl.NumberFormatOptions): string;
-                    (locales?: Intl.LocalesArgument, options?: Intl.NumberFormatOptions): string;
-                };
-            };
-            render?: import("../table/props").RenderFunctionString;
-            sort?: string | boolean | {
-                sortFn?: Function;
-                sortScope?: import("../table/props").SortScope;
-                value?: import("../table/const").SORT_OPTION;
-            };
-            filter?: string | boolean | {
-                list: any[];
-                filterFn?: Function;
-                match?: import("../table/props").FullEnum;
-                checked?: any[];
-                filterScope?: import("../table/props").SortScope;
-                btnSave?: string | boolean;
-                btnReset?: string | boolean;
-                height?: number;
-                maxHeight?: number;
-            };
-            type?: "index" | "selection" | "expand" | "__COL_TYPE_NONE";
-            label?: import("../table/props").LabelFunctionString;
-            width?: string | number;
-            className?: import("../table/props").RowClassFunctionString;
-            align?: "" | "right" | "left" | "center";
-            showOverflowTooltip?: boolean | {
-                content: string | ((col: import("../../bkui-vue").TableIColumn, row: any) => string);
-                disabled?: boolean | ((col: import("../../bkui-vue").TableIColumn, row: any) => boolean);
-                watchCellResize?: boolean;
-                mode?: "auto" | "static";
-                popoverOption?: any;
-                resizerWay?: import("../table/props").ResizerWay;
-                showHead?: boolean;
-            };
-            field: import("../table/props").LabelFunctionString;
-            prop?: import("../table/props").LabelFunctionString;
-        };
-    }, {}, {}, {}, {
-        fixed: boolean | "right" | "left";
+    }>>, () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        [key: string]: any;
+    }>[], {}, {}, {}, {
+        fixed: boolean | "left" | "right";
         resizable: boolean;
         minWidth: string | number;
         index: number;
@@ -333,34 +161,24 @@ declare const BkTableColumn: {
         default: string;
     };
     showOverflowTooltip: import("vue-types").VueTypeDef<import("../table/props").IOverflowTooltipProp>;
-    type: import("vue-types").VueTypeDef<"index" | "selection" | "expand" | "__COL_TYPE_NONE">;
+    type: import("vue-types").VueTypeDef<"index" | "expand" | "__COL_TYPE_NONE" | "selection">;
     resizable: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     } & {
         default: boolean;
     };
-    fixed: import("vue-types").VueTypeDef<boolean | "right" | "left"> & {
-        default: boolean | "right" | "left";
+    fixed: import("vue-types").VueTypeDef<boolean | "left" | "right"> & {
+        default: boolean | "left" | "right";
     };
     sort: import("vue-types").VueTypeDef<import("../table/props").ISortPropShape>;
     filter: import("vue-types").VueTypeDef<import("../table/props").IFilterPropShape>;
     colspan: import("vue-types").VueTypeDef<import("../table/props").SpanFunctionString> & {
-        default: (({ column, colIndex, row, rowIndex }: {
-            column: any;
-            colIndex: any;
-            row: any;
-            rowIndex: any;
-        }) => number) | (() => Number);
+        default: import("../table/props").SpanFunctionString;
     };
     rowspan: import("vue-types").VueTypeDef<import("../table/props").SpanFunctionString> & {
-        default: (({ column, colIndex, row, rowIndex }: {
-            column: any;
-            colIndex: any;
-            row: any;
-            rowIndex: any;
-        }) => number) | (() => Number);
+        default: import("../table/props").SpanFunctionString;
     };
-    align: import("vue-types").VueTypeDef<"" | "right" | "left" | "center">;
+    align: import("vue-types").VueTypeDef<"" | "left" | "right" | "center">;
     className: import("vue-types").VueTypeDef<import("../table/props").RowClassFunctionString>;
     prop: import("vue-types").VueTypeDef<import("../table/props").LabelFunctionString>;
     index: import("vue-types").VueTypeValidableDef<number> & {
@@ -368,81 +186,10 @@ declare const BkTableColumn: {
     } & {
         default: number;
     };
-}>>, {
-    column: {
-        fixed?: boolean | "right" | "left";
-        resizable?: boolean;
-        minWidth?: string | number;
-        index?: number;
-        columnKey?: string;
-        colspan?: (({ column, colIndex, row, rowIndex }: {
-            column: any;
-            colIndex: any;
-            row: any;
-            rowIndex: any;
-        }) => number) | {
-            toString: (radix?: number) => string;
-            toFixed: (fractionDigits?: number) => string;
-            toExponential: (fractionDigits?: number) => string;
-            toPrecision: (precision?: number) => string;
-            valueOf: () => number;
-            toLocaleString: {
-                (locales?: string | string[], options?: Intl.NumberFormatOptions): string;
-                (locales?: Intl.LocalesArgument, options?: Intl.NumberFormatOptions): string;
-            };
-        };
-        rowspan?: (({ column, colIndex, row, rowIndex }: {
-            column: any;
-            colIndex: any;
-            row: any;
-            rowIndex: any;
-        }) => number) | {
-            toString: (radix?: number) => string;
-            toFixed: (fractionDigits?: number) => string;
-            toExponential: (fractionDigits?: number) => string;
-            toPrecision: (precision?: number) => string;
-            valueOf: () => number;
-            toLocaleString: {
-                (locales?: string | string[], options?: Intl.NumberFormatOptions): string;
-                (locales?: Intl.LocalesArgument, options?: Intl.NumberFormatOptions): string;
-            };
-        };
-        render?: import("../table/props").RenderFunctionString;
-        sort?: string | boolean | {
-            sortFn?: Function;
-            sortScope?: import("../table/props").SortScope;
-            value?: import("../table/const").SORT_OPTION;
-        };
-        filter?: string | boolean | {
-            list: any[];
-            filterFn?: Function;
-            match?: import("../table/props").FullEnum;
-            checked?: any[];
-            filterScope?: import("../table/props").SortScope;
-            btnSave?: string | boolean;
-            btnReset?: string | boolean;
-            height?: number;
-            maxHeight?: number;
-        };
-        type?: "index" | "selection" | "expand" | "__COL_TYPE_NONE";
-        label?: import("../table/props").LabelFunctionString;
-        width?: string | number;
-        className?: import("../table/props").RowClassFunctionString;
-        align?: "" | "right" | "left" | "center";
-        showOverflowTooltip?: boolean | {
-            content: string | ((col: import("../../bkui-vue").TableIColumn, row: any) => string);
-            disabled?: boolean | ((col: import("../../bkui-vue").TableIColumn, row: any) => boolean);
-            watchCellResize?: boolean;
-            mode?: "auto" | "static";
-            popoverOption?: any;
-            resizerWay?: import("../table/props").ResizerWay;
-            showHead?: boolean;
-        };
-        field: import("../table/props").LabelFunctionString;
-        prop?: import("../table/props").LabelFunctionString;
-    };
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, {
-    fixed: boolean | "right" | "left";
+}>>, () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    [key: string]: any;
+}>[], unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, {
+    fixed: boolean | "left" | "right";
     resizable: boolean;
     minWidth: string | number;
     index: number;