ele-admin-plus 1.4.1 → 1.5.0-beta.2

package/lib/ele-virtual-table/index.cjs

@@ -2,6 +2,7 @@
 const vue = require("vue");
 const elementPlus = require("element-plus");
 const common = require("../utils/common");
+const hook = require("../utils/hook");
 const EleTooltip = require("../ele-tooltip/index");
 const util = require("../ele-data-table/util");
 const util$1 = require("./util");
@@ -25,14 +26,15 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const emit = __emit;
     const { t } = elementPlus.useLocale();
     const events = util.useEmits(emit);
-    const { wrapWidth, wrapHeight, updateWrapSize } = util$1.useAutoResize(
-      () => rootRef.value
-    );
+    const [wrapWidth, wrapHeight, updateWrapSize] = hook.useResizeObserver({
+      getEl: () => rootRef.value
+    });
     const { isLayoutFixedHead, isLayoutMaximized } = util.useStickyHeader();
     const tableState = {
       checked: /* @__PURE__ */ new Map(),
       reserveChecked: false,
-      scrollTop: 0
+      scrollTop: 0,
+      sorter: util$1.getDefaultSorter(props2.defaultSort, props2.columns)
     };
     const rootRef = vue.ref(null);
     const tableRef = vue.ref(null);
@@ -45,6 +47,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const tableWidth = vue.ref(0);
     const tableHeight = vue.ref(0);
     const tableData = vue.ref([]);
+    const tableCurrentData = vue.ref([]);
     const tableColumns = vue.ref([]);
     const tableScrollLeft = vue.ref(0);
     const selectedRowKey = vue.ref(props2.currentRowKey ?? null);
