ele-admin-plus 1.5.1-beta.4 → 1.6.0-beta.2

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

@@ -43,27 +43,25 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     selectedRowKeys: import('vue').PropType<DataKey[]>;
     cacheData: import('vue').PropType<DataItem[]>;
     data: {
-        type: import('vue').PropType<import('element-plus/es/components/table/src/table/defaults').DefaultRow[]>;
+        type: import('vue').PropType<any[]>;
         default: () => never[];
     };
+    width: (StringConstructor | NumberConstructor)[];
+    height: (StringConstructor | NumberConstructor)[];
     size: {
-        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;
+        type: import('vue').PropType<import('element-plus').TableProps<Record<string, any>>["size"]>;
     };
+    className: {
+        type: StringConstructor;
+        default: string;
+    };
+    maxHeight: (StringConstructor | NumberConstructor)[];
     fit: {
         type: BooleanConstructor;
         default: boolean;
     };
-    width: (NumberConstructor | StringConstructor)[];
-    maxHeight: (NumberConstructor | StringConstructor)[];
     lazy: BooleanConstructor;
-    className: {
-        type: StringConstructor;
-        default: string;
-    };
-    height: (NumberConstructor | StringConstructor)[];
+    load: import('vue').PropType<import('element-plus').TableProps<any>["load"]>;
     emptyText: StringConstructor;
     showHeader: {
         type: BooleanConstructor;
@@ -71,23 +69,26 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     };
     showSummary: BooleanConstructor;
     sumText: StringConstructor;
-    summaryMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["summaryMethod"]>;
-    rowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowClassName"]>;
-    rowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowStyle"]>;
-    cellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellClassName"]>;
-    cellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellStyle"]>;
-    headerRowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowClassName"]>;
-    headerRowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowStyle"]>;
-    headerCellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellClassName"]>;
-    headerCellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellStyle"]>;
+    summaryMethod: import('vue').PropType<import('element-plus').TableProps<any>["summaryMethod"]>;
+    rowClassName: import('vue').PropType<import('element-plus').TableProps<any>["rowClassName"]>;
+    rowStyle: import('vue').PropType<import('element-plus').TableProps<any>["rowStyle"]>;
+    cellClassName: import('vue').PropType<import('element-plus').TableProps<any>["cellClassName"]>;
+    cellStyle: import('vue').PropType<import('element-plus').TableProps<any>["cellStyle"]>;
+    headerRowClassName: import('vue').PropType<import('element-plus').TableProps<any>["headerRowClassName"]>;
+    headerRowStyle: import('vue').PropType<import('element-plus').TableProps<any>["headerRowStyle"]>;
+    headerCellClassName: import('vue').PropType<import('element-plus').TableProps<any>["headerCellClassName"]>;
+    headerCellStyle: import('vue').PropType<import('element-plus').TableProps<any>["headerCellStyle"]>;
     highlightCurrentRow: BooleanConstructor;
-    currentRowKey: (NumberConstructor | StringConstructor)[];
-    expandRowKeys: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["expandRowKeys"]>;
+    currentRowKey: (StringConstructor | NumberConstructor)[];
+    expandRowKeys: import('vue').PropType<import('element-plus').TableProps<any>["expandRowKeys"]>;
     defaultExpandAll: BooleanConstructor;
-    defaultSort: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["defaultSort"]>;
+    rowExpandable: {
+        type: import('vue').PropType<import('element-plus').TableProps<any>["rowExpandable"]>;
+    };
+    defaultSort: import('vue').PropType<import('element-plus').TableProps<any>["defaultSort"]>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipOptions"]>;
-    spanMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["spanMethod"]>;
+    tooltipOptions: import('vue').PropType<import('element-plus').TableProps<any>["tooltipOptions"]>;
+    spanMethod: import('vue').PropType<import('element-plus').TableProps<any>["spanMethod"]>;
     selectOnIndeterminate: {
         type: BooleanConstructor;
         default: boolean;
@@ -97,35 +98,35 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         default: number;
     };
     treeProps: {
-        type: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["treeProps"]>;
+        type: import('vue').PropType<import('element-plus').TableProps<any>["treeProps"]>;
         default: () => {
             hasChildren: string;
             children: string;
             checkStrictly: boolean;
         };
     };
