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

package/es/ele-viewer/util.js

@@ -1,3 +1,7 @@
+import { computed, onMounted, watch } from "vue";
+import { useLayoutState } from "../ele-pro-layout/util";
+import SvgRender from "../ele-qr-code-svg/components/svg-render";
+import { useSvgOption } from "../ele-qr-code-svg/util";
 function getRotatedBounds(w, h, r) {
   const radians = r * (Math.PI / 180);
   const cosR = Math.cos(radians);
@@ -6,6 +10,36 @@ function getRotatedBounds(w, h, r) {
   const height = Math.abs(w * sinR) + Math.abs(h * cosR);
   return { width, height };
 }
+function useContentRatio(updateStyle) {
+  const state = useLayoutState();
+  const to = computed(() => state.modalsEl || "body");
+  const { svgProps, svgKey, imageId } = useSvgOption();
+  const updateSpinnerStyle = () => {
+    updateStyle && updateStyle({
+      font: {
+        color: "rgba(122, 122, 122, 0.35)",
+        fontSize: 16,
+        fontWeight: "normal",
+        fontFamily: "sans-serif",
+        fontStyle: "normal"
+      },
+      commonStyle: {
+        position: "fixed",
+        pointerEvents: "none",
+        zIndex: 9999
+      },
+      contents: [svgKey.value]
+    });
+  };
+  onMounted(() => {
+    updateSpinnerStyle();
+  });
+  watch(svgKey, () => {
+    updateSpinnerStyle();
+  });
+  return { LoadingSpinner: SvgRender, slotProps: svgProps, show: imageId, to };
+}
 export {
-  getRotatedBounds
+  getRotatedBounds,
+  useContentRatio
 };

package/es/ele-virtual-table/components/body-cell.d.ts

@@ -136,11 +136,11 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     onCheckedChange?: ((_checked: boolean) => any) | undefined;
 }>, {
     loading: boolean;
+    isCollapse: boolean;
     isDisabled: boolean;
+    hasChildren: boolean;
     fixedCellHeight: boolean;
     autoRowHeight: boolean;
     isChecked: boolean;
-    hasChildren: boolean;
-    isCollapse: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 export default _default;

package/es/ele-virtual-table/components/body-cell.js

@@ -141,7 +141,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const col = originalCol.value;
       if (col) {
         if (col.align) {
-          classes.push("is-align-" + col.align);
+          classes.push(`is-align-${col.align}`);
         }
         if (isEllipsis.value) {
           classes.push("is-ellipsis");

package/es/ele-virtual-table/components/body-row.js

@@ -142,7 +142,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       return openBlock(true), createElementBlock(Fragment, null, renderList(__props.bodyCols, (column, columnIndex) => {
         return openBlock(), createBlock(BodyCell, {
-          key: (__props.rowId ?? __props.rowIndex) + "-" + (column.key ?? columnIndex),
+          key: `${__props.rowId ?? __props.rowIndex}-${column.key ?? columnIndex}`,
           column,
           columnIndex,
           rowIndex: __props.rowIndex,

package/es/ele-virtual-table/components/cell-filter.js

@@ -143,19 +143,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               ])
             ], 64)) : (openBlock(), createElementBlock("div", _hoisted_2, [
               createElementVNode("div", {
-                class: normalizeClass([
-                  "ele-table-filter-item",
-                  { "is-active": filteredValue.value == null }
-                ]),
+                class: normalizeClass(["ele-table-filter-item", { "is-active": filteredValue.value == null }]),
                 onClick: _cache[1] || (_cache[1] = ($event) => handleItemClick())
               }, toDisplayString(clearFilterText.value), 3),
               (openBlock(true), createElementBlock(Fragment, null, renderList(__props.filters, (d) => {
                 return openBlock(), createElementBlock("div", {
                   key: d.value,
-                  class: normalizeClass([
-                    "ele-table-filter-item",
-                    { "is-active": filteredValue.value === d.value }
-                  ]),
+                  class: normalizeClass(["ele-table-filter-item", { "is-active": filteredValue.value === d.value }]),
                   onClick: ($event) => handleItemClick(d.value)
                 }, toDisplayString(d.text), 11, _hoisted_3);
               }), 128))

package/es/ele-virtual-table/components/footer-row.js

@@ -49,7 +49,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         const sumValue = getSumValue(data.value, column.dataKey);
         const col = column.originalCol;
         return {
-          key: i + "-" + column.key,
+          key: `${i}-${column.key}`,
           width: colSize && colSize.width || 0,
           fixedLeft: colSize ? colSize.fixedLeft : void 0,
           fixedRight: colSize ? colSize.fixedRight : void 0,
@@ -72,9 +72,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         (openBlock(true), createElementBlock(Fragment, null, renderList(sumCols.value, (col) => {
           return openBlock(), createElementBlock("div", {
             key: col.key,
-            class: normalizeClass([
-              "ele-table-td",
-              "is-ellipsis",
+            class: normalizeClass(["ele-table-td is-ellipsis", [
               { "is-align-left": col.align === "left" },
               { "is-align-center": col.align === "center" },
               { "is-align-right": col.align === "right" },
@@ -82,7 +80,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               { "is-fixed-right": col.fixed === "right" },
               { "is-fixed-left-last": col.isFixedLeftLast },
               { "is-fixed-right-first": col.isFixedRightFirst }
-            ]),
+            ]]),
             style: normalizeStyle({
               width: col.width + "px",
               left: col.fixedLeft,

package/es/ele-virtual-table/components/header-cell.js

@@ -88,7 +88,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (col) {
         const align = col.headerAlign || col.align;
         if (align) {
-          classes.push("is-align-" + align);
+          classes.push(`is-align-${align}`);
         }
         if (col.sortable === true || col.sortable === "custom") {
           classes.push("is-sortable");
@@ -96,7 +96,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         if (props.sortBy != null && getColKey(col) === props.sortBy.key) {
           const sortClass = getOrderValue(props.sortBy.order);
           if (sortClass) {
-            classes.push("is-" + sortClass);
+            classes.push(`is-${sortClass}`);
           }
         }
         if (col.filters && col.filters.length && props.filterValue && props.filterValue.length) {

package/es/ele-virtual-table/components/header-row.js

@@ -48,7 +48,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const props = __props;
     const emit = __emit;
     const getKey = (column, columnIndex) => {
-      return props.headerIndex + "-" + String(column.key ?? columnIndex);
+      return `${props.headerIndex}-${String(column.key ?? columnIndex)}`;
     };
     const getFiltered = (column) => {
       return getColFiltered(column.originalCol, props.filtered);

package/es/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/es/ele-virtual-table/index.js

@@ -1,9 +1,10 @@
 import { defineComponent, ref, reactive, computed, onActivated, onDeactivated, watch, nextTick, createElementBlock, openBlock, normalizeClass, unref, createBlock, createCommentVNode, createVNode, mergeProps, createSlots, withCtx, renderSlot, toDisplayString, renderList, normalizeProps, guardReactiveProps } from "vue";
 import { useLocale, ElTableV2, ElEmpty } from "element-plus";
 import { eachTree, queryChild, findTree, getValue } from "../utils/common";
+import { useResizeObserver } from "../utils/hook";
 import EleTooltip from "../ele-tooltip/index";
 import { useEmits, useStickyHeader, isReserveChecked, valueIsChanged, arrayIsChanged, getRowKeys, mergeTooltipProps, getGlobalTooltipProps } from "../ele-data-table/util";
-import { useAutoResize, getDefaultSort, getDefaultFiltered, getTreeProps, getRowHeight, isAutoRowHeight, getTableHeight, analyseColumns, getColKey, transformTableData, getSelectableFunction, getSortBy, getOrderValue, getRowByKey, getKeysAndList, computeColSizes, colSizesIsChanged, getTableColumns, getColumnByKey, getSortOrder, cellIsOverflow } from "./util";
+import { getDefaultSorter, getDefaultSort, getDefaultFiltered, getTreeProps, getRowHeight, isAutoRowHeight, getTableHeight, analyseColumns, getColKey, transformTableData, getSelectableFunction, getSortBy, getOrderValue, getRowByKey, getKeysAndList, computeColSizes, colSizesIsChanged, getTableColumns, getColumnByKey, getSortOrder, cellIsOverflow, getSortCompareValue } from "./util";
 import HeaderRow from "./components/header-row";
 import BodyRow from "./components/body-row";
 import ExpandRow from "./components/expand-row";
@@ -24,14 +25,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const emit = __emit;
     const { t } = useLocale();
     const events = useEmits(emit);
-    const { wrapWidth, wrapHeight, updateWrapSize } = useAutoResize(
-      () => rootRef.value
-    );
+    const [wrapWidth, wrapHeight, updateWrapSize] = useResizeObserver({
+      getEl: () => rootRef.value
+    });
     const { isLayoutFixedHead, isLayoutMaximized } = useStickyHeader();
     const tableState = {
       checked: /* @__PURE__ */ new Map(),
       reserveChecked: false,
-      scrollTop: 0
+      scrollTop: 0,
+      sorter: getDefaultSorter(props.defaultSort, props.columns)
     };
     const rootRef = ref(null);
     const tableRef = ref(null);
@@ -44,6 +46,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const tableWidth = ref(0);
     const tableHeight = ref(0);
     const tableData = ref([]);
+    const tableCurrentData = ref([]);
     const tableColumns = ref([]);
     const tableScrollLeft = ref(0);
     const selectedRowKey = ref(props.currentRowKey ?? null);
@@ -80,10 +83,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     const isTreeData = computed(() => {
       return tableData.value.some(
-        (d) => {
-          var _a;
-          return ((_a = d.children) == null ? void 0 : _a.length) || props.lazy && d.hasChildren;
-        }
+        (d) => d.children?.length || props.lazy && d.hasChildren
       );
     });
     const tableExpandCol = computed(() => {
@@ -124,7 +124,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return props.showHeader ? headerRows.value.length : 0;
     });
     const hasFooter = computed(() => {
-      return !!(props.showSummary && tableData.value.length);
+      return !!(props.showSummary && tableCurrentData.value.length);
     });
     const tableProps = computed(() => {
       const rowHeight = tableRowHeight.value;
@@ -132,7 +132,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const opt = {
         cache: 2,
         estimatedRowHeight: autoRowHeight.value ? rowHeight : void 0,
-        headerClass: (params) => {
+        headerClass: ((params) => {
           const rowClass = props.headerRowClassName;
           const classes = ["ele-table-head-tr"];
           if (typeof rowClass === "function") {
@@ -144,7 +144,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             classes.push(rowClass);
           }
           return classes.join(" ");
-        },
+        }),
         headerProps: (params) => {
           const opt2 = { rowIndex: params.headerIndex };
           const style = props.headerRowStyle;
@@ -153,7 +153,7 @@ const _sfc_main = /* @__PURE__ */ 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;
@@ -177,7 +177,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             }
           }
           return classes.join(" ");
-        },
+        }),
         rowKey: "rowId",
         rowProps: (params) => {
           const row = params.rowData;
@@ -188,7 +188,7 @@ const _sfc_main = /* @__PURE__ */ 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,
@@ -223,6 +223,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const tableEmptyText = computed(() => {
       return props.errorText || props.emptyText || t("el.table.emptyText");
     });
+    const hideTooltip = () => {
+      tableTooltipProps.visible = false;
+      tableTooltipProps.disabled = true;
+    };
     const triggerTooltip = (cell, col) => {
       const cellText = cell.innerText;
       const tooltip = mergeTooltipProps(
@@ -255,14 +259,43 @@ const _sfc_main = /* @__PURE__ */ 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 = getSortCompareValue(col.sortMethod, a, b, prop);
+            return v * reverse;
+          });
+        }
+      }
+      Object.keys(filtered).forEach((key) => {
+        const col = getColumnByKey(props.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 = getColKey(params.column);
       if (key) {
         filtered[key] = params.value;
+        sortAndFilterTableData();
         events.onFilterChange(filtered);
       }
     };
@@ -322,7 +355,7 @@ const _sfc_main = /* @__PURE__ */ 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;
@@ -346,13 +379,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const handleHeaderCellClick = (col, e) => {
       if (col && (col.sortable === true || col.sortable === "custom")) {
         sortBy.value = getSortBy(sortBy.value, col);
-        events.onSortChange({
-          prop: col.property || col.prop,
-          order: getOrderValue(
-            sortBy.value ? sortBy.value.order : void 0
-          ),
-          column: col
-        });
+        const prop = col.property || col.prop;
+        const order = getOrderValue(
+          sortBy.value ? sortBy.value.order : void 0
+        );
+        const sorter = { prop, order, column: col };
+        sortAndFilterTableData(sorter);
+        events.onSortChange(sorter);
       }
       events.onHeaderClick(col, e);
     };
@@ -400,6 +433,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         props.rowKey,
         getSelectableFunction(bodyCols.value)
       );
+      sortAndFilterTableData();
       if (props.defaultExpandAll) {
         toggleRowExpansionAll(true);
       } else if (props.expandRowKeys && props.expandRowKeys.length) {
@@ -420,7 +454,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         const row = getRowByKey(key, tableData.value);
         if (row != null || props.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 && props.cacheData != null) {
             tableState.row = getRowByKey(
               key,
@@ -709,6 +743,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const clearSort = () => {
       if (sortBy.value != null) {
         sortBy.value = void 0;
+        tableState.sorter = void 0;
+        sortAndFilterTableData();
       }
     };
     const clearFilter = (columnKeys) => {
@@ -719,6 +755,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           filtered[key] = [];
         }
       });
+      sortAndFilterTableData();
     };
     const doLayout = (force) => {
       const { width, sumWidth, rowSizes, colSizes } = computeColSizes(
@@ -748,7 +785,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         key: getColKey(col),
         order: 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) {
@@ -925,8 +964,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return openBlock(), createElementBlock("div", {
         ref_key: "rootRef",
         ref: rootRef,
-        class: normalizeClass([
-          "ele-virtual-table",
+        class: normalizeClass(["ele-virtual-table", [
           { "is-border": _ctx.border || headerRows.value.length > 1 },
           { "is-stripe": _ctx.stripe },
           { "is-sticky": _ctx.sticky },
@@ -940,7 +978,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           { "is-auto-width": unref(wrapWidth) === tableWidth.value },
           { "is-small": _ctx.size === "small" },
           { "is-large": _ctx.size === "large" }
-        ]),
+        ]]),
         onMouseleave: handleTableMouseleave
       }, [
         tableProps.value.width ? (openBlock(), createBlock(unref(ElTableV2), mergeProps({ key: 0 }, tableProps.value, {
@@ -985,70 +1023,67 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               })
             ]), 1032, ["headerCols", "headerColSizes", "headerIndex", "sortBy", "filtered", "isCheckAll", "isIndeterminate", "disabledCheckbox", "tableSize", "headerCellClass", "headerCellStyle", "rowHeight"])) : createCommentVNode("", true)
           ]),
-          row: withCtx((rowProps) => {
-            var _a;
-            return [
-              rowProps && rowProps.rowData && rowProps.rowData.isExpandRow ? (openBlock(), createBlock(ExpandRow, {
-                key: 0,
-                column: (_a = tableExpandCol.value) == null ? void 0 : _a.originalCol,
-                rowIndex: rowProps.rowData.rowIndex,
-                rowData: rowProps.rowData.rowData,
-                onMouseenter: handleExpandCellMouseenter
-              }, createSlots({ _: 2 }, [
-                renderList(Object.keys(_ctx.$slots).filter(
-                  (k) => !ownSlots.includes(k)
-                ), (name) => {
-                  return {
-                    name,
-                    fn: withCtx((slotProps) => [
-                      renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
-                    ])
-                  };
-                })
-              ]), 1032, ["column", "rowIndex", "rowData"])) : rowProps && rowProps.rowData && rowProps.rowData.rowData ? (openBlock(), 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
-              }, createSlots({ _: 2 }, [
-                renderList(Object.keys(_ctx.$slots).filter(
-                  (k) => !ownSlots.includes(k)
-                ), (name) => {
-                  return {
-                    name,
-                    fn: withCtx((slotProps) => [
-                      renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
-                    ])
-                  };
-                })
-              ]), 1032, ["bodyCols", "colSizes", "rowIndex", "rowItem", "rowId", "checkedRowKeys", "bodyCellClass", "bodyCellStyle", "spanMethod", "tableTooltipProps", "pageIndex", "rowHeight", "tableSize", "expandColumnKey", "expandedRowKeys", "lazy", "load", "level", "indent", "fixedCellHeight", "autoRowHeight"])) : createCommentVNode("", true)
-            ];
-          }),
+          row: withCtx((rowProps) => [
+            rowProps && rowProps.rowData && rowProps.rowData.isExpandRow ? (openBlock(), createBlock(ExpandRow, {
+              key: 0,
+              column: tableExpandCol.value?.originalCol,
+              rowIndex: rowProps.rowData.rowIndex,
+              rowData: rowProps.rowData.rowData,
+              onMouseenter: handleExpandCellMouseenter
+            }, createSlots({ _: 2 }, [
+              renderList(Object.keys(_ctx.$slots).filter(
+                (k) => !ownSlots.includes(k)
+              ), (name) => {
+                return {
+                  name,
+                  fn: withCtx((slotProps) => [
+                    renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
+                  ])
+                };
+              })
+            ]), 1032, ["column", "rowIndex", "rowData"])) : rowProps && rowProps.rowData && rowProps.rowData.rowData ? (openBlock(), 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
+            }, createSlots({ _: 2 }, [
+              renderList(Object.keys(_ctx.$slots).filter(
+                (k) => !ownSlots.includes(k)
+              ), (name) => {
+                return {
+                  name,
+                  fn: withCtx((slotProps) => [
+                    renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
+                  ])
+                };
+              })
+            ]), 1032, ["bodyCols", "colSizes", "rowIndex", "rowItem", "rowId", "checkedRowKeys", "bodyCellClass", "bodyCellStyle", "spanMethod", "tableTooltipProps", "pageIndex", "rowHeight", "tableSize", "expandColumnKey", "expandedRowKeys", "lazy", "load", "level", "indent", "fixedCellHeight", "autoRowHeight"])) : createCommentVNode("", true)
+          ]),
           empty: withCtx(() => [
             renderSlot(_ctx.$slots, "empty", {
               text: _ctx.emptyText,
@@ -1072,7 +1107,7 @@ const _sfc_main = /* @__PURE__ */ 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,