@@ -81,10 +84,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     });
     const isTreeData = vue.computed(() => {
       return tableData.value.some(
-        (d) => {
-          var _a;
-          return ((_a = d.children) == null ? void 0 : _a.length) || props2.lazy && d.hasChildren;
-        }
+        (d) => d.children?.length || props2.lazy && d.hasChildren
       );
     });
     const tableExpandCol = vue.computed(() => {
@@ -125,7 +125,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       return props2.showHeader ? headerRows.value.length : 0;
     });
     const hasFooter = vue.computed(() => {
-      return !!(props2.showSummary && tableData.value.length);
+      return !!(props2.showSummary && tableCurrentData.value.length);
     });
     const tableProps = vue.computed(() => {
       const rowHeight = tableRowHeight.value;
@@ -133,7 +133,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       const opt = {
         cache: 2,
         estimatedRowHeight: autoRowHeight.value ? rowHeight : void 0,
-        headerClass: (params) => {
+        headerClass: ((params) => {
           const rowClass = props2.headerRowClassName;
           const classes = ["ele-table-head-tr"];
           if (typeof rowClass === "function") {
@@ -145,7 +145,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             classes.push(rowClass);
           }
           return classes.join(" ");
-        },
+        }),
         headerProps: (params) => {
           const opt2 = { rowIndex: params.headerIndex };
           const style = props2.headerRowStyle;
@@ -154,7 +154,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         //headerCellProps: void 0,
         headerHeight: headerNums.value ? headerHeight : 0,
         footerHeight: hasFooter.value ? rowHeight : void 0,
-        rowClass: (params) => {
+        rowClass: ((params) => {
           const classes = ["ele-table-tr"];
           const row = params.rowData;
           const rowIndex = row.rowIndex;
@@ -178,7 +178,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             }
           }
           return classes.join(" ");
-        },
+        }),
         rowKey: "rowId",
         rowProps: (params) => {
           const row = params.rowData;
@@ -189,7 +189,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         rowHeight: autoRowHeight.value ? void 0 : rowHeight,
         //cellProps: void 0,
         columns: tableColumns.value,
-        data: tableData.value,
+        data: tableCurrentData.value,
         //dataGetter: void 0,
         //fixedData: void 0,
         expandColumnKey: tableExpandColumnKey.value,
@@ -224,6 +224,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const tableEmptyText = vue.computed(() => {
       return props2.errorText || props2.emptyText || t("el.table.emptyText");
     });
+    const hideTooltip = () => {
+      tableTooltipProps.visible = false;
+      tableTooltipProps.disabled = true;
+    };
     const triggerTooltip = (cell, col) => {
       const cellText = cell.innerText;
       const tooltip = util.mergeTooltipProps(
@@ -256,14 +260,43 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         hideTooltip();
       }
     };
-    const hideTooltip = () => {
-      tableTooltipProps.visible = false;
-      tableTooltipProps.disabled = true;
+    const sortAndFilterTableData = (sorter) => {
+      if (sorter && tableState.sorter !== sorter) {
+        tableState.sorter = sorter;
+      }
+      let data = [...tableData.value];
+      if (tableState.sorter) {
+        const { prop, order, column: col } = tableState.sorter;
+        if (col?.sortable === true) {
+          const reverse = order === "descending" ? -1 : 1;
+          data.sort((a, b) => {
+            if (!order) {
+              return a.rowIndex - b.rowIndex;
+            }
+            const v = util$1.getSortCompareValue(col.sortMethod, a, b, prop);
+            return v * reverse;
+          });
+        }
+      }
+      Object.keys(filtered).forEach((key) => {
+        const col = util$1.getColumnByKey(props2.columns, key);
+        const filterMethod = col?.filterMethod;
+        const values = filtered[key];
+        if (!values?.length || !filterMethod) {
+          return;
+        }
+        data = data.filter((d) => {
+          const row = d.rowData;
+          return values.some((value) => filterMethod(value, row, col));
+        });
+      });
+      tableCurrentData.value = data;
     };
     const handleTableFilterChange = (params) => {
       const key = util$1.getColKey(params.column);
       if (key) {
         filtered[key] = params.value;
+        sortAndFilterTableData();
         events.onFilterChange(filtered);
       }
     };
@@ -323,7 +356,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           events.onSelectionChange(getSelectionRows());
         }
       }
-      events.onRowClick(rowData, col, e);
+      events.onRowClick(rowData, col, e, row.isDisabled, getSelectionRows());
     };
     const handleCellDblclick = (row, col, e) => {
       const cell = e.currentTarget;
@@ -347,13 +380,13 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const handleHeaderCellClick = (col, e) => {
       if (col && (col.sortable === true || col.sortable === "custom")) {
         sortBy.value = util$1.getSortBy(sortBy.value, col);
-        events.onSortChange({
-          prop: col.property || col.prop,
-          order: util$1.getOrderValue(
-            sortBy.value ? sortBy.value.order : void 0
-          ),
-          column: col
-        });
+        const prop = col.property || col.prop;
+        const order = util$1.getOrderValue(
+          sortBy.value ? sortBy.value.order : void 0
+        );
+        const sorter = { prop, order, column: col };
+        sortAndFilterTableData(sorter);
+        events.onSortChange(sorter);
       }
       events.onHeaderClick(col, e);
     };
@@ -401,6 +434,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         props2.rowKey,
         util$1.getSelectableFunction(bodyCols.value)
       );
+      sortAndFilterTableData();
       if (props2.defaultExpandAll) {
         toggleRowExpansionAll(true);
       } else if (props2.expandRowKeys && props2.expandRowKeys.length) {
@@ -421,7 +455,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         const row = util$1.getRowByKey(key, tableData.value);
         if (row != null || props2.reserveCurrent) {
           tableState.oldRow = tableState.row;
-          tableState.row = (row == null ? void 0 : row.rowData) || item || void 0;
+          tableState.row = row?.rowData || item || void 0;
           if (tableState.row == null && props2.cacheData != null) {
             tableState.row = util$1.getRowByKey(
               key,
@@ -710,6 +744,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const clearSort = () => {
       if (sortBy.value != null) {
         sortBy.value = void 0;
+        tableState.sorter = void 0;
+        sortAndFilterTableData();
       }
     };
     const clearFilter = (columnKeys) => {
@@ -720,6 +756,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           filtered[key] = [];
         }
       });
+      sortAndFilterTableData();
     };
     const doLayout = (force) => {
       const { width, sumWidth, rowSizes, colSizes } = util$1.computeColSizes(
@@ -749,7 +786,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         key: util$1.getColKey(col),
         order: util$1.getSortOrder(order)
       };
-      events.onSortChange({ prop, order, column: col });
+      const sorter = { prop, order, column: col };
+      sortAndFilterTableData(sorter);
+      events.onSortChange(sorter);
     };
     const scrollTo = (options, yCoord) => {
       if (!tableRef.value) {
@@ -926,8 +965,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       return vue.openBlock(), vue.createElementBlock("div", {
         ref_key: "rootRef",
         ref: rootRef,
-        class: vue.normalizeClass([
-          "ele-virtual-table",
+        class: vue.normalizeClass(["ele-virtual-table", [
           { "is-border": _ctx.border || headerRows.value.length > 1 },
           { "is-stripe": _ctx.stripe },
           { "is-sticky": _ctx.sticky },
@@ -941,7 +979,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           { "is-auto-width": vue.unref(wrapWidth) === tableWidth.value },
           { "is-small": _ctx.size === "small" },
           { "is-large": _ctx.size === "large" }
-        ]),
+        ]]),
         onMouseleave: handleTableMouseleave
       }, [
         tableProps.value.width ? (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElTableV2), vue.mergeProps({ key: 0 }, tableProps.value, {
@@ -986,70 +1024,67 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
               })
             ]), 1032, ["headerCols", "headerColSizes", "headerIndex", "sortBy", "filtered", "isCheckAll", "isIndeterminate", "disabledCheckbox", "tableSize", "headerCellClass", "headerCellStyle", "rowHeight"])) : vue.createCommentVNode("", true)
           ]),
