ele-admin-plus 1.1.9-beta.1 → 1.1.9-beta.11

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

@@ -1,8 +1,9 @@
-import type { Ref } from 'vue';
-import type { ElTableV2Instance, ElTableV2Props } from '../ele-app/el';
-import type { DataKey, DataItem, Column, Filter, OrderValue } from '../ele-data-table/types';
-import type { BodyColumns, HeaderRows, CellFilterChangeParams, SortBy, ScrollStrategy, ScrollPos, ColSize } from './types';
-declare const _default: import("vue").DefineComponent<{
+import { BodyColumn, BodyColumns, HeaderRows, CellFilterChangeParams, SortBy, ScrollStrategy, ScrollPos, ColSize, VirtualRow } from './types';
+import { DataKey, DataItem, Column, Filter, OrderValue } from '../ele-data-table/types';
+import { ElTableV2Instance, ElTableV2Props } from '../ele-app/el';
+import { Ref } from 'vue';
+
+declare const _default: import('vue').DefineComponent<{
     rowHeight: NumberConstructor;
     stripe: {
         type: BooleanConstructor;
@@ -65,14 +66,10 @@ declare const _default: import("vue").DefineComponent<{
         default: () => never[];
     };
     height: (StringConstructor | NumberConstructor)[];
-    scrollbarAlwaysOn: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
+    scrollbarAlwaysOn: BooleanConstructor;
     showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     emptyText: StringConstructor;
     indent: {
-        /** 是否显示表尾 */
         type: NumberConstructor;
         default: number;
     };
@@ -138,7 +135,7 @@ declare const _default: import("vue").DefineComponent<{
     bodyColSizes: Ref<ColSize[]>;
     colsSumWidth: Ref<number>;
     tableWidth: Ref<number>;
-    tableData: Ref<DataItem[]>;
+    tableData: Ref<VirtualRow[]>;
     isCheckAll: Ref<boolean>;
     isIndeterminate: import("vue").ComputedRef<boolean>;
     checkedRowKeys: Ref<Set<DataKey>>;
@@ -146,8 +143,7 @@ declare const _default: import("vue").DefineComponent<{
     sortBy: Ref<SortBy | undefined>;
     filtered: Filter;
     tableTooltipProps: Partial<import("../ele-tooltip/props").TooltipProps>;
-    treeHasChildrenName: import("vue").ComputedRef<string>;
-    tableExpandCol: import("vue").ComputedRef<Partial<import("element-plus").Column<DataItem>> | undefined>;
+    tableExpandCol: import("vue").ComputedRef<BodyColumn | undefined>;
     hasExpandCol: import("vue").ComputedRef<boolean>;
     tableExpandColumnKey: import("vue").ComputedRef<string | undefined>;
     tableRowHeight: import("vue").ComputedRef<number>;
@@ -160,13 +156,13 @@ declare const _default: import("vue").DefineComponent<{
     tableEmptyText: import("vue").ComputedRef<string>;
     tableEmptyProps: import("vue").ComputedRef<import("../ele-app/el").ElEmptyProps>;
     onTableFilterChange: (params: CellFilterChangeParams) => void;
-    onCellCheckedChange: (row: DataItem, checked: boolean) => void;
-    onCellExpandChange: (row: DataItem, expanded: boolean, children?: DataItem[]) => void;
-    onCellClick: (row: DataItem, col: Column, e: MouseEvent) => void;
-    onCellDblclick: (row: DataItem, col: Column, e: MouseEvent) => void;
-    onCellContextmenu: (row: DataItem, col: Column, e: MouseEvent) => void;
-    onCellMouseenter: (row: DataItem, col: Column, e: MouseEvent) => void;
-    onCellMouseleave: (row: DataItem, col: Column, e: MouseEvent) => void;
+    onCellCheckedChange: (row: VirtualRow, checked: boolean) => void;
+    onCellExpandChange: (row: VirtualRow, expanded: boolean, children?: DataItem[]) => void;
+    onCellClick: (row: VirtualRow, col: Column, e: MouseEvent) => void;
+    onCellDblclick: (row: VirtualRow, col: Column, e: MouseEvent) => void;
+    onCellContextmenu: (row: VirtualRow, col: Column, e: MouseEvent) => void;
+    onCellMouseenter: (row: VirtualRow, col: Column, e: MouseEvent) => void;
+    onCellMouseleave: (row: VirtualRow, col: Column, e: MouseEvent) => void;
     onHeaderCellClick: (col: Column | undefined, e: MouseEvent) => void;
     onHeaderCellContextmenu: (col: Column, e: MouseEvent) => void;
     onHeaderCellMouseenter: () => void;
@@ -184,7 +180,7 @@ declare const _default: import("vue").DefineComponent<{
     getSelectionRows: () => DataItem[];
     toggleRowSelection: (row: DataItem, selected?: boolean) => void;
     toggleAllSelection: () => void;
-    toggleRowExpansion: (row: DataItem, expanded?: boolean) => void;
+    toggleRowExpansion: (row: VirtualRow, expanded?: boolean) => void;
     setCurrentRow: (row?: DataItem | null) => void;
     setCurrentRowKey: (key?: DataKey | null) => void;
     getCurrentRow: () => DataItem | undefined;
@@ -207,18 +203,17 @@ declare const _default: import("vue").DefineComponent<{
     cellDblclick: (_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
     cellContextmenu: (_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
     rowClick: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean;
-    rowContextmenu: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean; /** 根节点 */
+    rowContextmenu: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean;
     rowDblclick: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean;
     headerClick: (_column: Column, _e: MouseEvent) => boolean;
     headerContextmenu: (_column: Column, _e: MouseEvent) => boolean;
     sortChange: (_sorter: import("../ele-data-table/types").Sorter) => boolean;
-    filterChange: (_filter: Filter) => boolean; /** 主体区域列 */
+    filterChange: (_filter: Filter) => boolean;
     currentChange: (_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => boolean;
-    /** 表头所有行列宽 */
     headerDragend: (_width: number, _old: number, _column: Column, _e: MouseEvent) => boolean;
     expandChange: (_row: DataItem, _expanded: boolean) => boolean;
     'update:currentRowKey': (_currentRowKey?: DataKey | undefined) => boolean;
-    'update:selectedRowKeys': (_selectedRowKeys?: DataKey[] | undefined) => boolean;
+    'update:selectedRowKeys': (_selectedRowKeys?: DataKey[] | undefined) => boolean; /** 表格高度 */
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     rowHeight: NumberConstructor;
     stripe: {
@@ -282,14 +277,10 @@ declare const _default: import("vue").DefineComponent<{
         default: () => never[];
     };
     height: (StringConstructor | NumberConstructor)[];
-    scrollbarAlwaysOn: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
+    scrollbarAlwaysOn: BooleanConstructor;
     showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     emptyText: StringConstructor;
     indent: {
-        /** 是否显示表尾 */
         type: NumberConstructor;
         default: number;
     };
@@ -346,6 +337,7 @@ declare const _default: import("vue").DefineComponent<{
     flexible: BooleanConstructor;
 }>> & {
     onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
+    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     onSelectAll?: ((_selection: DataItem[]) => any) | undefined;
     onSelectionChange?: ((_selection: DataItem[]) => any) | undefined;
     onCellMouseEnter?: ((_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => any) | undefined;
@@ -362,7 +354,6 @@ declare const _default: import("vue").DefineComponent<{
     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;
-    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     "onUpdate:currentRowKey"?: ((_currentRowKey?: DataKey | undefined) => any) | undefined;
     "onUpdate:selectedRowKeys"?: ((_selectedRowKeys?: DataKey[] | undefined) => any) | undefined;
 }, {
@@ -385,9 +376,9 @@ declare const _default: import("vue").DefineComponent<{
     } | undefined;
     tableLayout: "auto" | "fixed";
     flexible: boolean;
+    sticky: boolean;
     headerEllipsis: boolean;
     slotNormalize: boolean;
-    sticky: boolean;
     bottomLine: boolean;
     emptyProps: import("../ele-data-table/types").TableEmptyProps;
     reserveCurrent: boolean;

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

@@ -1,8 +1,8 @@
 import { defineComponent, ref, reactive, computed, onActivated, onDeactivated, watch, nextTick, resolveComponent, openBlock, createElementBlock, normalizeClass, createBlock, mergeProps, createSlots, withCtx, renderList, renderSlot, normalizeProps, guardReactiveProps, createCommentVNode, toDisplayString, createVNode } from "vue";
 import { ElTableV2, ElEmpty, useLocale } from "element-plus";
-import { eachTree } from "../utils/core";
+import { eachTree, findTree } from "../utils/core";
 import EleTooltip from "../ele-tooltip/index";
-import { useEmits, getEmptyProps, isReserveChecked, getValue, valueIsChanged, arrayIsChanged, getRowKeys, mergeTooltipProps, getGlobalTooltipProps } from "../ele-data-table/util";
+import { useEmits, getEmptyProps, isReserveChecked, valueIsChanged, arrayIsChanged, getValue, 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 HeaderRow from "./components/header-row";
 import BodyRow from "./components/body-row";
@@ -35,7 +35,7 @@ const _sfc_main = defineComponent({
     };
     const rootRef = ref(null);
     const tableRef = ref(null);
-    const tableKey = ref(1);
+    const tableKey = ref(0);
     const headerRows = ref([]);
     const bodyCols = ref([]);
     const headerRowSizes = ref([]);
@@ -81,9 +81,12 @@ const _sfc_main = defineComponent({
       return treeTableProps.value.hasChildrenName;
     });
     const isTreeData = computed(() => {
-      return tableData.value.some((d) => {
-        return d.children && d.children.length || props.lazy && d[treeHasChildrenName.value] === true;
-      });
+      return tableData.value.some(
+        (d) => {
+          var _a;
+          return ((_a = d.children) == null ? void 0 : _a.length) || props.lazy && d.hasChildren;
+        }
+      );
     });
     const tableExpandCol = computed(() => {
       return bodyCols.value.find((d) => {
@@ -155,19 +158,19 @@ const _sfc_main = defineComponent({
         rowClass: (params) => {
           const classes = ["ele-table-tr"];
           const row = params.rowData;
-          const rowIndex = row._rowIndex;
-          if (row && row._isExpandRow === true) {
+          const rowIndex = row.rowIndex;
+          if (row && row.isExpandRow === true) {
             classes.push("is-expand-row");
           } else if (row) {
             if (props.stripe && (rowIndex + 1) % 2 === 0) {
               classes.push("is-even");
             }
-            if (props.highlightCurrentRow && selectedRowKey.value != null && selectedRowKey.value === row._rowKey) {
+            if (props.highlightCurrentRow && selectedRowKey.value != null && selectedRowKey.value === row.rowId) {
               classes.push("is-current");
             }
             const rowClass = props.rowClassName;
             if (typeof rowClass === "function") {
-              const custom = rowClass({ row, rowIndex });
+              const custom = rowClass({ row: row.rowData, rowIndex });
               if (custom) {
                 classes.push(custom);
               }
@@ -177,10 +180,10 @@ const _sfc_main = defineComponent({
           }
           return classes.join(" ");
         },
-        rowKey: "_rowKey",
+        rowKey: "rowId",
         rowProps: (params) => {
           const row = params.rowData;
-          const opt2 = { row, rowIndex: row._rowIndex };
+          const opt2 = { row: row.rowData, rowIndex: row.rowIndex };
           const style = props.rowStyle;
           return { style: typeof style === "function" ? style(opt2) : style };
         },
@@ -269,9 +272,9 @@ const _sfc_main = defineComponent({
       }
     };
     const onCellCheckedChange = (row, checked) => {
-      toggleSelected(row, checked);
+      toggleSelected(row.rowData, row.rowId, checked);
       const selection = getSelectionRows();
-      events.onSelect(selection, row);
+      events.onSelect(selection, row.rowData);
       events.onSelectionChange(selection);
     };
     const onCellExpandChange = (row, expanded, children) => {
@@ -280,19 +283,20 @@ const _sfc_main = defineComponent({
           children,
           hasExpandCol.value,
           treeChildrenName.value,
+          treeHasChildrenName.value,
           props.rowKey,
           getSelectableFunction(bodyCols.value)
         );
         let index2 = -1;
         eachTree(tableData.value, (d) => {
           index2++;
-          if (d._rowKey === row._rowKey) {
+          if (d.rowId === row.rowId) {
             d.children = childs;
             if (!childs.length) {
-              d[treeHasChildrenName.value] = false;
+              d.hasChildren = false;
             }
           }
-          d._rowIndex = index2;
+          d.rowIndex = index2;
         });
         if (!childs.length) {
           return;
@@ -302,46 +306,47 @@ const _sfc_main = defineComponent({
     };
     const onCellClick = (row, col, e) => {
       const cell = e.currentTarget;
-      events.onCellClick(row, col, cell, e);
+      const rowData = row.rowData;
+      const rowDataKey = row.rowId;
+      events.onCellClick(rowData, col, cell, e);
       if (props.highlightCurrentRow) {
-        setCurrentRow(row);
+        setCurrentRow(rowData);
       }
-      if (props.rowClickChecked && !row._rowDisabled) {
+      if (props.rowClickChecked && !row.isDisabled) {
         if (props.rowClickChecked === "smart" && (!checkedRowKeys.value.size || checkedRowKeys.value.size === 1)) {
-          const key = getValue(row, props.rowKey);
-          if (key != null && !checkedRowKeys.value.has(key)) {
-            checkedRowKeys.value = /* @__PURE__ */ new Set([key]);
+          if (rowDataKey != null && !checkedRowKeys.value.has(rowDataKey)) {
+            checkedRowKeys.value = /* @__PURE__ */ new Set([rowDataKey]);
             tableState.checked.clear();
-            tableState.checked.set(key, row);
+            tableState.checked.set(rowDataKey, rowData);
             updateIsCheckAll();
-            updateSelectedRowKeys([key]);
-            events.onSelectionChange([row]);
+            updateSelectedRowKeys([rowDataKey]);
+            events.onSelectionChange([rowData]);
           }
         } else {
-          toggleSelected(row);
+          toggleSelected(rowData, rowDataKey);
           events.onSelectionChange(getSelectionRows());
         }
       }
-      events.onRowClick(row, col, e);
+      events.onRowClick(rowData, col, e);
     };
     const onCellDblclick = (row, col, e) => {
       const cell = e.currentTarget;
-      events.onCellDblclick(row, col, cell, e);
-      events.onRowDblclick(row, col, e);
+      events.onCellDblclick(row.rowData, col, cell, e);
+      events.onRowDblclick(row.rowData, col, e);
     };
     const onCellContextmenu = (row, col, e) => {
       const cell = e.currentTarget;
-      events.onCellContextmenu(row, col, cell, e);
-      events.onRowContextmenu(row, col, e);
+      events.onCellContextmenu(row.rowData, col, cell, e);
+      events.onRowContextmenu(row.rowData, col, e);
     };
     const onCellMouseenter = (row, col, e) => {
       const cell = e.currentTarget;
       triggerTooltip(cell, col);
-      events.onCellMouseEnter(row, col, cell, e);
+      events.onCellMouseEnter(row.rowData, col, cell, e);
     };
     const onCellMouseleave = (row, col, e) => {
       const cell = e.currentTarget;
-      events.onCellMouseLeave(row, col, cell, e);
+      events.onCellMouseLeave(row.rowData, col, cell, e);
     };
     const onHeaderCellClick = (col, e) => {
       if (col && (col.sortable === true || col.sortable === "custom")) {
@@ -395,6 +400,7 @@ const _sfc_main = defineComponent({
         props.data,
         hasExpandCol.value,
         treeChildrenName.value,
+        treeHasChildrenName.value,
         props.rowKey,
         getSelectableFunction(bodyCols.value)
       );
@@ -418,7 +424,7 @@ const _sfc_main = defineComponent({
         const row = getRowByKey(key, tableData.value);
         if (row != null || props.reserveCurrent) {
           tableState.oldRow = tableState.row;
-          tableState.row = row || item || void 0;
+          tableState.row = (row == null ? void 0 : row.rowData) || item || void 0;
           if (tableState.row == null && props.cacheData != null) {
             tableState.row = getRowByKey(
               key,
@@ -446,7 +452,7 @@ const _sfc_main = defineComponent({
       if (key != null) {
         const row = getRowByKey(key, tableData.value);
         if (row != null) {
-          updateSelectedState(key, row);
+          updateSelectedState(key, row.rowData);
         } else if (!props.reserveCurrent) {
           updateSelectedState(null);
         } else if (props.cacheData != null) {
@@ -473,7 +479,7 @@ const _sfc_main = defineComponent({
         checkedRowKeys.value.forEach((key2) => {
           const index2 = dataKeys.indexOf(key2);
           if (index2 !== -1) {
-            const row = list[index2];
+            const row = list[index2].rowData;
             if (tableState.checked.get(key2) !== row) {
               tableState.checked.set(key2, row);
             }
@@ -506,31 +512,24 @@ const _sfc_main = defineComponent({
         isCheckAll.value = false;
         return;
       }
-      let checked = true;
-      eachTree(tableData.value, (d) => {
-        if (!d._isExpandRow && !d._rowDisabled && d._rowKey != null && !checkedRowKeys.value.has(d._rowKey)) {
-          checked = false;
-          return false;
-        }
-      });
-      isCheckAll.value = checked;
+      const unchecked = findTree(
+        tableData.value,
+        (d) => !d.isExpandRow && !d.isDisabled && d.rowId != null && !checkedRowKeys.value.has(d.rowId)
+      );
+      isCheckAll.value = unchecked == null;
     };
-    const toggleSelected = (row, selected) => {
-      const dataKey = getValue(row, props.rowKey);
-      if (dataKey == null) {
-        return;
-      }
-      const isChecked = checkedRowKeys.value.has(dataKey);
+    const toggleSelected = (row, rowDataKey, selected) => {
+      const isChecked = checkedRowKeys.value.has(rowDataKey);
       const checked = selected == null ? !isChecked : selected;
       if (checked === isChecked) {
         return;
       }
       if (checked) {
-        checkedRowKeys.value.add(dataKey);
-        tableState.checked.set(dataKey, row);
+        checkedRowKeys.value.add(rowDataKey);
+        tableState.checked.set(rowDataKey, row);
       } else {
-        checkedRowKeys.value.delete(dataKey);
-        tableState.checked.delete(dataKey);
+        checkedRowKeys.value.delete(rowDataKey);
+        tableState.checked.delete(rowDataKey);
       }
       updateIsCheckAll();
       updateSelectedRowKeys(Array.from(checkedRowKeys.value));
@@ -577,7 +576,7 @@ const _sfc_main = defineComponent({
         keys.forEach((key) => {
           const index2 = dataKeys.indexOf(key);
           if (index2 !== -1) {
-            tableState.checked.set(key, list[index2]);
+            tableState.checked.set(key, list[index2].rowData);
           } else if (props.cacheData != null) {
             const i = cacheKeys.indexOf(key);
             if (i !== -1) {
@@ -590,9 +589,9 @@ const _sfc_main = defineComponent({
         tableState.checked.clear();
         if (keys.length) {
           eachTree(tableData.value, (d) => {
-            if (!d._isExpandRow && d._rowKey != null && keys.includes(d._rowKey)) {
-              checkedRowKeys.value.add(d._rowKey);
-              tableState.checked.set(d._rowKey, d);
+            if (!d.isExpandRow && d.rowId != null && keys.includes(d.rowId)) {
+              checkedRowKeys.value.add(d.rowId);
+              tableState.checked.set(d.rowId, d.rowData);
             }
           });
         }
@@ -615,9 +614,9 @@ const _sfc_main = defineComponent({
       const keys = [];
       const rows = [];
       eachTree(tableData.value, (row) => {
-        if (row.children && row.children.length && row._rowKey != null) {
-          keys.push(row._rowKey);
-          rows.push(row);
+        if (row.children && row.children.length && row.rowId != null) {
+          keys.push(row.rowId);
+          rows.push(row.rowData);
         }
       });
       expandedRowKeys.value = keys;
@@ -644,7 +643,7 @@ const _sfc_main = defineComponent({
         return;
       }
       const oldSelection = getSelectionRows();
-      toggleSelected(row, selected);
+      toggleSelected(row, key, selected);
       const selection = getSelectionRows();
       if (arrayIsChanged(oldSelection, selection)) {
         events.onSelectionChange(selection);
@@ -658,9 +657,9 @@ const _sfc_main = defineComponent({
         if (checkedRowKeys.value.size) {
           if (tableState.reserveChecked) {
             eachTree(tableData.value, (d) => {
-              if (!d._isExpandRow && d._rowKey != null) {
-                checkedRowKeys.value.delete(d._rowKey);
-                tableState.checked.delete(d._rowKey);
+              if (!d.isExpandRow && d.rowId != null) {
+                checkedRowKeys.value.delete(d.rowId);
+                tableState.checked.delete(d.rowId);
               }
             });
             isCheckAll.value = false;
@@ -676,9 +675,9 @@ const _sfc_main = defineComponent({
         return;
       }
       eachTree(tableData.value, (d) => {
-        if (!d._isExpandRow && !d._rowDisabled && d._rowKey != null) {
-          checkedRowKeys.value.add(d._rowKey);
-          tableState.checked.set(d._rowKey, d);
+        if (!d.isExpandRow && !d.isDisabled && d.rowId != null) {
+          checkedRowKeys.value.add(d.rowId);
+          tableState.checked.set(d.rowId, d.rowData);
         }
       });
       isCheckAll.value = true;
@@ -688,10 +687,7 @@ const _sfc_main = defineComponent({
       events.onSelectAll(selection);
     };
     const toggleRowExpansion = (row, expanded) => {
-      const dataKey = getValue(row, props.rowKey);
-      if (dataKey == null) {
-        return;
-      }
+      const dataKey = row.rowId;
       const isSpread = expandedRowKeys.value.includes(dataKey);
       const spread = expanded == null ? !isSpread : expanded;
       if (spread === isSpread) {
@@ -703,7 +699,7 @@ const _sfc_main = defineComponent({
         const index2 = expandedRowKeys.value.findIndex((t2) => t2 === dataKey);
         expandedRowKeys.value.splice(index2, 1);
       }
-      events.onExpandChange(row, spread);
+      events.onExpandChange(row.rowData, spread);
     };
     const setCurrentRow = (row) => {
       updateSelectedState(getValue(row, props.rowKey), row);
@@ -925,7 +921,6 @@ const _sfc_main = defineComponent({
       sortBy,
       filtered,
       tableTooltipProps,
-      treeHasChildrenName,
       tableExpandCol,
       hasExpandCol,
       tableExpandColumnKey,
@@ -1055,67 +1050,70 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           })
         ]), 1032, ["headerCols", "headerColSizes", "headerIndex", "sortBy", "filtered", "isCheckAll", "isIndeterminate", "disabledCheckbox", "tableSize", "headerCellClass", "headerCellStyle", "rowHeight", "onFilterChange", "onCellClick", "onCellContextmenu", "onCellMouseenter"])) : createCommentVNode("", true)
       ]),
-      row: withCtx((rowProps) => [
-        rowProps && rowProps.rowData && rowProps.rowData._isExpandRow ? (openBlock(), createBlock(_component_ExpandRow, {
-          key: 0,
-          column: _ctx.tableExpandCol,
-          rowIndex: rowProps.rowData._expandParantIndex,
-          rowData: rowProps.rowData._expandParent,
-          onMouseenter: _ctx.onExpandCellMouseenter
-        }, createSlots({ _: 2 }, [
-          renderList(Object.keys(_ctx.$slots).filter(
-            (k) => !["default", "empty", "append"].includes(k)
-          ), (name) => {
-            return {
-              name,
-              fn: withCtx((slotProps) => [
-                renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
-              ])
-            };
-          })
-        ]), 1032, ["column", "rowIndex", "rowData", "onMouseenter"])) : rowProps ? (openBlock(), createBlock(_component_BodyRow, {
-          key: 1,
-          bodyCols: _ctx.bodyCols,
-          colSizes: _ctx.bodyColSizes,
-          rowIndex: rowProps.rowData._rowIndex,
-          rowData: rowProps.rowData,
-          checkedRowKeys: _ctx.checkedRowKeys,
-          tableSize: _ctx.size,
-          bodyCellClass: _ctx.cellClassName,
-          bodyCellStyle: _ctx.cellStyle,
-          spanMethod: _ctx.spanMethod,
-          tableTooltipProps: _ctx.showOverflowTooltip,
-          pageIndex: _ctx.pageIndex,
-          rowHeight: _ctx.tableRowHeight,
-          expandColumnKey: _ctx.tableExpandColumnKey,
-          expandedRowKeys: _ctx.expandedRowKeys,
-          hasChildrenName: _ctx.treeHasChildrenName,
-          lazy: _ctx.lazy,
-          load: _ctx.load,
-          level: rowProps.depth,
-          indent: _ctx.indent,
-          fixedCellHeight: _ctx.hasExpandCol,
-          autoRowHeight: _ctx.autoRowHeight,
-          onCellCheckedChange: _ctx.onCellCheckedChange,
-          onCellExpandChange: _ctx.onCellExpandChange,
-          onCellClick: _ctx.onCellClick,
-          onCellDblclick: _ctx.onCellDblclick,
-          onCellContextmenu: _ctx.onCellContextmenu,
-          onCellMouseenter: _ctx.onCellMouseenter,
-          onCellMouseleave: _ctx.onCellMouseleave
-        }, createSlots({ _: 2 }, [
-          renderList(Object.keys(_ctx.$slots).filter(
-            (k) => !["default", "empty", "append"].includes(k)
-          ), (name) => {
-            return {
-              name,
-              fn: withCtx((slotProps) => [
-                renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
-              ])
-            };
-          })
-        ]), 1032, ["bodyCols", "colSizes", "rowIndex", "rowData", "checkedRowKeys", "tableSize", "bodyCellClass", "bodyCellStyle", "spanMethod", "tableTooltipProps", "pageIndex", "rowHeight", "expandColumnKey", "expandedRowKeys", "hasChildrenName", "lazy", "load", "level", "indent", "fixedCellHeight", "autoRowHeight", "onCellCheckedChange", "onCellExpandChange", "onCellClick", "onCellDblclick", "onCellContextmenu", "onCellMouseenter", "onCellMouseleave"])) : createCommentVNode("", true)
-      ]),
+      row: withCtx((rowProps) => {
+        var _a;
+        return [
+          rowProps && rowProps.rowData && rowProps.rowData.isExpandRow ? (openBlock(), createBlock(_component_ExpandRow, {
+            key: 0,
+            column: (_a = _ctx.tableExpandCol) == null ? void 0 : _a.originalCol,
+            rowIndex: rowProps.rowData.rowIndex,
+            rowData: rowProps.rowData.rowData,
+            onMouseenter: _ctx.onExpandCellMouseenter
+          }, createSlots({ _: 2 }, [
+            renderList(Object.keys(_ctx.$slots).filter(
+              (k) => !["default", "empty", "append"].includes(k)
+            ), (name) => {
+              return {
+                name,
+                fn: withCtx((slotProps) => [
+                  renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
+                ])
+              };
+            })
+          ]), 1032, ["column", "rowIndex", "rowData", "onMouseenter"])) : rowProps && rowProps.rowData && rowProps.rowData.rowData ? (openBlock(), createBlock(_component_BodyRow, {
+            key: 1,
+            bodyCols: _ctx.bodyCols,
+            colSizes: _ctx.bodyColSizes,
+            rowIndex: rowProps.rowData.rowIndex,
+            rowItem: rowProps.rowData,
+            rowId: rowProps.rowData.rowId,
+            checkedRowKeys: _ctx.checkedRowKeys,
+            bodyCellClass: _ctx.cellClassName,
+            bodyCellStyle: _ctx.cellStyle,
+            spanMethod: _ctx.spanMethod,
+            tableTooltipProps: _ctx.showOverflowTooltip,
+            pageIndex: _ctx.pageIndex,
+            rowHeight: _ctx.tableRowHeight,
+            tableSize: _ctx.size,
+            expandColumnKey: _ctx.tableExpandColumnKey,
+            expandedRowKeys: _ctx.expandedRowKeys,
+            lazy: _ctx.lazy,
+            load: _ctx.load,
+            level: rowProps.depth,
+            indent: _ctx.indent,
+            fixedCellHeight: _ctx.hasExpandCol,
+            autoRowHeight: _ctx.autoRowHeight,
+            onCellCheckedChange: _ctx.onCellCheckedChange,
+            onCellExpandChange: _ctx.onCellExpandChange,
+            onCellClick: _ctx.onCellClick,
+            onCellDblclick: _ctx.onCellDblclick,
+            onCellContextmenu: _ctx.onCellContextmenu,
+            onCellMouseenter: _ctx.onCellMouseenter,
+            onCellMouseleave: _ctx.onCellMouseleave
+          }, createSlots({ _: 2 }, [
+            renderList(Object.keys(_ctx.$slots).filter(
+              (k) => !["default", "empty", "append"].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", "onCellCheckedChange", "onCellExpandChange", "onCellClick", "onCellDblclick", "onCellContextmenu", "onCellMouseenter", "onCellMouseleave"])) : createCommentVNode("", true)
+        ];
+      }),
       empty: withCtx(() => [
         renderSlot(_ctx.$slots, "empty", {
           text: _ctx.emptyText,