-    load: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
     tableLayout: {
-        type: import('vue').PropType<"fixed" | "auto">;
+        type: import('vue').PropType<import('element-plus').TableProps<Record<string, any>>["tableLayout"]>;
         default: string;
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["showOverflowTooltip"]>;
-    tooltipFormatter: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipFormatter"]>;
+    showOverflowTooltip: {
+        type: import('vue').PropType<import('element-plus').TableProps<any>["showOverflowTooltip"]>;
+        default: undefined;
+    };
+    tooltipFormatter: import('vue').PropType<import('element-plus').TableProps<any>["tooltipFormatter"]>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
-        type: (NumberConstructor | StringConstructor)[];
+        type: (StringConstructor | NumberConstructor)[];
         default: undefined;
     };
     allowDragLastColumn: {
         type: BooleanConstructor;
         default: boolean;
     };
-    preserveExpandedContent: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
+    preserveExpandedContent: BooleanConstructor;
+    nativeScrollbar: BooleanConstructor;
 }>, {
     clearSort: () => void;
     clearSelection: () => void;
@@ -213,27 +214,25 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     selectedRowKeys: import('vue').PropType<DataKey[]>;
     cacheData: import('vue').PropType<DataItem[]>;
     data: {
-        type: import('vue').PropType<import('element-plus/es/components/table/src/table/defaults').DefaultRow[]>;
+        type: import('vue').PropType<any[]>;
         default: () => never[];
     };
+    width: (StringConstructor | NumberConstructor)[];
+    height: (StringConstructor | NumberConstructor)[];
     size: {
-        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;
+        type: import('vue').PropType<import('element-plus').TableProps<Record<string, any>>["size"]>;
+    };
+    className: {
+        type: StringConstructor;
+        default: string;
     };
+    maxHeight: (StringConstructor | NumberConstructor)[];
     fit: {
         type: BooleanConstructor;
         default: boolean;
     };
-    width: (NumberConstructor | StringConstructor)[];
-    maxHeight: (NumberConstructor | StringConstructor)[];
     lazy: BooleanConstructor;
-    className: {
-        type: StringConstructor;
-        default: string;
-    };
-    height: (NumberConstructor | StringConstructor)[];
+    load: import('vue').PropType<import('element-plus').TableProps<any>["load"]>;
     emptyText: StringConstructor;
     showHeader: {
         type: BooleanConstructor;
@@ -241,23 +240,26 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     };
     showSummary: BooleanConstructor;
     sumText: StringConstructor;
-    summaryMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["summaryMethod"]>;
-    rowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowClassName"]>;
-    rowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowStyle"]>;
-    cellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellClassName"]>;
-    cellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellStyle"]>;
-    headerRowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowClassName"]>;
-    headerRowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowStyle"]>;
-    headerCellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellClassName"]>;
-    headerCellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellStyle"]>;
+    summaryMethod: import('vue').PropType<import('element-plus').TableProps<any>["summaryMethod"]>;
+    rowClassName: import('vue').PropType<import('element-plus').TableProps<any>["rowClassName"]>;
+    rowStyle: import('vue').PropType<import('element-plus').TableProps<any>["rowStyle"]>;
+    cellClassName: import('vue').PropType<import('element-plus').TableProps<any>["cellClassName"]>;
+    cellStyle: import('vue').PropType<import('element-plus').TableProps<any>["cellStyle"]>;
+    headerRowClassName: import('vue').PropType<import('element-plus').TableProps<any>["headerRowClassName"]>;
+    headerRowStyle: import('vue').PropType<import('element-plus').TableProps<any>["headerRowStyle"]>;
+    headerCellClassName: import('vue').PropType<import('element-plus').TableProps<any>["headerCellClassName"]>;
+    headerCellStyle: import('vue').PropType<import('element-plus').TableProps<any>["headerCellStyle"]>;
     highlightCurrentRow: BooleanConstructor;
-    currentRowKey: (NumberConstructor | StringConstructor)[];
-    expandRowKeys: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["expandRowKeys"]>;
+    currentRowKey: (StringConstructor | NumberConstructor)[];
+    expandRowKeys: import('vue').PropType<import('element-plus').TableProps<any>["expandRowKeys"]>;
     defaultExpandAll: BooleanConstructor;
-    defaultSort: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["defaultSort"]>;
+    rowExpandable: {
+        type: import('vue').PropType<import('element-plus').TableProps<any>["rowExpandable"]>;
+    };
+    defaultSort: import('vue').PropType<import('element-plus').TableProps<any>["defaultSort"]>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipOptions"]>;
-    spanMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["spanMethod"]>;
+    tooltipOptions: import('vue').PropType<import('element-plus').TableProps<any>["tooltipOptions"]>;
+    spanMethod: import('vue').PropType<import('element-plus').TableProps<any>["spanMethod"]>;
     selectOnIndeterminate: {
         type: BooleanConstructor;
         default: boolean;
@@ -267,37 +269,38 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         default: number;
     };
     treeProps: {
-        type: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["treeProps"]>;
+        type: import('vue').PropType<import('element-plus').TableProps<any>["treeProps"]>;
         default: () => {
             hasChildren: string;
             children: string;
             checkStrictly: boolean;
         };
     };
-    load: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
     tableLayout: {
-        type: import('vue').PropType<"fixed" | "auto">;
+        type: import('vue').PropType<import('element-plus').TableProps<Record<string, any>>["tableLayout"]>;
         default: string;
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["showOverflowTooltip"]>;
-    tooltipFormatter: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipFormatter"]>;
+    showOverflowTooltip: {
+        type: import('vue').PropType<import('element-plus').TableProps<any>["showOverflowTooltip"]>;
+        default: undefined;
+    };
+    tooltipFormatter: import('vue').PropType<import('element-plus').TableProps<any>["tooltipFormatter"]>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
-        type: (NumberConstructor | StringConstructor)[];
+        type: (StringConstructor | NumberConstructor)[];
         default: undefined;
     };
     allowDragLastColumn: {
         type: BooleanConstructor;
         default: boolean;
     };
-    preserveExpandedContent: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
+    preserveExpandedContent: BooleanConstructor;
+    nativeScrollbar: BooleanConstructor;
 }>> & Readonly<{
     onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
+    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     onScroll?: ((_option: {
         scrollLeft: number;
         scrollTop: number;
@@ -305,7 +308,6 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     onFilterChange?: ((_filter: Filter) => any) | undefined;
     onCellClick?: ((_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => any) | undefined;
     onCellContextmenu?: ((_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => any) | undefined;
-    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     onCellDblclick?: ((_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => any) | undefined;
     "onUpdate:currentRowKey"?: ((_currentRowKey?: DataKey | undefined) => any) | undefined;
     "onUpdate:selectedRowKeys"?: ((_selectedRowKeys?: DataKey[] | undefined) => any) | undefined;
@@ -323,9 +325,9 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     onHeaderDragend?: ((_width: number, _old: number, _column: Column, _e: MouseEvent) => any) | undefined;
 }>, {
     data: any[];
+    className: string;
     fit: boolean;
     lazy: boolean;
-    className: string;
     stripe: boolean;
     border: boolean;
     showHeader: boolean;
@@ -335,12 +337,14 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     selectOnIndeterminate: boolean;
     indent: number;
     treeProps: import('element-plus/es/components/table/src/table/defaults').TreeProps | undefined;
-    tableLayout: "fixed" | "auto";
+    tableLayout: ("fixed" | "auto") | undefined;
     scrollbarAlwaysOn: boolean;
     flexible: boolean;
+    showOverflowTooltip: boolean | Partial<Pick<import('element-plus').UseTooltipProps, "effect" | "enterable" | "popperClass" | "offset" | "placement" | "popperOptions" | "showArrow" | "appendTo" | "transition" | "showAfter" | "hideAfter">> | undefined;
     scrollbarTabindex: string | number;
     allowDragLastColumn: boolean;
     preserveExpandedContent: boolean;
+    nativeScrollbar: boolean;
     sticky: boolean;
     headerEllipsis: boolean;
     slotNormalize: boolean;

package/es/ele-data-table/index.js

@@ -63,8 +63,9 @@ const index = /* @__PURE__ */ defineComponent({
     };
     const handleHeaderClick = (column, e) => {
       if (column.sortable && column.filters) {
+        const targetEl = e.target;
         const el = e.currentTarget;
-        if (el) {
+        if (el && targetEl && !targetEl.classList.contains("el-table__column-filter-trigger")) {
           const caretEl = el.querySelector(".caret-wrapper");
           caretEl && caretEl.dispatchEvent(new MouseEvent("click"));
         }

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

@@ -3,49 +3,49 @@ import { DataKey, DataItem, Column, Columns, Sorter, Filter, TableEmptyProps, Ro
 
 declare const normalizeProps: Omit<{
     data: {
-        type: PropType<import('element-plus/es/components/table/src/table/defaults').DefaultRow[]>;
+        type: PropType<any[]>;
         default: () => never[];
     };
     size: {
-        readonly type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    width: (NumberConstructor | StringConstructor)[];
-    height: (NumberConstructor | StringConstructor)[];
-    maxHeight: (NumberConstructor | StringConstructor)[];
+        type: PropType<import('element-plus').TableProps<Record<string, any>>["size"]>;
+    };
+    width: (StringConstructor | NumberConstructor)[];
+    height: (StringConstructor | NumberConstructor)[];
+    maxHeight: (StringConstructor | NumberConstructor)[];
     fit: {
         type: BooleanConstructor;
         default: boolean;
     };
     stripe: BooleanConstructor;
     border: BooleanConstructor;
-    rowKey: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowKey"]>;
+    rowKey: PropType<import('element-plus').TableProps<any>["rowKey"]>;
     showHeader: {
         type: BooleanConstructor;
         default: boolean;
     };
     showSummary: BooleanConstructor;
     sumText: StringConstructor;
-    summaryMethod: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["summaryMethod"]>;
-    rowClassName: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowClassName"]>;
-    rowStyle: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowStyle"]>;
-    cellClassName: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellClassName"]>;
-    cellStyle: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellStyle"]>;
-    headerRowClassName: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowClassName"]>;
-    headerRowStyle: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowStyle"]>;
-    headerCellClassName: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellClassName"]>;
-    headerCellStyle: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellStyle"]>;
+    summaryMethod: PropType<import('element-plus').TableProps<any>["summaryMethod"]>;
+    rowClassName: PropType<import('element-plus').TableProps<any>["rowClassName"]>;
+    rowStyle: PropType<import('element-plus').TableProps<any>["rowStyle"]>;
+    cellClassName: PropType<import('element-plus').TableProps<any>["cellClassName"]>;
+    cellStyle: PropType<import('element-plus').TableProps<any>["cellStyle"]>;
+    headerRowClassName: PropType<import('element-plus').TableProps<any>["headerRowClassName"]>;
+    headerRowStyle: PropType<import('element-plus').TableProps<any>["headerRowStyle"]>;
+    headerCellClassName: PropType<import('element-plus').TableProps<any>["headerCellClassName"]>;
+    headerCellStyle: PropType<import('element-plus').TableProps<any>["headerCellStyle"]>;
     highlightCurrentRow: BooleanConstructor;
-    currentRowKey: (NumberConstructor | StringConstructor)[];
+    currentRowKey: (StringConstructor | NumberConstructor)[];
     emptyText: StringConstructor;
-    expandRowKeys: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["expandRowKeys"]>;
+    expandRowKeys: PropType<import('element-plus').TableProps<any>["expandRowKeys"]>;
     defaultExpandAll: BooleanConstructor;
-    defaultSort: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["defaultSort"]>;
+    rowExpandable: {
+        type: PropType<import('element-plus').TableProps<any>["rowExpandable"]>;
+    };
+    defaultSort: PropType<import('element-plus').TableProps<any>["defaultSort"]>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipOptions"]>;
-    spanMethod: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["spanMethod"]>;
+    tooltipOptions: PropType<import('element-plus').TableProps<any>["tooltipOptions"]>;
+    spanMethod: PropType<import('element-plus').TableProps<any>["spanMethod"]>;
     selectOnIndeterminate: {
         type: BooleanConstructor;
         default: boolean;
@@ -55,7 +55,7 @@ declare const normalizeProps: Omit<{
         default: number;
     };
     treeProps: {
-        type: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["treeProps"]>;
+        type: PropType<import('element-plus').TableProps<any>["treeProps"]>;
         default: () => {
             hasChildren: string;
             children: string;
@@ -63,9 +63,9 @@ declare const normalizeProps: Omit<{
         };
     };
     lazy: BooleanConstructor;
-    load: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
+    load: PropType<import('element-plus').TableProps<any>["load"]>;
     style: {
-        type: PropType<import('vue').CSSProperties>;
+        type: PropType<import('element-plus').TableProps<any>["style"]>;
         default: () => {};
     };
     className: {
@@ -73,26 +73,27 @@ declare const normalizeProps: Omit<{
         default: string;
     };
     tableLayout: {
-        type: PropType<"fixed" | "auto">;
+        type: PropType<import('element-plus').TableProps<Record<string, any>>["tableLayout"]>;
         default: string;
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["showOverflowTooltip"]>;
-    tooltipFormatter: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipFormatter"]>;
+    showOverflowTooltip: {
+        type: PropType<import('element-plus').TableProps<any>["showOverflowTooltip"]>;
+        default: undefined;
+    };
+    tooltipFormatter: PropType<import('element-plus').TableProps<any>["tooltipFormatter"]>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
-        type: (NumberConstructor | StringConstructor)[];
+        type: (StringConstructor | NumberConstructor)[];
         default: undefined;
     };
     allowDragLastColumn: {
         type: BooleanConstructor;
         default: boolean;
     };
-    preserveExpandedContent: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
+    preserveExpandedContent: BooleanConstructor;
+    nativeScrollbar: BooleanConstructor;
 }, "style">;
 /**
  * 属性
@@ -149,32 +150,59 @@ export declare const dataTableProps: {
     selectedRowKeys: PropType<DataKey[]>;
     /** 缓存数据 */
     cacheData: PropType<DataItem[]>;
-    data: {
-        type: PropType<import('element-plus/es/components/table/src/table/defaults').DefaultRow[]>;
-        default: () => never[];
+    size: {
+        type: PropType<import('element-plus').TableProps<Record<string, any>>["size"]>;
+    };
+    summaryMethod: PropType<import('element-plus').TableProps<any>["summaryMethod"]>;
+    rowClassName: PropType<import('element-plus').TableProps<any>["rowClassName"]>;
+    rowStyle: PropType<import('element-plus').TableProps<any>["rowStyle"]>;
+    cellClassName: PropType<import('element-plus').TableProps<any>["cellClassName"]>;
+    cellStyle: PropType<import('element-plus').TableProps<any>["cellStyle"]>;
+    headerRowClassName: PropType<import('element-plus').TableProps<any>["headerRowClassName"]>;
+    headerRowStyle: PropType<import('element-plus').TableProps<any>["headerRowStyle"]>;
+    headerCellClassName: PropType<import('element-plus').TableProps<any>["headerCellClassName"]>;
+    headerCellStyle: PropType<import('element-plus').TableProps<any>["headerCellStyle"]>;
+    expandRowKeys: PropType<import('element-plus').TableProps<any>["expandRowKeys"]>;
+    rowExpandable: {
+        type: PropType<import('element-plus').TableProps<any>["rowExpandable"]>;
+    };
+    defaultSort: PropType<import('element-plus').TableProps<any>["defaultSort"]>;
+    tooltipOptions: PropType<import('element-plus').TableProps<any>["tooltipOptions"]>;
+    className: {
+        type: StringConstructor;
+        default: string;
+    };
+    spanMethod: PropType<import('element-plus').TableProps<any>["spanMethod"]>;
+    treeProps: {
+        type: PropType<import('element-plus').TableProps<any>["treeProps"]>;
+        default: () => {
+            hasChildren: string;
+            children: string;
+            checkStrictly: boolean;
+        };
     };
-    height: (NumberConstructor | StringConstructor)[];
-    maxHeight: (NumberConstructor | StringConstructor)[];
+    load: PropType<import('element-plus').TableProps<any>["load"]>;
     tableLayout: {
-        type: PropType<"fixed" | "auto">;
+        type: PropType<import('element-plus').TableProps<Record<string, any>>["tableLayout"]>;
         default: string;
     };
-    width: (NumberConstructor | StringConstructor)[];
-    size: {
-        readonly type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
+    showOverflowTooltip: {
+        type: PropType<import('element-plus').TableProps<any>["showOverflowTooltip"]>;
+        default: undefined;
+    };
+    tooltipFormatter: PropType<import('element-plus').TableProps<any>["tooltipFormatter"]>;
+    data: {
+        type: PropType<any[]>;
+        default: () => never[];
     };
+    height: (StringConstructor | NumberConstructor)[];
+    maxHeight: (StringConstructor | NumberConstructor)[];
+    width: (StringConstructor | NumberConstructor)[];
     fit: {
         type: BooleanConstructor;
         default: boolean;
     };
     lazy: BooleanConstructor;
-    className: {
-        type: StringConstructor;
-        default: string;
-    };
     emptyText: StringConstructor;
     showHeader: {
         type: BooleanConstructor;
@@ -182,23 +210,10 @@ export declare const dataTableProps: {
     };
     showSummary: BooleanConstructor;
     sumText: StringConstructor;
-    summaryMethod: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["summaryMethod"]>;
-    rowClassName: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowClassName"]>;
-    rowStyle: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowStyle"]>;
-    cellClassName: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellClassName"]>;
-    cellStyle: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellStyle"]>;
-    headerRowClassName: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowClassName"]>;
-    headerRowStyle: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowStyle"]>;
-    headerCellClassName: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellClassName"]>;
-    headerCellStyle: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellStyle"]>;
     highlightCurrentRow: BooleanConstructor;
-    currentRowKey: (NumberConstructor | StringConstructor)[];
-    expandRowKeys: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["expandRowKeys"]>;
+    currentRowKey: (StringConstructor | NumberConstructor)[];
     defaultExpandAll: BooleanConstructor;
-    defaultSort: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["defaultSort"]>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipOptions"]>;
-    spanMethod: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["spanMethod"]>;
     selectOnIndeterminate: {
         type: BooleanConstructor;
         default: boolean;
@@ -207,32 +222,19 @@ export declare const dataTableProps: {
         type: NumberConstructor;
         default: number;
     };
-    treeProps: {
-        type: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["treeProps"]>;
-        default: () => {
-            hasChildren: string;
-            children: string;
-            checkStrictly: boolean;
-        };
-    };
-    load: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["showOverflowTooltip"]>;
-    tooltipFormatter: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipFormatter"]>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
-        type: (NumberConstructor | StringConstructor)[];
+        type: (StringConstructor | NumberConstructor)[];
         default: undefined;
     };
     allowDragLastColumn: {
         type: BooleanConstructor;
         default: boolean;
     };
-    preserveExpandedContent: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
+    preserveExpandedContent: BooleanConstructor;
+    nativeScrollbar: BooleanConstructor;
 };
 export type DataTableProps = ExtractPropTypes<typeof dataTableProps>;
 /**

package/es/ele-data-table/props.js

@@ -1,4 +1,4 @@
-import elTableProps from "element-plus/es/components/table/src/table/defaults";
+import { elTableProps } from "../utils/lib-export";
 import { omit } from "../utils/common";
 const normalizeProps = omit(elTableProps, ["style"]);
 const dataTableProps = {

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

@@ -200,6 +200,7 @@
       color: eleVar('table', 'icon-color');
       font-size: eleVar('table', 'filter-size');
       transition: (color $transition-base, font-size $transition-base);
+      pointer-events: none;
     }
 
     &:hover {