ele-admin-plus 1.2.1-beta.2 → 1.2.1-beta.4

package/lib/ele-data-table/index.d.ts

@@ -1,4 +1,5 @@
-import { ElTableInstance } from '../ele-app/el';
+import { ElTableInstance, ElTableProps } from '../ele-app/el';
+import { getBodyRowClass, getHeadRowClass } from './util';
 import { DataKey, DataItem, Column, Columns, Sorter, Filter } from './types';
 
 declare const _default: import('vue').DefineComponent<{
@@ -11,7 +12,7 @@ declare const _default: import('vue').DefineComponent<{
         default: null;
     };
     rowKey: {
-        type: import('vue').PropType<string | ((row: DataItem) => string) | undefined>;
+        type: import('vue').PropType<import('./types').RowKey>;
         required: boolean;
     };
     columns: {
@@ -42,7 +43,7 @@ declare const _default: import('vue').DefineComponent<{
     selectedRowKeys: import('vue').PropType<DataKey[]>;
     cacheData: import('vue').PropType<DataItem[]>;
     size: {
-        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
+        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -51,14 +52,14 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    width: (StringConstructor | NumberConstructor)[];
-    maxHeight: (StringConstructor | NumberConstructor)[];
+    width: (NumberConstructor | StringConstructor)[];
+    maxHeight: (NumberConstructor | StringConstructor)[];
     lazy: BooleanConstructor;
     className: {
         type: StringConstructor;
         default: string;
     };
-    height: (StringConstructor | NumberConstructor)[];
+    height: (NumberConstructor | StringConstructor)[];
     data: {
         type: import('vue').PropType<any[]>;
         default: () => never[];
@@ -79,13 +80,13 @@ declare const _default: import('vue').DefineComponent<{
     headerCellClassName: import('vue').PropType<import('element-plus').CellCls<any> | undefined>;
     headerCellStyle: import('vue').PropType<import('element-plus').CellStyle<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
-    currentRowKey: (StringConstructor | NumberConstructor)[];
+    currentRowKey: (NumberConstructor | StringConstructor)[];
     emptyText: StringConstructor;
-    expandRowKeys: import('vue').PropType<any[] | undefined>;
+    expandRowKeys: import('vue').PropType<string[] | undefined>;
     defaultExpandAll: BooleanConstructor;
     defaultSort: import('vue').PropType<import('element-plus').Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import('vue').PropType<Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    tooltipOptions: import('vue').PropType<Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "transition" | "placement" | "effect" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "popperClass" | "appendTo" | "showArrow">> | undefined>;
     spanMethod: import('vue').PropType<((data: {
         row: any;
         rowIndex: number;
@@ -104,13 +105,11 @@ declare const _default: import('vue').DefineComponent<{
         default: number;
     };
     treeProps: {
-        type: import('vue').PropType<{
-            hasChildren?: string | undefined;
-            children?: string | undefined;
-        } | undefined>;
+        type: import('vue').PropType<import('element-plus/es/components/table/src/table/defaults').TreeProps | undefined>;
         default: () => {
             hasChildren: string;
             children: string;
+            checkStrictly: boolean;
         };
     };
     load: import('vue').PropType<((row: any, treeNode: import('element-plus').TreeNode, resolve: (data: any[]) => void) => void) | undefined>;
@@ -120,8 +119,194 @@ declare const _default: import('vue').DefineComponent<{
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: import('vue').PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    showOverflowTooltip: import('vue').PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "transition" | "placement" | "effect" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "popperClass" | "appendTo" | "showArrow">> | undefined>;
 }, {
+    isLayoutFixedHead: import('vue').ComputedRef<boolean | undefined>;
+    isLayoutMaximized: import('vue').ComputedRef<boolean | undefined>;
+    tableRef: import('vue').Ref<ElTableInstance>;
+    tableCols: import('vue').Ref<{
+        filterPlacement?: import('../ele-app/plus').EleTooltipProps["placement"];
+        uid?: string | undefined;
+        slot?: string | undefined;
+        headerSlot?: string | undefined;
+        hideInTable?: boolean | undefined;
+        hideInSetting?: boolean | undefined;
+        hideInExport?: boolean | undefined;
+        hideInPrint?: boolean | undefined;
+        printSlot?: string | undefined;
+        printHeaderSlot?: string | undefined;
+        children?: any[] | undefined;
+        type?: string | undefined;
+        filterMethod?: import('element-plus/es/components/table/src/table-column/defaults').FilterMethods<any> | undefined;
+        width?: string | number | undefined;
+        label?: string | undefined;
+        prop?: string | undefined;
+        formatter?: ((row: any, column: import('element-plus').TableColumnCtx<any>, cellValue: any, index: number) => string | import('vue').VNode<import('vue').RendererNode, import('vue').RendererElement, {
+            [key: string]: any;
+        }>) | undefined;
+        index?: number | ((index: number) => number) | undefined;
+        className?: string | undefined;
+        fixed?: string | boolean | undefined;
+        align?: string | undefined;
+        showOverflowTooltip?: boolean | {
+            effect?: string | undefined;
+            placement?: import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, import('element-plus').Placement, unknown> | undefined;
+            popperClass?: import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | any)[])[])[])[])[])[])[])[])[])[])[]) & {}) | (() => string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | any)[])[])[])[])[])[])[])[])[])[])[]) | ((new (...args: any[]) => (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | any)[])[])[])[])[])[])[])[])[])[])[]) & {}) | (() => string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | (string | {
+                [x: string]: boolean;
+            } | any)[])[])[])[])[])[])[])[])[])[])[]))[], unknown, unknown> | undefined;
+            offset?: number | undefined;
+            appendTo?: import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | HTMLElement) & {}) | (() => string | HTMLElement) | ((new (...args: any[]) => (string | HTMLElement) & {}) | (() => string | HTMLElement))[], unknown, unknown> | undefined;
+            popperOptions?: {
+                placement?: import('element-plus').Placement | undefined;
+                modifiers?: {
+                    name?: any;
+                    enabled?: boolean | undefined;
+                    phase?: import('@popperjs/core').ModifierPhases | undefined;
+                    requires?: Array<string> | undefined;
+                    requiresIfExists?: Array<string> | undefined;
+                    fn?: ((arg0: import('@popperjs/core').ModifierArguments<any>) => import('@popperjs/core').State | void) | undefined;
+                    effect?: ((arg0: import('@popperjs/core').ModifierArguments<any>) => (() => void) | void) | undefined;
+                    options?: Partial<any> | undefined;
+                    data?: import('@popperjs/core').Obj | undefined;
+                }[] | undefined;
+                strategy?: import('@popperjs/core').PositioningStrategy | undefined;
+                onFirstUpdate?: ((arg0: Partial<import('@popperjs/core').State>) => void) | undefined;
+            } | undefined;
+            transition?: string | undefined;
+            enterable?: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown> | undefined;
+            showAfter?: number | undefined;
+            hideAfter?: number | undefined;
+            showArrow?: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown> | undefined;
+        } | undefined;
+        labelClassName?: string | undefined;
+        property?: string | undefined;
+        minWidth?: string | number | undefined;
+        renderHeader?: ((data: {
+            column: import('element-plus').TableColumnCtx<any>;
+            $index: number;
+        }) => import('vue').VNode<import('vue').RendererNode, import('vue').RendererElement, {
+            [key: string]: any;
+        }>) | undefined;
+        sortable?: string | boolean | undefined;
+        sortMethod?: ((a: any, b: any) => number) | undefined;
+        sortBy?: string | string[] | ((row: any, index: number) => string) | undefined;
+        resizable?: boolean | undefined;
+        columnKey?: string | undefined;
+        headerAlign?: string | undefined;
+        selectable?: ((row: any, index: number) => boolean) | undefined;
+        reserveSelection?: boolean | undefined;
+        filteredValue?: string[] | undefined;
+        filters?: {
+            text: string;
+            value: string;
+        }[] | undefined;
+        filterMultiple?: boolean | undefined;
+        filterClassName?: string | undefined;
+        sortOrders?: ("ascending" | "descending" | null)[] | undefined;
+    }[]>;
+    tableOverflowTooltip: import('vue').ComputedRef<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "appendTo" | "popperOptions" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    tableProps: import('vue').ComputedRef<ElTableProps<DataItem>>;
+    handleRowClick: (row: DataItem, column: Column, event: MouseEvent) => void;
+    handleHeaderClick: (column: Column, e: MouseEvent) => void;
+    handleSortChange: (sorter: Sorter) => void;
+    handleFilterChange: (filter: Filter) => void;
+    handleCurrentChange: (row?: DataItem | null, old?: DataItem | null) => void;
+    handleSelect: (selection: DataItem[], row: DataItem) => void;
+    handleSelectAll: (selection: DataItem[]) => void;
     clearSort: () => void;
     clearSelection: () => void;
     toggleRowSelection: (row: DataItem, selected?: boolean) => void;
