bkui-vue 2.0.1-beta.60.fix.1 → 2.0.1-beta.61

package/lib/table/utils.d.ts

@@ -1,4 +1,4 @@
-import { Column, GroupColumn, ISortPropShape, TablePropTypes } from './props';
+import { Column, GroupColumn, ISortPropShape, ISortShape, TablePropTypes } from './props';
 /**
  * 解析Prop值 | 可能为多种类型 & 函数返回的场景
  * @param prop 当前Prop
@@ -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
@@ -80,24 +80,24 @@ export declare const resolveHeadConfig: (props: TablePropTypes) => {
  * @param index 当前行Index
  * @returns
  */
-export declare const getRowText: (row: any, key: string, format?: (() => boolean | number | string)[] | string[]) => any;
+export declare const getRowText: (row: Record<string, unknown>, key: string, format?: (() => boolean | number | string)[] | string[]) => any;
 /**
  * 获取当前行指定列的值
  * @param row 当前行
  * @param key 指定列名
  * @returns
  */
-export declare const getRowValue: (row: any, key: string) => any;
+export declare const getRowValue: (row: Record<string, unknown>, key: string) => unknown;
 /**
  * 格式化prop配置为标准数组格式
  * @param prop prop对象值
  * @param args 如果是function参数
  * @returns
  */
-export declare const formatPropAsArray: (prop: (() => any) | object | string, args: any[]) => any;
+export declare const formatPropAsArray: (prop: (() => unknown) | object | string, args: unknown[]) => 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;
+export declare const getRowKey: (item: Record<string, unknown>, props: TablePropTypes, index: number) => any;
+export declare const getRowKeyNull: (item: Record<string, unknown>, props: TablePropTypes, index: number) => unknown;
 export declare const hasRootScrollY: (root: any, querySelector: string, offsetHeight?: number) => boolean;
 export declare const getColumnClass: (column: Column, colIndex?: number, uuid?: string) => {
     column_fixed: boolean;
@@ -106,31 +106,58 @@ export declare const getColumnClass: (column: Column, colIndex?: number, uuid?:
 };
 export declare const getElementTextWidth: (element: HTMLElement, text?: string) => any;
 export declare const isColumnHidden: (settingFields: any, column: any, checked: any) => boolean;
-export declare const resolveColumnSpan: (column: Column, colIndex: number, row: any, rowIndex: number, key: string) => any;
-export declare const resolveCellSpan: (column: Column, colIndex: number, row: any, rowIndex: number) => {
-    colspan: any;
-    rowspan: any;
+export declare const resolveColumnSpan: (column: Column, colIndex: number, row: Record<string, unknown>, rowIndex: number, key: string) => number;
+export declare const resolveCellSpan: (column: Column, colIndex: number, row: Record<string, unknown>, rowIndex: number) => {
+    colspan: number;
+    rowspan: number;
 };
-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 skipThisColumn: (columns: Column[], colIndex: number, row: Record<string, unknown>, rowIndex: number) => number | false;
+export declare const getSortFn: (column: any, sortType: any, format?: any[]) => ((_a: any, _b: any) => boolean) | ((a: Record<string, unknown>, b: Record<string, unknown>, index0: number, index1: number) => 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);
-} & import("./props").ISortShape) | {
-    sortFn?: Function;
+    sortFn: ((_a: any, _b: any) => boolean) | ((a: Record<string, unknown>, b: Record<string, unknown>, index0: number, index1: number) => number);
+} & ISortShape) | {
+    sortFn?: (...args: any[]) => number;
     sortScope?: import("./props").SortScope;
     value: string;
 };
 export declare const isRowSelectEnable: (props: any, { row, index, isCheckAll }: {
-    row: any;
+    row: Record<string, unknown>;
     index?: number;
     isCheckAll?: boolean;
 }) => any;
 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[]) => number) | ((((_a: any, _b: any) => boolean) | ((a: Record<string, unknown>, b: Record<string, unknown>, index0: number, index1: number) => number)) & ((...args: any[]) => number));
     scope: import("./props").SortScope;
     active: boolean;
+    enabled: boolean;
+};
+export declare const resolveColumnFilterProp: (col: Column) => {
+    enabled: boolean;
+    list: {
+        label: string;
+        text?: 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

@@ -38,50 +38,7 @@ declare const BkTableColumn: {
         } & {
             default: number;
         };
-    }>>, {
-        column: {
-            fixed?: boolean | "left" | "right";
-            resizable?: boolean;
-            minWidth?: string | number;
-            index?: number;
-            columnKey?: string;
-            colspan?: import("../table/props").SpanFunctionString;
-            rowspan?: import("../table/props").SpanFunctionString;
-            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" | "expand" | "__COL_TYPE_NONE" | "selection";
-            label?: import("../table/props").LabelFunctionString;
-            width?: string | number;
-            className?: import("../table/props").RowClassFunctionString;
-            align?: "" | "left" | "right" | "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<{
+    }>>, void, 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>;
@@ -174,50 +131,7 @@ declare const BkTableColumn: {
         } & {
             default: number;
         };
-    }>>, {
-        column: {
-            fixed?: boolean | "left" | "right";
-            resizable?: boolean;
-            minWidth?: string | number;
-            index?: number;
-            columnKey?: string;
-            colspan?: import("../table/props").SpanFunctionString;
-            rowspan?: import("../table/props").SpanFunctionString;
-            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" | "expand" | "__COL_TYPE_NONE" | "selection";
-            label?: import("../table/props").LabelFunctionString;
-            width?: string | number;
-            className?: import("../table/props").RowClassFunctionString;
-            align?: "" | "left" | "right" | "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 | "left" | "right";
         resizable: boolean;
         minWidth: string | number;
@@ -268,50 +182,7 @@ declare const BkTableColumn: {
     } & {
         default: number;
     };
-}>>, {
-    column: {
-        fixed?: boolean | "left" | "right";
-        resizable?: boolean;
-        minWidth?: string | number;
-        index?: number;
-        columnKey?: string;
-        colspan?: import("../table/props").SpanFunctionString;
-        rowspan?: import("../table/props").SpanFunctionString;
-        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" | "expand" | "__COL_TYPE_NONE" | "selection";
-        label?: import("../table/props").LabelFunctionString;
-        width?: string | number;
-        className?: import("../table/props").RowClassFunctionString;
-        align?: "" | "left" | "right" | "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, {
+}>>, void, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, {
     fixed: boolean | "left" | "right";
     resizable: boolean;
     minWidth: string | number;