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

package/lib/ele-virtual-table/components/body-row.cjs

@@ -6,17 +6,29 @@ const _sfc_main = vue.defineComponent({
   components: { BodyCell },
   props: {
     /** 主体列配置 */
-    bodyCols: Array,
+    bodyCols: {
+      type: Array,
+      required: true
+    },
     /** 表格主体列宽 */
-    colSizes: Array,
+    colSizes: {
+      type: Array,
+      required: true
+    },
     /** 当前行索引 */
-    rowIndex: Number,
-    /** 当前行数据 */
-    rowData: Object,
+    rowIndex: {
+      type: Number,
+      required: true
+    },
+    /** 当前行对象 */
+    rowItem: {
+      type: Object,
+      required: true
+    },
+    /** 当前行数据唯一值 */
+    rowId: [String, Number],
     /** 表格多选选中的值 */
     checkedRowKeys: Set,
-    /** 是否禁用表头选择框 */
-    tableSize: String,
     /** 单元格类名自定义 */
     bodyCellClass: [String, Function],
     /** 单元格样式自定义 */
@@ -29,19 +41,19 @@ const _sfc_main = vue.defineComponent({
     pageIndex: Number,
     /** 表格行高 */
     rowHeight: Number,
+    /** 表格尺寸 */
+    tableSize: String,
     /** 树表格展开图标的列 */
     expandColumnKey: String,
     /** 表格展开行的值 */
     expandedRowKeys: Array,
-    /** 嵌套数据是否有子级字段名称 */
-    hasChildrenName: String,
     /** 树表格是否懒加载子级 */
     lazy: Boolean,
     /** 树表格懒加载方法 */
     load: Function,
-    /** 树表格行数据级别 */
+    /** 树表格行数据缩进级别 */
     level: Number,
-    /** 树表格行缩进 */
+    /** 树表格每一级行缩进大小 */
     indent: Number,
     /** 是否需要固定单元格高度 */
     fixedCellHeight: Boolean,
@@ -52,7 +64,7 @@ const _sfc_main = vue.defineComponent({
     /** 多选框选中改变事件 */
     cellCheckedChange: (_row, _checked) => true,
     /** 展开状态改变事件 */
-    cellExpandChange: (_row, _expanded, _data) => true,
+    cellExpandChange: (_row, _expanded, _children) => true,
     /** 单元格点击事件 */
     cellClick: (_row, _col, _e) => true,
     /** 单元格双击事件 */
@@ -66,21 +78,18 @@ const _sfc_main = vue.defineComponent({
   },
   setup(props, { emit }) {
     const loading = vue.ref(false);
-    const rowDataKey = vue.computed(() => {
-      return props.rowData ? props.rowData._rowKey : void 0;
-    });
     const isChecked = vue.computed(() => {
-      if (!props.checkedRowKeys || !rowDataKey.value) {
+      if (!props.checkedRowKeys || props.rowId == null) {
         return false;
       }
-      return props.checkedRowKeys.has(rowDataKey.value);
+      return props.checkedRowKeys.has(props.rowId);
     });
     const hasChildren = vue.computed(() => {
-      if (props.rowData) {
-        if (props.rowData.children) {
-          return !!props.rowData.children.length;
+      if (props.rowItem) {
+        if (props.rowItem.children) {
+          return !!props.rowItem.children.length;
         }
-        if (props.lazy && props.hasChildrenName && props.rowData[props.hasChildrenName] === true) {
+        if (props.lazy && props.rowItem.hasChildren) {
           return true;
         }
       }
@@ -93,45 +102,41 @@ const _sfc_main = vue.defineComponent({
       return props.level * props.indent + "px";
     });
     const isCollapse = vue.computed(() => {
-      if (!props.expandedRowKeys || rowDataKey.value == null) {
+      if (!props.expandedRowKeys || props.rowId == null) {
         return true;
       }
-      return !props.expandedRowKeys.includes(rowDataKey.value);
+      return !props.expandedRowKeys.includes(props.rowId);
     });
-    const getKey = (column, columnIndex) => {
-      const key = rowDataKey.value ?? props.rowIndex;
-      return key + "-" + (column.key ?? columnIndex);
-    };
-    const onCellCheckedChange = (row, checked) => {
-      emit("cellCheckedChange", row, checked);
+    const onCellCheckedChange = (checked) => {
+      emit("cellCheckedChange", props.rowItem, checked);
     };
-    const onCellExpandChange = (row, expanded) => {
-      if (expanded && props.lazy && !row.children) {
+    const onCellExpandChange = (expanded) => {
+      if (expanded && props.lazy && !props.rowItem.children) {
         if (props.load) {
           loading.value = true;
-          props.load(row, null, (data) => {
+          props.load(props.rowItem.rowData, null, (data) => {
             loading.value = false;
-            emit("cellExpandChange", row, expanded, data);
+            emit("cellExpandChange", props.rowItem, expanded, data);
           });
         }
         return;
       }
-      emit("cellExpandChange", row, expanded);
+      emit("cellExpandChange", props.rowItem, expanded);
     };
-    const onCellClick = (row, col, e) => {
-      emit("cellClick", row, col, e);
+    const onCellClick = (col, e) => {
+      emit("cellClick", props.rowItem, col, e);
     };
-    const onCellDblclick = (row, col, e) => {
-      emit("cellDblclick", row, col, e);
+    const onCellDblclick = (col, e) => {
+      emit("cellDblclick", props.rowItem, col, e);
     };
-    const onCellContextmenu = (row, col, e) => {
-      emit("cellContextmenu", row, col, e);
+    const onCellContextmenu = (col, e) => {
+      emit("cellContextmenu", props.rowItem, col, e);
     };
-    const onCellMouseenter = (row, col, e) => {
-      emit("cellMouseenter", row, col, e);
+    const onCellMouseenter = (col, e) => {
+      emit("cellMouseenter", props.rowItem, col, e);
     };
-    const onCellMouseleave = (row, col, e) => {
-      emit("cellMouseleave", row, col, e);
+    const onCellMouseleave = (col, e) => {
+      emit("cellMouseleave", props.rowItem, col, e);
     };
     return {
       loading,
@@ -139,7 +144,6 @@ const _sfc_main = vue.defineComponent({
       hasChildren,
       rowIndent,
       isCollapse,
-      getKey,
       onCellCheckedChange,
       onCellExpandChange,
       onCellClick,
@@ -159,23 +163,24 @@ const _export_sfc = (sfc, props) => {
 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_BodyCell = vue.resolveComponent("BodyCell");
-  return vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.bodyCols, (column, index) => {
+  return vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.bodyCols, (column, columnIndex) => {
     return vue.openBlock(), vue.createBlock(_component_BodyCell, {
-      key: _ctx.getKey(column, index),
+      key: (_ctx.rowId ?? _ctx.rowIndex) + "-" + (column.key ?? columnIndex),
       column,
-      columnIndex: index,
+      columnIndex,
       rowIndex: _ctx.rowIndex,
-      rowData: _ctx.rowData,
+      rowData: _ctx.rowItem.rowData,
       colSizes: _ctx.colSizes,
-      tableSize: _ctx.tableSize,
       bodyCellClass: _ctx.bodyCellClass,
       bodyCellStyle: _ctx.bodyCellStyle,
       spanMethod: _ctx.spanMethod,
       tableTooltipProps: _ctx.tableTooltipProps,
       pageIndex: _ctx.pageIndex,
       rowHeight: _ctx.rowHeight,
-      expandColumnKey: _ctx.expandColumnKey,
       isChecked: _ctx.isChecked,
+      isDisabled: _ctx.rowItem.isDisabled,
+      tableSize: _ctx.tableSize,
+      expandColumnKey: _ctx.expandColumnKey,
       hasChildren: _ctx.hasChildren,
       rowIndent: _ctx.rowIndent,
       isCollapse: _ctx.isCollapse,
@@ -198,7 +203,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           ])
         };
       })
-    ]), 1032, ["column", "columnIndex", "rowIndex", "rowData", "colSizes", "tableSize", "bodyCellClass", "bodyCellStyle", "spanMethod", "tableTooltipProps", "pageIndex", "rowHeight", "expandColumnKey", "isChecked", "hasChildren", "rowIndent", "isCollapse", "loading", "fixedCellHeight", "autoRowHeight", "onCheckedChange", "onExpandChange", "onClick", "onDblclick", "onContextmenu", "onMouseenter", "onMouseleave"]);
+    ]), 1032, ["column", "columnIndex", "rowIndex", "rowData", "colSizes", "bodyCellClass", "bodyCellStyle", "spanMethod", "tableTooltipProps", "pageIndex", "rowHeight", "isChecked", "isDisabled", "tableSize", "expandColumnKey", "hasChildren", "rowIndent", "isCollapse", "loading", "fixedCellHeight", "autoRowHeight", "onCheckedChange", "onExpandChange", "onClick", "onDblclick", "onContextmenu", "onMouseenter", "onMouseleave"]);
   }), 128);
 }
 const bodyRow = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);

package/lib/ele-virtual-table/components/body-row.d.ts

@@ -1,19 +1,32 @@
-import type { PropType } from 'vue';
-import type { DataKey, DataItem, Column } from '../../ele-data-table/types';
-import type { BodyColumn, BodyColumns, ColSize } from '../types';
-declare const _default: import("vue").DefineComponent<{
+import { BodyColumns, ColSize, VirtualRow } from '../types';
+import { DataKey, DataItem, Column } from '../../ele-data-table/types';
+import { PropType } from 'vue';
+
+declare const _default: import('vue').DefineComponent<{
     /** 主体列配置 */
-    bodyCols: PropType<BodyColumns>;
+    bodyCols: {
+        type: PropType<BodyColumns>;
+        required: true;
+    };
     /** 表格主体列宽 */
-    colSizes: PropType<ColSize[]>;
+    colSizes: {
+        type: PropType<ColSize[]>;
+        required: true;
+    };
     /** 当前行索引 */
-    rowIndex: NumberConstructor;
-    /** 当前行数据 */
-    rowData: PropType<DataItem>;
+    rowIndex: {
+        type: NumberConstructor;
+        required: true;
+    };
+    /** 当前行对象 */
+    rowItem: {
+        type: PropType<VirtualRow>;
+        required: true;
+    };
+    /** 当前行数据唯一值 */
+    rowId: PropType<DataKey>;
     /** 表格多选选中的值 */
     checkedRowKeys: PropType<Set<DataKey>>;
-    /** 是否禁用表头选择框 */
-    tableSize: PropType<"" | "default" | "small" | "large" | undefined>;
     /** 单元格类名自定义 */
     bodyCellClass: PropType<import("element-plus/es/components/table/src/table/defaults").CellCls<DataItem> | undefined>;
     /** 单元格样式自定义 */
@@ -34,19 +47,19 @@ declare const _default: import("vue").DefineComponent<{
     pageIndex: NumberConstructor;
     /** 表格行高 */
     rowHeight: NumberConstructor;
+    /** 表格尺寸 */
+    tableSize: PropType<"" | "default" | "small" | "large" | undefined>;
     /** 树表格展开图标的列 */
     expandColumnKey: StringConstructor;
     /** 表格展开行的值 */
     expandedRowKeys: PropType<DataKey[]>;
-    /** 嵌套数据是否有子级字段名称 */
-    hasChildrenName: StringConstructor;
     /** 树表格是否懒加载子级 */
     lazy: BooleanConstructor;
     /** 树表格懒加载方法 */
     load: PropType<((row: DataItem, treeNode: import("element-plus/es/components/table/src/table/defaults").TreeNode, resolve: (data: DataItem[]) => void) => void) | undefined>;
-    /** 树表格行数据级别 */
+    /** 树表格行数据缩进级别 */
     level: NumberConstructor;
-    /** 树表格行缩进 */
+    /** 树表格每一级行缩进大小 */
     indent: NumberConstructor;
     /** 是否需要固定单元格高度 */
     fixedCellHeight: BooleanConstructor;
@@ -58,42 +71,53 @@ declare const _default: import("vue").DefineComponent<{
     hasChildren: import("vue").ComputedRef<boolean>;
     rowIndent: import("vue").ComputedRef<string | undefined>;
     isCollapse: import("vue").ComputedRef<boolean>;
-    getKey: (column: BodyColumn, columnIndex?: number) => string;
-    onCellCheckedChange: (row: DataItem, checked: boolean) => void;
-    onCellExpandChange: (row: DataItem, expanded: boolean) => 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: (checked: boolean) => void;
+    onCellExpandChange: (expanded: boolean) => void;
+    onCellClick: (col: Column, e: MouseEvent) => void;
+    onCellDblclick: (col: Column, e: MouseEvent) => void;
+    onCellContextmenu: (col: Column, e: MouseEvent) => void;
+    onCellMouseenter: (col: Column, e: MouseEvent) => void;
+    onCellMouseleave: (col: Column, e: MouseEvent) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     /** 多选框选中改变事件 */
-    cellCheckedChange: (_row: DataItem, _checked: boolean) => true;
+    cellCheckedChange: (_row: VirtualRow, _checked: boolean) => true;
     /** 展开状态改变事件 */
-    cellExpandChange: (_row: DataItem, _expanded: boolean, _data?: DataItem[]) => true;
+    cellExpandChange: (_row: VirtualRow, _expanded: boolean, _children?: DataItem[]) => true;
     /** 单元格点击事件 */
-    cellClick: (_row: DataItem, _col: Column, _e: MouseEvent) => true;
+    cellClick: (_row: VirtualRow, _col: Column, _e: MouseEvent) => true;
     /** 单元格双击事件 */
-    cellDblclick: (_row: DataItem, _col: Column, _e: MouseEvent) => true;
+    cellDblclick: (_row: VirtualRow, _col: Column, _e: MouseEvent) => true;
     /** 单元格右键事件 */
-    cellContextmenu: (_row: DataItem, _col: Column, _e: MouseEvent) => true;
+    cellContextmenu: (_row: VirtualRow, _col: Column, _e: MouseEvent) => true;
     /** 单元格鼠标移入事件 */
-    cellMouseenter: (_row: DataItem, _col: Column, _e: MouseEvent) => true;
+    cellMouseenter: (_row: VirtualRow, _col: Column, _e: MouseEvent) => true;
     /** 单元格鼠标移出事件 */
-    cellMouseleave: (_row: DataItem, _col: Column, _e: MouseEvent) => true;
+    cellMouseleave: (_row: VirtualRow, _col: Column, _e: MouseEvent) => true;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     /** 主体列配置 */
-    bodyCols: PropType<BodyColumns>;
+    bodyCols: {
+        type: PropType<BodyColumns>;
+        required: true;
+    };
     /** 表格主体列宽 */
-    colSizes: PropType<ColSize[]>;
+    colSizes: {
+        type: PropType<ColSize[]>;
+        required: true;
+    };
     /** 当前行索引 */
-    rowIndex: NumberConstructor;
-    /** 当前行数据 */
-    rowData: PropType<DataItem>;
+    rowIndex: {
+        type: NumberConstructor;
+        required: true;
+    };
+    /** 当前行对象 */
+    rowItem: {
+        type: PropType<VirtualRow>;
+        required: true;
+    };
+    /** 当前行数据唯一值 */
+    rowId: PropType<DataKey>;
     /** 表格多选选中的值 */
     checkedRowKeys: PropType<Set<DataKey>>;
-    /** 是否禁用表头选择框 */
-    tableSize: PropType<"" | "default" | "small" | "large" | undefined>;
     /** 单元格类名自定义 */
     bodyCellClass: PropType<import("element-plus/es/components/table/src/table/defaults").CellCls<DataItem> | undefined>;
     /** 单元格样式自定义 */
@@ -114,32 +138,32 @@ declare const _default: import("vue").DefineComponent<{
     pageIndex: NumberConstructor;
     /** 表格行高 */
     rowHeight: NumberConstructor;
+    /** 表格尺寸 */
+    tableSize: PropType<"" | "default" | "small" | "large" | undefined>;
     /** 树表格展开图标的列 */
     expandColumnKey: StringConstructor;
     /** 表格展开行的值 */
     expandedRowKeys: PropType<DataKey[]>;
-    /** 嵌套数据是否有子级字段名称 */
-    hasChildrenName: StringConstructor;
     /** 树表格是否懒加载子级 */
     lazy: BooleanConstructor;
     /** 树表格懒加载方法 */
     load: PropType<((row: DataItem, treeNode: import("element-plus/es/components/table/src/table/defaults").TreeNode, resolve: (data: DataItem[]) => void) => void) | undefined>;
-    /** 树表格行数据级别 */
+    /** 树表格行数据缩进级别 */
     level: NumberConstructor;
-    /** 树表格行缩进 */
+    /** 树表格每一级行缩进大小 */
     indent: NumberConstructor;
     /** 是否需要固定单元格高度 */
     fixedCellHeight: BooleanConstructor;
     /** 表格是否是自适应行高 */
     autoRowHeight: BooleanConstructor;
 }>> & {
-    onCellClick?: ((_row: DataItem, _col: Column, _e: MouseEvent) => any) | undefined;
-    onCellDblclick?: ((_row: DataItem, _col: Column, _e: MouseEvent) => any) | undefined;
-    onCellContextmenu?: ((_row: DataItem, _col: Column, _e: MouseEvent) => any) | undefined;
-    onCellCheckedChange?: ((_row: DataItem, _checked: boolean) => any) | undefined;
-    onCellExpandChange?: ((_row: DataItem, _expanded: boolean, _data?: DataItem[] | undefined) => any) | undefined;
-    onCellMouseenter?: ((_row: DataItem, _col: Column, _e: MouseEvent) => any) | undefined;
-    onCellMouseleave?: ((_row: DataItem, _col: Column, _e: MouseEvent) => any) | undefined;
+    onCellClick?: ((_row: VirtualRow, _col: Column, _e: MouseEvent) => any) | undefined;
+    onCellDblclick?: ((_row: VirtualRow, _col: Column, _e: MouseEvent) => any) | undefined;
+    onCellContextmenu?: ((_row: VirtualRow, _col: Column, _e: MouseEvent) => any) | undefined;
+    onCellMouseenter?: ((_row: VirtualRow, _col: Column, _e: MouseEvent) => any) | undefined;
+    onCellCheckedChange?: ((_row: VirtualRow, _checked: boolean) => any) | undefined;
+    onCellExpandChange?: ((_row: VirtualRow, _expanded: boolean, _children?: DataItem[] | undefined) => any) | undefined;
+    onCellMouseleave?: ((_row: VirtualRow, _col: Column, _e: MouseEvent) => any) | undefined;
 }, {
     lazy: boolean;
     fixedCellHeight: boolean;

package/lib/ele-virtual-table/components/cell-checkbox.d.ts

@@ -1,5 +1,6 @@
-import type { PropType } from 'vue';
-declare const _default: import("vue").DefineComponent<{
+import { PropType } from 'vue';
+
+declare const _default: import('vue').DefineComponent<{
     /** 是否是选中状态 */
     checked: BooleanConstructor;
     /** 是否是半选状态 */

package/lib/ele-virtual-table/components/cell-filter.cjs

@@ -33,7 +33,7 @@ const _sfc_main = vue.defineComponent({
   },
   setup(props, { emit }) {
     const { t } = elementPlus.useLocale();
-    const tooltipRef = vue.ref(null);
+    const popperRef = vue.ref(null);
     const checkedValue = vue.ref([]);
     const clearFilterText = vue.computed(() => {
       return t("el.table.clearFilter");
@@ -51,7 +51,7 @@ const _sfc_main = vue.defineComponent({
       return t("el.table.resetFilter");
     });
     const hidePopper = () => {
-      tooltipRef.value && tooltipRef.value.hide();
+      popperRef.value && popperRef.value.hide();
     };
     const onBeforeEnter = () => {
       checkedValue.value = props.filtered ?? [];
@@ -73,7 +73,7 @@ const _sfc_main = vue.defineComponent({
       hidePopper();
     };
     return {
-      tooltipRef,
+      popperRef,
       checkedValue,
       clearFilterText,
       filteredValue,
@@ -114,7 +114,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     }, ["stop"]))
   }, [
     vue.createVNode(_component_EleTooltip, {
-      ref: "tooltipRef",
+      ref: "popperRef",
       trigger: "click",
       showArrow: false,
       placement: _ctx.filterPlacement,
@@ -139,13 +139,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                   (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.filters, (item) => {
                     return vue.openBlock(), vue.createBlock(_component_ElCheckbox, {
                       key: item.value,
-                      label: item.value
-                    }, {
-                      default: vue.withCtx(() => [
-                        vue.createTextVNode(vue.toDisplayString(item.text), 1)
-                      ]),
-                      _: 2
-                    }, 1032, ["label"]);
+                      value: item.value,
+                      label: item.text
+                    }, null, 8, ["value", "label"]);
                   }), 128))
                 ]),
                 _: 1

package/lib/ele-virtual-table/components/cell-filter.d.ts

@@ -1,7 +1,8 @@
-import type { PropType } from 'vue';
-import type { FilterValue } from '../../ele-data-table/types';
-import type { EleTooltipInstance } from '../../ele-app/plus';
-declare const _default: import("vue").DefineComponent<{
+import { EleTooltipInstance } from '../../ele-app/plus';
+import { FilterValue } from '../../ele-data-table/types';
+import { PropType } from 'vue';
+
+declare const _default: import('vue').DefineComponent<{
     /** 选中项 */
     filtered: PropType<FilterValue>;
     /** 是否多选 */
@@ -10,11 +11,11 @@ declare const _default: import("vue").DefineComponent<{
     filters: PropType<import("element-plus/es/components/table/src/table-column/defaults").Filters | undefined>;
     /** 弹出框定位 */
     filterPlacement: {
-        type: PropType<any>;
+        type: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, import("element-plus").Placement, unknown> | undefined>;
         default: string;
     };
 }, {
-    tooltipRef: import("vue").Ref<EleTooltipInstance>;
+    popperRef: import("vue").Ref<EleTooltipInstance>;
     checkedValue: import("vue").Ref<string[]>;
     clearFilterText: import("vue").ComputedRef<string>;
     filteredValue: import("vue").ComputedRef<string | undefined>;
@@ -37,13 +38,13 @@ declare const _default: import("vue").DefineComponent<{
     filters: PropType<import("element-plus/es/components/table/src/table-column/defaults").Filters | undefined>;
     /** 弹出框定位 */
     filterPlacement: {
-        type: PropType<any>;
+        type: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, import("element-plus").Placement, unknown> | undefined>;
         default: string;
     };
 }>> & {
     onChange?: ((_filtered: FilterValue) => any) | undefined;
 }, {
-    filterPlacement: any;
+    filterPlacement: import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, import("element-plus").Placement, unknown> | undefined;
     filterMultiple: boolean;
 }, {}>;
 export default _default;

package/lib/ele-virtual-table/components/expand-row.cjs

@@ -3,11 +3,11 @@ const vue = require("vue");
 const _sfc_main = vue.defineComponent({
   name: "ExpandRow",
   props: {
-    /** 列配置 */
+    /** 列配置(原始配置) */
     column: Object,
     /** 行索引 */
     rowIndex: Number,
-    /** 行数据 */
+    /** 行数据(原始数据) */
     rowData: Object
   }
 });
@@ -21,7 +21,7 @@ const _export_sfc = (sfc, props) => {
 const _hoisted_1 = { class: "el-table-v2__row-cell ele-table-td" };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
-    _ctx.column && _ctx.column.originalCol && _ctx.column.originalCol.slot ? vue.renderSlot(_ctx.$slots, _ctx.column.originalCol.slot, vue.normalizeProps(vue.mergeProps({ key: 0 }, { row: _ctx.rowData, column: _ctx.column.originalCol, $index: _ctx.rowIndex }))) : vue.createCommentVNode("", true)
+    _ctx.column && _ctx.column.slot ? vue.renderSlot(_ctx.$slots, _ctx.column.slot, vue.normalizeProps(vue.mergeProps({ key: 0 }, { row: _ctx.rowData, column: _ctx.column, $index: _ctx.rowIndex }))) : vue.createCommentVNode("", true)
   ]);
 }
 const expandRow = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);

package/lib/ele-virtual-table/components/expand-row.d.ts

@@ -1,18 +1,19 @@
-import type { PropType } from 'vue';
-import type { DataItem } from '../../ele-data-table/types';
-declare const _default: import("vue").DefineComponent<{
-    /** 列配置 */
-    column: PropType<Partial<import("element-plus").Column<DataItem>>>;
+import { DataItem, Column } from '../../ele-data-table/types';
+import { PropType } from 'vue';
+
+declare const _default: import('vue').DefineComponent<{
+    /** 列配置(原始配置) */
+    column: PropType<Column>;
     /** 行索引 */
     rowIndex: NumberConstructor;
-    /** 行数据 */
+    /** 行数据(原始数据) */
     rowData: PropType<DataItem>;
 }, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-    /** 列配置 */
-    column: PropType<Partial<import("element-plus").Column<DataItem>>>;
+    /** 列配置(原始配置) */
+    column: PropType<Column>;
     /** 行索引 */
     rowIndex: NumberConstructor;
-    /** 行数据 */
+    /** 行数据(原始数据) */
     rowData: PropType<DataItem>;
 }>>, {}, {}>;
 export default _default;

package/lib/ele-virtual-table/components/footer-row.cjs

@@ -3,15 +3,25 @@ const vue = require("vue");
 const util = require("../util");
 const _sfc_main = vue.defineComponent({
   name: "FooterRow",
+  components: { CellRender: util.CellRender },
   props: {
     /** 表格主体列配置 */
-    bodyCols: Array,
+    bodyCols: {
+      type: Array,
+      required: true
+    },
+    /** 表格数据 */
+    tableData: {
+      type: Array,
+      required: true
+    },
     /** 表格主体列宽 */
-    colSizes: Array,
+    colSizes: {
+      type: Array,
+      required: true
+    },
     /** 表格主体所有列合计宽度 */
     sumWidth: Number,
-    /** 表格数据 */
-    tableData: Array,
     /** 表格行高 */
     rowHeight: Number,
     /** 合计行文本 */
@@ -24,23 +34,17 @@ const _sfc_main = vue.defineComponent({
     mouseenter: (_e) => true
   },
   setup(props, { emit }) {
+    const data = vue.computed(() => {
+      return props.tableData.map((row) => row.rowData);
+    });
     const userSums = vue.computed(() => {
-      if (typeof props.summaryMethod !== "function" || !props.bodyCols) {
-        return;
-      }
-      const columns = props.bodyCols.map((col) => {
-        return { ...col.originalCol || {}, property: col.dataKey };
-      });
-      return props.summaryMethod({ columns, data: props.tableData });
+      return util.getUserSums(props.summaryMethod, props.bodyCols, data.value);
     });
     const sumCols = vue.computed(() => {
-      if (!props.bodyCols) {
-        return [];
-      }
       const sums = userSums.value;
       return props.bodyCols.map((column, i) => {
-        const colSize = props.colSizes ? props.colSizes[i] : void 0;
-        const sumValue = util.getSumValue(props.tableData, column.dataKey);
+        const colSize = props.colSizes[i];
+        const sumValue = util.getSumValue(data.value, column.dataKey);
         const col = column.originalCol;
         return {
           key: i + "-" + column.key,
@@ -70,6 +74,7 @@ const _export_sfc = (sfc, props) => {
 };
 const _hoisted_1 = { class: "ele-table-cell" };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  const _component_CellRender = vue.resolveComponent("CellRender");
   return vue.openBlock(), vue.createElementBlock("div", {
     class: "ele-table-foot-tr",
     style: vue.normalizeStyle({ width: (_ctx.sumWidth || 0) + "px", height: (_ctx.rowHeight || 0) + "px" })
@@ -95,7 +100,12 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         }),
         onMouseenter: _cache[0] || (_cache[0] = (...args) => _ctx.onMouseenter && _ctx.onMouseenter(...args))
       }, [
-        vue.createElementVNode("div", _hoisted_1, vue.toDisplayString(col.text), 1)
+        vue.createElementVNode("div", _hoisted_1, [
+          vue.createVNode(_component_CellRender, {
+            render: () => col.text,
+            params: []
+          }, null, 8, ["render"])
+        ])
       ], 38);
     }), 128))
   ], 4);