@@ -132,16 +317,18 @@ declare const _default: import('vue').DefineComponent<{
     setSelectedRowKeys: (keys?: DataKey[]) => void;
     toggleRowExpansionAll: (expanded?: boolean) => void;
     updateSelectedAndChecked: () => void;
-    tableRef: import('vue').Ref<ElTableInstance>;
     getSelectionRows: () => DataItem[] | undefined;
     toggleAllSelection: () => void;
-    toggleRowExpansion: (row: DataItem, expanded?: boolean | undefined) => void;
-    clearFilter: (columnKeys?: string[] | undefined) => void;
+    toggleRowExpansion: (row: DataItem, expanded?: boolean) => void;
+    clearFilter: (columnKeys?: string[]) => void;
     doLayout: () => void;
     sort: (prop: string, order: string) => void;
-    scrollTo: (options: number | ScrollToOptions, yCoord?: number | undefined) => void;
-    setScrollTop: (top?: number | undefined) => void;
-    setScrollLeft: (left?: number | undefined) => void;
+    scrollTo: (options: number | ScrollToOptions, yCoord?: number) => void;
+    setScrollTop: (top?: number) => void;
+    setScrollLeft: (left?: number) => void;
+    ownSlots: string[];
+    getBodyRowClass: typeof getBodyRowClass;
+    getHeadRowClass: typeof getHeadRowClass;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     select: (_selection: DataItem[], _row: DataItem) => boolean;
     selectAll: (_selection: DataItem[]) => boolean;
@@ -158,11 +345,11 @@ declare const _default: import('vue').DefineComponent<{
     headerContextmenu: (_column: Column, _e: MouseEvent) => boolean;
     sortChange: (_sorter: Sorter) => boolean;
     filterChange: (_filter: Filter) => boolean;
-    currentChange: (_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => boolean; /** 获取单选选中行 */
+    currentChange: (_current?: DataItem | null, _old?: DataItem | null) => boolean;
     headerDragend: (_width: number, _old: number, _column: Column, _e: MouseEvent) => boolean;
     expandChange: (_row: DataItem, _expanded: boolean) => boolean;
-    'update:currentRowKey': (_currentRowKey?: DataKey | undefined) => boolean;
-    'update:selectedRowKeys': (_selectedRowKeys?: DataKey[] | undefined) => boolean;
+    'update:currentRowKey': (_currentRowKey?: DataKey) => boolean;
+    'update:selectedRowKeys': (_selectedRowKeys?: DataKey[]) => boolean;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     stripe: {
         type: BooleanConstructor;
@@ -173,7 +360,7 @@ declare const _default: import('vue').DefineComponent<{
         default: null;
     };
     rowKey: {
-        type: import('vue').PropType<string | ((row: DataItem) => string) | undefined>;
+        type: import('vue').PropType<import('./types').RowKey>;
         required: boolean;
     };
     columns: {
@@ -204,7 +391,7 @@ declare const _default: import('vue').DefineComponent<{
     selectedRowKeys: import('vue').PropType<DataKey[]>;
     cacheData: import('vue').PropType<DataItem[]>;
     size: {
-        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
+        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -213,14 +400,14 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    width: (StringConstructor | NumberConstructor)[];
-    maxHeight: (StringConstructor | NumberConstructor)[];
+    width: (NumberConstructor | StringConstructor)[];
+    maxHeight: (NumberConstructor | StringConstructor)[];
     lazy: BooleanConstructor;
     className: {
         type: StringConstructor;
         default: string;
     };
-    height: (StringConstructor | NumberConstructor)[];
+    height: (NumberConstructor | StringConstructor)[];
     data: {
         type: import('vue').PropType<any[]>;
         default: () => never[];
@@ -241,13 +428,13 @@ declare const _default: import('vue').DefineComponent<{
     headerCellClassName: import('vue').PropType<import('element-plus').CellCls<any> | undefined>;
     headerCellStyle: import('vue').PropType<import('element-plus').CellStyle<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
-    currentRowKey: (StringConstructor | NumberConstructor)[];
+    currentRowKey: (NumberConstructor | StringConstructor)[];
     emptyText: StringConstructor;
-    expandRowKeys: import('vue').PropType<any[] | undefined>;
+    expandRowKeys: import('vue').PropType<string[] | undefined>;
     defaultExpandAll: BooleanConstructor;
     defaultSort: import('vue').PropType<import('element-plus').Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import('vue').PropType<Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    tooltipOptions: import('vue').PropType<Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "transition" | "placement" | "effect" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "popperClass" | "appendTo" | "showArrow">> | undefined>;
     spanMethod: import('vue').PropType<((data: {
         row: any;
         rowIndex: number;
@@ -266,13 +453,11 @@ declare const _default: import('vue').DefineComponent<{
         default: number;
     };
     treeProps: {
-        type: import('vue').PropType<{
-            hasChildren?: string | undefined;
-            children?: string | undefined;
-        } | undefined>;
+        type: import('vue').PropType<import('element-plus/es/components/table/src/table/defaults').TreeProps | undefined>;
         default: () => {
             hasChildren: string;
             children: string;
+            checkStrictly: boolean;
         };
     };
     load: import('vue').PropType<((row: any, treeNode: import('element-plus').TreeNode, resolve: (data: any[]) => void) => void) | undefined>;
@@ -282,7 +467,7 @@ declare const _default: import('vue').DefineComponent<{
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: import('vue').PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    showOverflowTooltip: import('vue').PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "transition" | "placement" | "effect" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "popperClass" | "appendTo" | "showArrow">> | undefined>;
 }>> & {
     onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
     onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
@@ -317,16 +502,13 @@ declare const _default: import('vue').DefineComponent<{
     defaultExpandAll: boolean;
     selectOnIndeterminate: boolean;
     indent: number;
-    treeProps: {
-        hasChildren?: string | undefined;
-        children?: string | undefined;
-    } | undefined;
+    treeProps: import('element-plus/es/components/table/src/table/defaults').TreeProps | undefined;
     tableLayout: "auto" | "fixed";
     scrollbarAlwaysOn: boolean;
     flexible: boolean;
     sticky: boolean;
-    headerEllipsis: boolean;
     slotNormalize: boolean;
+    headerEllipsis: boolean;
     bottomLine: boolean;
     emptyProps: import('./types').TableEmptyProps;
     reserveCurrent: boolean;

package/lib/ele-data-table/props.d.ts

@@ -1,7 +1,7 @@
 import { PropType, ExtractPropTypes } from 'vue';
-import { DataKey, DataItem, Column, Columns, Sorter, Filter, TableEmptyProps, RowClickChecked } from './types';
+import { DataKey, DataItem, Column, Columns, Sorter, Filter, TableEmptyProps, RowClickChecked, RowKey } from './types';
 
-declare const normalizeProps: Omit<{
+declare const normalizeProps: import('../ele-app/types').Mutable<Omit<{
     data: {
         type: PropType<any[]>;
         default: () => never[];
@@ -12,9 +12,9 @@ declare const normalizeProps: Omit<{
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    width: (StringConstructor | NumberConstructor)[];
-    height: (StringConstructor | NumberConstructor)[];
-    maxHeight: (StringConstructor | NumberConstructor)[];
+    width: (NumberConstructor | StringConstructor)[];
+    height: (NumberConstructor | StringConstructor)[];
+    maxHeight: (NumberConstructor | StringConstructor)[];
     fit: {
         type: BooleanConstructor;
         default: boolean;
@@ -38,13 +38,13 @@ declare const normalizeProps: Omit<{
     headerCellClassName: PropType<import('element-plus/es/components/table/src/table/defaults').CellCls<any> | undefined>;
     headerCellStyle: PropType<import('element-plus/es/components/table/src/table/defaults').CellStyle<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
-    currentRowKey: (StringConstructor | NumberConstructor)[];
+    currentRowKey: (NumberConstructor | StringConstructor)[];
     emptyText: StringConstructor;
-    expandRowKeys: PropType<any[] | undefined>;
+    expandRowKeys: PropType<string[] | undefined>;
     defaultExpandAll: BooleanConstructor;
     defaultSort: PropType<import('element-plus/es/components/table/src/table/defaults').Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: PropType<Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    tooltipOptions: PropType<Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "transition" | "placement" | "effect" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "popperClass" | "appendTo" | "showArrow">> | undefined>;
     spanMethod: PropType<((data: {
         row: any;
         rowIndex: number;
@@ -63,13 +63,11 @@ declare const normalizeProps: Omit<{
         default: number;
     };
     treeProps: {
-        type: PropType<{
-            hasChildren?: string | undefined;
-            children?: string | undefined;
-        } | undefined>;
+        type: PropType<import('element-plus/es/components/table/src/table/defaults').TreeProps | undefined>;
         default: () => {
             hasChildren: string;
             children: string;
+            checkStrictly: boolean;
         };
     };
     lazy: BooleanConstructor;
@@ -88,8 +86,8 @@ declare const normalizeProps: Omit<{
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
-}, "style">;
+    showOverflowTooltip: PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "transition" | "placement" | "effect" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "popperClass" | "appendTo" | "showArrow">> | undefined>;
+}, "style">>;
 /**
  * 属性
  */
@@ -103,7 +101,7 @@ export declare const dataTableProps: {
         default: null;
     };
     rowKey: {
-        type: PropType<string | ((row: DataItem) => string) | undefined>;
+        type: PropType<RowKey>;
         required: boolean;
     };
     /** 列配置 */
@@ -145,8 +143,8 @@ export declare const dataTableProps: {
     selectedRowKeys: PropType<DataKey[]>;
     /** 缓存数据 */
     cacheData: PropType<DataItem[]>;
-    width: (StringConstructor | NumberConstructor)[];
-    height: (StringConstructor | NumberConstructor)[];
+    width: (NumberConstructor | StringConstructor)[];
+    height: (NumberConstructor | StringConstructor)[];
     data: {
         type: PropType<any[]>;
         default: () => never[];
@@ -161,7 +159,7 @@ export declare const dataTableProps: {
         type: BooleanConstructor;
         default: boolean;
     };
-    maxHeight: (StringConstructor | NumberConstructor)[];
+    maxHeight: (NumberConstructor | StringConstructor)[];
     lazy: BooleanConstructor;
     className: {
         type: StringConstructor;
@@ -183,13 +181,13 @@ export declare const dataTableProps: {
     headerCellClassName: PropType<import('element-plus/es/components/table/src/table/defaults').CellCls<any> | undefined>;
     headerCellStyle: PropType<import('element-plus/es/components/table/src/table/defaults').CellStyle<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
-    currentRowKey: (StringConstructor | NumberConstructor)[];
+    currentRowKey: (NumberConstructor | StringConstructor)[];
     emptyText: StringConstructor;
-    expandRowKeys: PropType<any[] | undefined>;
+    expandRowKeys: PropType<string[] | undefined>;
     defaultExpandAll: BooleanConstructor;
     defaultSort: PropType<import('element-plus/es/components/table/src/table/defaults').Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: PropType<Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    tooltipOptions: PropType<Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "transition" | "placement" | "effect" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "popperClass" | "appendTo" | "showArrow">> | undefined>;
     spanMethod: PropType<((data: {
         row: any;
         rowIndex: number;
@@ -208,13 +206,11 @@ export declare const dataTableProps: {
         default: number;
     };
     treeProps: {
-        type: PropType<{
-            hasChildren?: string | undefined;
-            children?: string | undefined;
-        } | undefined>;
+        type: PropType<import('element-plus/es/components/table/src/table/defaults').TreeProps | undefined>;
         default: () => {
             hasChildren: string;
             children: string;
+            checkStrictly: boolean;
         };
     };
     load: PropType<((row: any, treeNode: import('element-plus/es/components/table/src/table/defaults').TreeNode, resolve: (data: any[]) => void) => void) | undefined>;
@@ -224,7 +220,7 @@ export declare const dataTableProps: {
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    showOverflowTooltip: PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "transition" | "placement" | "effect" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "popperClass" | "appendTo" | "showArrow">> | undefined>;
 };
 export type DataTableProps = ExtractPropTypes<typeof dataTableProps>;
 /**

package/lib/ele-data-table/style/index.scss

@@ -306,7 +306,7 @@
     > .el-table__body
     > .el-table__body-footer {
     border-top: 1px solid eleVar('table', 'border-color');
-    margin-top: -1px;
+    margin-top: calc(-1px - eleVar('table', 'fix-height'));
     z-index: 3;
 
     td.el-table__cell {

package/lib/ele-data-table/types.d.ts

@@ -46,6 +46,8 @@ export interface Column extends Omit<TableColumn, 'filterPlacement'> {
   hideInPrint?: boolean;
   /** 打印插槽名称 */
   printSlot?: string;
+  /** 打印表头插槽名称 */
+  printHeaderSlot?: string;
   /** 子级 */
   children?: Columns;
 }