-          row: vue.withCtx((rowProps) => {
-            var _a;
-            return [
-              rowProps && rowProps.rowData && rowProps.rowData.isExpandRow ? (vue.openBlock(), vue.createBlock(ExpandRow, {
-                key: 0,
-                column: (_a = tableExpandCol.value) == null ? void 0 : _a.originalCol,
-                rowIndex: rowProps.rowData.rowIndex,
-                rowData: rowProps.rowData.rowData,
-                onMouseenter: handleExpandCellMouseenter
-              }, vue.createSlots({ _: 2 }, [
-                vue.renderList(Object.keys(_ctx.$slots).filter(
-                  (k) => !ownSlots.includes(k)
-                ), (name) => {
-                  return {
-                    name,
-                    fn: vue.withCtx((slotProps) => [
-                      vue.renderSlot(_ctx.$slots, name, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
-                    ])
-                  };
-                })
-              ]), 1032, ["column", "rowIndex", "rowData"])) : rowProps && rowProps.rowData && rowProps.rowData.rowData ? (vue.openBlock(), vue.createBlock(BodyRow, {
-                key: 1,
-                bodyCols: bodyCols.value,
-                colSizes: bodyColSizes.value,
-                rowIndex: rowProps.rowData.rowIndex,
-                rowItem: rowProps.rowData,
-                rowId: rowProps.rowData.rowId,
-                checkedRowKeys: checkedRowKeys.value,
-                bodyCellClass: _ctx.cellClassName,
-                bodyCellStyle: _ctx.cellStyle,
-                spanMethod: _ctx.spanMethod,
-                tableTooltipProps: _ctx.showOverflowTooltip,
-                pageIndex: _ctx.pageIndex,
-                rowHeight: tableRowHeight.value,
-                tableSize: _ctx.size,
-                expandColumnKey: tableExpandColumnKey.value,
-                expandedRowKeys: expandedRowKeys.value,
-                lazy: _ctx.lazy,
-                load: _ctx.load,
-                level: rowProps.depth,
-                indent: _ctx.indent,
-                fixedCellHeight: hasExpandCol.value,
-                autoRowHeight: autoRowHeight.value,
-                onCellCheckedChange: handleCellCheckedChange,
-                onCellExpandChange: handleCellExpandChange,
-                onCellClick: handleCellClick,
-                onCellDblclick: handleCellDblclick,
-                onCellContextmenu: handleCellContextmenu,
-                onCellMouseenter: handleCellMouseenter,
-                onCellMouseleave: handleCellMouseleave
-              }, vue.createSlots({ _: 2 }, [
-                vue.renderList(Object.keys(_ctx.$slots).filter(
-                  (k) => !ownSlots.includes(k)
-                ), (name) => {
-                  return {
-                    name,
-                    fn: vue.withCtx((slotProps) => [
-                      vue.renderSlot(_ctx.$slots, name, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
-                    ])
-                  };
-                })
-              ]), 1032, ["bodyCols", "colSizes", "rowIndex", "rowItem", "rowId", "checkedRowKeys", "bodyCellClass", "bodyCellStyle", "spanMethod", "tableTooltipProps", "pageIndex", "rowHeight", "tableSize", "expandColumnKey", "expandedRowKeys", "lazy", "load", "level", "indent", "fixedCellHeight", "autoRowHeight"])) : vue.createCommentVNode("", true)
-            ];
-          }),
+          row: vue.withCtx((rowProps) => [
+            rowProps && rowProps.rowData && rowProps.rowData.isExpandRow ? (vue.openBlock(), vue.createBlock(ExpandRow, {
+              key: 0,
+              column: tableExpandCol.value?.originalCol,
+              rowIndex: rowProps.rowData.rowIndex,
+              rowData: rowProps.rowData.rowData,
+              onMouseenter: handleExpandCellMouseenter
+            }, vue.createSlots({ _: 2 }, [
+              vue.renderList(Object.keys(_ctx.$slots).filter(
+                (k) => !ownSlots.includes(k)
+              ), (name) => {
+                return {
+                  name,
+                  fn: vue.withCtx((slotProps) => [
+                    vue.renderSlot(_ctx.$slots, name, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
+                  ])
+                };
+              })
+            ]), 1032, ["column", "rowIndex", "rowData"])) : rowProps && rowProps.rowData && rowProps.rowData.rowData ? (vue.openBlock(), vue.createBlock(BodyRow, {
+              key: 1,
+              bodyCols: bodyCols.value,
+              colSizes: bodyColSizes.value,
+              rowIndex: rowProps.rowData.rowIndex,
+              rowItem: rowProps.rowData,
+              rowId: rowProps.rowData.rowId,
+              checkedRowKeys: checkedRowKeys.value,
+              bodyCellClass: _ctx.cellClassName,
+              bodyCellStyle: _ctx.cellStyle,
+              spanMethod: _ctx.spanMethod,
+              tableTooltipProps: _ctx.showOverflowTooltip,
+              pageIndex: _ctx.pageIndex,
+              rowHeight: tableRowHeight.value,
+              tableSize: _ctx.size,
+              expandColumnKey: tableExpandColumnKey.value,
+              expandedRowKeys: expandedRowKeys.value,
+              lazy: _ctx.lazy,
+              load: _ctx.load,
+              level: rowProps.depth,
+              indent: _ctx.indent,
+              fixedCellHeight: hasExpandCol.value,
+              autoRowHeight: autoRowHeight.value,
+              onCellCheckedChange: handleCellCheckedChange,
+              onCellExpandChange: handleCellExpandChange,
+              onCellClick: handleCellClick,
+              onCellDblclick: handleCellDblclick,
+              onCellContextmenu: handleCellContextmenu,
+              onCellMouseenter: handleCellMouseenter,
+              onCellMouseleave: handleCellMouseleave
+            }, vue.createSlots({ _: 2 }, [
+              vue.renderList(Object.keys(_ctx.$slots).filter(
+                (k) => !ownSlots.includes(k)
+              ), (name) => {
+                return {
+                  name,
+                  fn: vue.withCtx((slotProps) => [
+                    vue.renderSlot(_ctx.$slots, name, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
+                  ])
+                };
+              })
+            ]), 1032, ["bodyCols", "colSizes", "rowIndex", "rowItem", "rowId", "checkedRowKeys", "bodyCellClass", "bodyCellStyle", "spanMethod", "tableTooltipProps", "pageIndex", "rowHeight", "tableSize", "expandColumnKey", "expandedRowKeys", "lazy", "load", "level", "indent", "fixedCellHeight", "autoRowHeight"])) : vue.createCommentVNode("", true)
+          ]),
           empty: vue.withCtx(() => [
             vue.renderSlot(_ctx.$slots, "empty", {
               text: _ctx.emptyText,
@@ -1073,7 +1108,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 bodyCols: bodyCols.value,
                 colSizes: bodyColSizes.value,
                 sumWidth: colsSumWidth.value,
-                tableData: tableData.value,
+                tableData: tableCurrentData.value,
                 rowHeight: tableRowHeight.value,
                 sumText: tableSumText.value,
                 summaryMethod: _ctx.summaryMethod,

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

@@ -1,6 +1,6 @@
 import { Ref } from 'vue';
 import { ElTableV2Instance } from '../ele-app/el';
-import { DataKey, DataItem, Column, Filter, OrderValue } from '../ele-data-table/types';
+import { DataKey, DataItem, Column, Filter, OrderValue, Sorter } from '../ele-data-table/types';
 import { ScrollStrategy, ScrollPos, VirtualRow } from './types';
 
 declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: {
@@ -135,6 +135,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         default: boolean;
     };
     preserveExpandedContent: BooleanConstructor;
+    nativeScrollbar: BooleanConstructor;
 }>, {
     tableRef: Ref<ElTableV2Instance, ElTableV2Instance>;
     updateWrapSize: () => void;
@@ -172,12 +173,12 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     cellClick: (_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => void;
     cellDblclick: (_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => void;
     cellContextmenu: (_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => void;
-    rowClick: (_row: DataItem, _column: Column, _e: MouseEvent) => void;
+    rowClick: (_row: DataItem, _column: Column, _e: MouseEvent, _disabled?: boolean | undefined, _selection?: DataItem[] | undefined) => void;
     rowContextmenu: (_row: DataItem, _column: Column, _e: MouseEvent) => void;
     rowDblclick: (_row: DataItem, _column: Column, _e: MouseEvent) => void;
     headerClick: (_column: Column, _e: MouseEvent) => void;
     headerContextmenu: (_column: Column, _e: MouseEvent) => void;
-    sortChange: (_sorter: import('../ele-data-table/types').Sorter) => void;
+    sortChange: (_sorter: Sorter) => void;
     filterChange: (_filter: Filter) => void;
     currentChange: (_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => void;
     headerDragend: (_width: number, _old: number, _column: Column, _e: MouseEvent) => void;
@@ -306,6 +307,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         default: boolean;
     };
     preserveExpandedContent: BooleanConstructor;
+    nativeScrollbar: BooleanConstructor;
 }>> & Readonly<{
     onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
     onScroll?: ((_params: ScrollPos) => any) | undefined;
@@ -318,12 +320,12 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     onCellClick?: ((_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => any) | undefined;
     onCellDblclick?: ((_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => any) | undefined;
     onCellContextmenu?: ((_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => any) | undefined;
-    onRowClick?: ((_row: DataItem, _column: Column, _e: MouseEvent) => any) | undefined;
+    onRowClick?: ((_row: DataItem, _column: Column, _e: MouseEvent, _disabled?: boolean | undefined, _selection?: DataItem[] | undefined) => any) | undefined;
     onRowContextmenu?: ((_row: DataItem, _column: Column, _e: MouseEvent) => any) | undefined;
     onRowDblclick?: ((_row: DataItem, _column: Column, _e: MouseEvent) => any) | undefined;
     onHeaderClick?: ((_column: Column, _e: MouseEvent) => any) | undefined;
     onHeaderContextmenu?: ((_column: Column, _e: MouseEvent) => any) | undefined;
-    onSortChange?: ((_sorter: import('../ele-data-table/types').Sorter) => any) | undefined;
+    onSortChange?: ((_sorter: Sorter) => any) | undefined;
     onFilterChange?: ((_filter: Filter) => any) | undefined;
     onCurrentChange?: ((_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => any) | undefined;
     onHeaderDragend?: ((_width: number, _old: number, _column: Column, _e: MouseEvent) => any) | undefined;
@@ -332,11 +334,11 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     onRowsRendered?: ((_params: any) => any) | undefined;
 }>, {
     fit: boolean;
+    border: boolean;
     lazy: boolean;
     className: string;
     data: any[];
     stripe: boolean;
-    border: boolean;
     showHeader: boolean;
     showSummary: boolean;
     highlightCurrentRow: boolean;
@@ -350,6 +352,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     scrollbarTabindex: string | number;
     allowDragLastColumn: boolean;
     preserveExpandedContent: boolean;
+    nativeScrollbar: boolean;
     sticky: boolean;
     headerEllipsis: boolean;
     slotNormalize: boolean;

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

@@ -50,8 +50,13 @@ export declare const virtualTableProps: {
         type: import('vue').PropType<any[]>;
         default: () => never[];
     };
-    width: (NumberConstructor | StringConstructor)[];
     height: (NumberConstructor | StringConstructor)[];
+    maxHeight: (NumberConstructor | StringConstructor)[];
+    tableLayout: {
+        type: import('vue').PropType<"fixed" | "auto">;
+        default: string;
+    };
+    width: (NumberConstructor | StringConstructor)[];
     size: {
         readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
         readonly required: false;
@@ -62,7 +67,6 @@ export declare const virtualTableProps: {
         type: BooleanConstructor;
         default: boolean;
     };
-    maxHeight: (NumberConstructor | StringConstructor)[];
     lazy: BooleanConstructor;
     className: {
         type: StringConstructor;
@@ -109,10 +113,6 @@ export declare const virtualTableProps: {
         };
     };
     load: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["load"]>;
-    tableLayout: {
-        type: import('vue').PropType<"fixed" | "auto">;
-        default: string;
-    };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
     showOverflowTooltip: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["showOverflowTooltip"]>;
@@ -127,6 +127,7 @@ export declare const virtualTableProps: {
         default: boolean;
     };
     preserveExpandedContent: BooleanConstructor;
+    nativeScrollbar: BooleanConstructor;
 };
 export type VirtualTableProps = ExtractPropTypes<typeof virtualTableProps>;
 /**
@@ -146,7 +147,7 @@ export declare const virtualTableEmits: {
     cellClick: (_row: import('../ele-data-table/types').DataItem, _column: import('../ele-data-table/types').Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
     cellDblclick: (_row: import('../ele-data-table/types').DataItem, _column: import('../ele-data-table/types').Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
     cellContextmenu: (_row: import('../ele-data-table/types').DataItem, _column: import('../ele-data-table/types').Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
-    rowClick: (_row: import('../ele-data-table/types').DataItem, _column: import('../ele-data-table/types').Column, _e: MouseEvent) => boolean;
+    rowClick: (_row: import('../ele-data-table/types').DataItem, _column: import('../ele-data-table/types').Column, _e: MouseEvent, _disabled?: boolean, _selection?: import('../ele-data-table/types').DataItem[]) => boolean;
     rowContextmenu: (_row: import('../ele-data-table/types').DataItem, _column: import('../ele-data-table/types').Column, _e: MouseEvent) => boolean;
     rowDblclick: (_row: import('../ele-data-table/types').DataItem, _column: import('../ele-data-table/types').Column, _e: MouseEvent) => boolean;
     headerClick: (_column: import('../ele-data-table/types').Column, _e: MouseEvent) => boolean;

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

@@ -9,6 +9,7 @@
 .ele-virtual-table {
   position: relative;
   box-sizing: border-box;
+  overflow: hidden;
 
   /* 原始样式重写 */
   @include virtual-table-wrap {
@@ -529,13 +530,13 @@
 
   &::before {
     border-bottom-color: eleVar('table', 'icon-color');
-    margin-top: calc(0px - #{eleVar('table', 'sort-size')});
+    margin-top: calc(#{eleVar('table', 'sort-size')} * -1);
     margin-bottom: calc(#{eleVar('table', 'sort-space')} / 2);
   }
 
   &::after {
     border-top-color: eleVar('table', 'icon-color');
-    margin-bottom: calc(0px - #{eleVar('table', 'sort-size')});
+    margin-bottom: calc(#{eleVar('table', 'sort-size')} * -1);
     margin-top: calc(#{eleVar('table', 'sort-space')} / 2);
   }
 }

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

@@ -16,7 +16,8 @@ import type {
   DataKey,
   DataItem,
   Column,
-  FilterValue
+  FilterValue,
+  Sorter
 } from '../ele-data-table/types';
 export { RowExpandHandler, ScrollStrategy, SortBy, ScrollPos };
 
@@ -202,6 +203,8 @@ export interface TableState {
   reserveChecked: boolean;
   /** 表格垂直滚动位置 */
   scrollTop: number;
+  /** 表格排序状态 */
+  sorter?: Sorter;
 }
 
 /**