ele-admin-plus 1.1.9-beta.9 → 1.2.0-beta.1

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

@@ -1,4 +1,5 @@
-import type { ExtractPropTypes } from 'vue';
+import { ExtractPropTypes } from 'vue';
+
 /**
  * 属性
  */
@@ -14,11 +15,11 @@ export declare const virtualTableProps: {
         default: null;
     };
     rowKey: {
-        type: import("vue").PropType<string | ((row: import("../ele-data-table/types").DataItem) => string) | undefined>;
+        type: import('vue').PropType<string | ((row: import('../ele-data-table/types').DataItem) => string) | undefined>;
         required: boolean;
     };
     columns: {
-        type: import("vue").PropType<import("../ele-data-table/types").Columns>;
+        type: import('vue').PropType<import('../ele-data-table/types').Columns>;
         required: boolean;
     };
     pageIndex: NumberConstructor;
@@ -37,17 +38,17 @@ export declare const virtualTableProps: {
         default: boolean;
     };
     emptyProps: {
-        type: import("vue").PropType<import("../ele-data-table/types").TableEmptyProps>;
+        type: import('vue').PropType<import('../ele-data-table/types').TableEmptyProps>;
         default: () => null;
     };
-    rowClickChecked: import("vue").PropType<import("../ele-data-table/types").RowClickChecked>;
+    rowClickChecked: import('vue').PropType<import('../ele-data-table/types').RowClickChecked>;
     reserveCurrent: BooleanConstructor;
-    selectedRowKeys: import("vue").PropType<import("../ele-data-table/types").DataKey[]>;
-    cacheData: import("vue").PropType<import("../ele-data-table/types").DataItem[]>;
+    selectedRowKeys: import('vue').PropType<import('../ele-data-table/types').DataKey[]>;
+    cacheData: import('vue').PropType<import('../ele-data-table/types').DataItem[]>;
     width: (StringConstructor | NumberConstructor)[];
     height: (StringConstructor | NumberConstructor)[];
     size: {
-        readonly type: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
+        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -63,14 +64,11 @@ export declare const virtualTableProps: {
     };
     lazy: BooleanConstructor;
     data: {
-        type: import("vue").PropType<any[]>;
+        type: import('vue').PropType<any[]>;
         default: () => never[];
     };
-    scrollbarAlwaysOn: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    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;
@@ -82,26 +80,26 @@ export declare const virtualTableProps: {
     };
     showSummary: BooleanConstructor;
     sumText: StringConstructor;
-    summaryMethod: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").SummaryMethod<any> | undefined>;
-    rowClassName: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").ColumnCls<any> | undefined>;
-    rowStyle: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").ColumnStyle<any> | undefined>;
-    cellClassName: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").CellCls<any> | undefined>;
-    cellStyle: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").CellStyle<any> | undefined>;
-    headerRowClassName: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").ColumnCls<any> | undefined>;
-    headerRowStyle: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").ColumnStyle<any> | undefined>;
-    headerCellClassName: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").CellCls<any> | undefined>;
-    headerCellStyle: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").CellStyle<any> | undefined>;
+    summaryMethod: import('vue').PropType<import('element-plus').SummaryMethod<any> | undefined>;
+    rowClassName: import('vue').PropType<import('element-plus').ColumnCls<any> | undefined>;
+    rowStyle: import('vue').PropType<import('element-plus').ColumnStyle<any> | undefined>;
+    cellClassName: import('vue').PropType<import('element-plus').CellCls<any> | undefined>;
+    cellStyle: import('vue').PropType<import('element-plus').CellStyle<any> | undefined>;
+    headerRowClassName: import('vue').PropType<import('element-plus').ColumnCls<any> | undefined>;
+    headerRowStyle: import('vue').PropType<import('element-plus').ColumnStyle<any> | undefined>;
+    headerCellClassName: import('vue').PropType<import('element-plus').CellCls<any> | undefined>;
+    headerCellStyle: import('vue').PropType<import('element-plus').CellStyle<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (StringConstructor | NumberConstructor)[];
-    expandRowKeys: import("vue").PropType<any[] | undefined>;
+    expandRowKeys: import('vue').PropType<any[] | undefined>;
     defaultExpandAll: BooleanConstructor;
-    defaultSort: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").Sort | undefined>;
+    defaultSort: import('vue').PropType<import('element-plus').Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import("vue").PropType<Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
-    spanMethod: import("vue").PropType<((data: {
+    tooltipOptions: import('vue').PropType<Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    spanMethod: import('vue').PropType<((data: {
         row: any;
         rowIndex: number;
-        column: import("element-plus/es/components/table/src/table-column/defaults").TableColumnCtx<any>;
+        column: import('element-plus').TableColumnCtx<any>;
         columnIndex: number;
     }) => number[] | {
         rowspan: number;
@@ -112,7 +110,7 @@ export declare const virtualTableProps: {
         default: boolean;
     };
     treeProps: {
-        type: import("vue").PropType<{
+        type: import('vue').PropType<{
             hasChildren?: string | undefined;
             children?: string | undefined;
         } | undefined>;
@@ -121,9 +119,9 @@ export declare const virtualTableProps: {
             children: string;
         };
     };
-    load: import("vue").PropType<((row: any, treeNode: import("element-plus/es/components/table/src/table/defaults").TreeNode, resolve: (data: any[]) => void) => void) | undefined>;
+    load: import('vue').PropType<((row: any, treeNode: import('element-plus').TreeNode, resolve: (data: any[]) => void) => void) | undefined>;
     tableLayout: {
-        type: import("vue").PropType<"auto" | "fixed">;
+        type: import('vue').PropType<"auto" | "fixed">;
         default: string;
     };
     flexible: BooleanConstructor;
@@ -133,24 +131,24 @@ export type VirtualTableProps = ExtractPropTypes<typeof virtualTableProps>;
  * 事件
  */
 export declare const virtualTableEmits: {
-    select: (_selection: import("../ele-data-table/types").DataItem[], _row: import("../ele-data-table/types").DataItem) => boolean;
-    selectAll: (_selection: import("../ele-data-table/types").DataItem[]) => boolean;
-    selectionChange: (_selection: import("../ele-data-table/types").DataItem[]) => boolean;
-    cellMouseEnter: (_row: import("../ele-data-table/types").DataItem, _column: import("../ele-data-table/types").Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
-    cellMouseLeave: (_row: import("../ele-data-table/types").DataItem, _column: import("../ele-data-table/types").Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
-    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;
-    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;
-    headerContextmenu: (_column: import("../ele-data-table/types").Column, _e: MouseEvent) => boolean;
-    sortChange: (_sorter: import("../ele-data-table/types").Sorter) => boolean;
-    filterChange: (_filter: import("../ele-data-table/types").Filter) => boolean;
-    currentChange: (_current?: import("../ele-data-table/types").DataItem | null | undefined, _old?: import("../ele-data-table/types").DataItem | null | undefined) => boolean;
-    headerDragend: (_width: number, _old: number, _column: import("../ele-data-table/types").Column, _e: MouseEvent) => boolean;
-    expandChange: (_row: import("../ele-data-table/types").DataItem, _expanded: boolean) => boolean;
-    'update:currentRowKey': (_currentRowKey?: import("../ele-data-table/types").DataKey | undefined) => boolean;
-    'update:selectedRowKeys': (_selectedRowKeys?: import("../ele-data-table/types").DataKey[] | undefined) => boolean;
+    select: (_selection: import('../ele-data-table/types').DataItem[], _row: import('../ele-data-table/types').DataItem) => boolean;
+    selectAll: (_selection: import('../ele-data-table/types').DataItem[]) => boolean;
+    selectionChange: (_selection: import('../ele-data-table/types').DataItem[]) => boolean;
+    cellMouseEnter: (_row: import('../ele-data-table/types').DataItem, _column: import('../ele-data-table/types').Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
+    cellMouseLeave: (_row: import('../ele-data-table/types').DataItem, _column: import('../ele-data-table/types').Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
+    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;
+    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;
+    headerContextmenu: (_column: import('../ele-data-table/types').Column, _e: MouseEvent) => boolean;
+    sortChange: (_sorter: import('../ele-data-table/types').Sorter) => boolean;
+    filterChange: (_filter: import('../ele-data-table/types').Filter) => boolean;
+    currentChange: (_current?: import('../ele-data-table/types').DataItem | null | undefined, _old?: import('../ele-data-table/types').DataItem | null | undefined) => boolean;
+    headerDragend: (_width: number, _old: number, _column: import('../ele-data-table/types').Column, _e: MouseEvent) => boolean;
+    expandChange: (_row: import('../ele-data-table/types').DataItem, _expanded: boolean) => boolean;
+    'update:currentRowKey': (_currentRowKey?: import('../ele-data-table/types').DataKey | undefined) => boolean;
+    'update:selectedRowKeys': (_selectedRowKeys?: import('../ele-data-table/types').DataKey[] | undefined) => boolean;
 };

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

@@ -653,7 +653,7 @@
 }
 
 /* 移动端支持触摸滚动 */
-@media (hover: none) and (pointer: coarse) {
+@media (pointer: coarse) {
   .ele-virtual-table > .el-table-v2 > .el-table-v2__main {
     & > .el-table-v2__body > div:not(.el-virtual-scrollbar) {
       overflow: auto !important;

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

@@ -20,6 +20,31 @@ import type {
 } from '../ele-data-table/types';
 export { RowExpandHandler, ScrollStrategy, SortBy, ScrollPos };
 
+/**
+ * 表格属性
+ */
+export type TableV2Props = Required<Exclude<ElTableV2Props, 'class' | 'style'>>;
+
+/**
+ * 获取行类名方法
+ */
+export type RowClassFunction = ExtractRowPropGetter<DataItem>;
+
+/**
+ * 获取行属性方法
+ */
+export type RowPropsFunction = ExtractRowPropGetter<DataItem>;
+
+/**
+ * 获取表头行类名方法
+ */
+export type HeaderRowClassFunction = HeaderClassNameGetter<DataItem>;
+
+/**
+ * 获取表头行属性方法
+ */
+export type HeaderRowPropsFunction = ExtractHeaderPropGetter<DataItem>;
+
 /**
  * 列配置
  */
@@ -30,6 +55,16 @@ export type VirtualColumn = Partial<TableV2Column<DataItem>>;
  */
 export type VirtualColumns = VirtualColumn[];
 
+/**
+ * 嵌套数据配置项
+ */
+export interface TreeTableProps {
+  /** 子级字段名 */
+  childrenName: string;
+  /** 懒加载标识是否有子级字段名 */
+  hasChildrenName: string;
+}
+
 /**
  * 主体列配置
  */
@@ -47,7 +82,7 @@ export interface BodyColumn {
   /** 是否是第一个右侧固定列 */
   isFixedRightFirst?: boolean;
   /** 原始列配置 */
-  originalCol?: Column;
+  originalCol: Column;
 }
 
 /**
@@ -84,54 +119,23 @@ export type HeaderColumns = HeaderColumn[];
 export type HeaderRows = HeaderColumns[];
 
 /**
- * 表格属性
- */
-export type TableV2Props = Required<Exclude<ElTableV2Props, 'class' | 'style'>>;
-
-/**
- * 获取行类名方法
- */
-export type RowClassFunction = ExtractRowPropGetter<DataItem>;
-
-/**
- * 获取行属性方法
+ * 数据
  */
-export type RowPropsFunction = ExtractRowPropGetter<DataItem>;
-
-/**
- * 获取表头行类名方法
- */
-export type HeaderRowClassFunction = HeaderClassNameGetter<DataItem>;
-
-/**
- * 获取表头行属性方法
- */
-export type HeaderRowPropsFunction = ExtractHeaderPropGetter<DataItem>;
-
-/**
- * 表格状态
- */
-export interface TableState {
-  /** 单选选中数据 */
-  row?: DataItem;
-  /** 单选上次选中数据 */
-  oldRow?: DataItem;
-  /** 多选选中数据 */
-  checked: Map<DataKey, DataItem>;
-  /** 多选选中是否保留不存在的数据 */
-  reserveChecked: boolean;
-  /** 表格垂直滚动位置 */
-  scrollTop: number;
-}
-
-/**
- * 表头列筛选改变事件参数
- */
-export interface CellFilterChangeParams {
-  /** 列配置 */
-  column: Column;
-  /** 筛选值 */
-  value: FilterValue;
+export interface VirtualRow {
+  /** 行唯一值 */
+  rowId: DataKey;
+  /** 行索引 */
+  rowIndex: number;
+  /** 行原始数据 */
+  rowData: DataItem;
+  /** 行是否禁用 */
+  isDisabled?: boolean;
+  /** 是否是展开行 */
+  isExpandRow?: boolean;
+  /** 子级数据 */
+  children?: VirtualRow[];
+  /** 懒加载时标识是否有子级数据 */
+  hasChildren?: boolean;
 }
 
 /**
@@ -144,26 +148,6 @@ export interface CellSpan {
   rowspan?: number;
 }
 
-/**
- * 自定义渲染组件属性
- */
-export interface CustomRenderProps {
-  /** 自定义渲染方法 */
-  render?: (...params: any) => string | VNode | VNode[] | number | undefined;
-  /** 自定义渲染参数 */
-  params?: Array<any>;
-}
-
-/**
- * 嵌套数据配置项
- */
-export interface TreeTableProps {
-  /** 子级字段名 */
-  childrenName: string;
-  /** 懒加载标识是否有子级字段名 */
-  hasChildrenName: string;
-}
-
 /**
  * 列尺寸
  */
@@ -194,6 +178,32 @@ export interface SumCol extends ColSize {
   isFixedRightFirst?: boolean;
 }
 
+/**
+ * 表头列筛选改变事件参数
+ */
+export interface CellFilterChangeParams {
+  /** 列配置 */
+  column: Column;
+  /** 筛选值 */
+  value: FilterValue;
+}
+
+/**
+ * 表格状态数据
+ */
+export interface TableState {
+  /** 单选选中数据 */
+  row?: DataItem;
+  /** 单选上次选中数据 */
+  oldRow?: DataItem;
+  /** 多选选中数据 */
+  checked: Map<DataKey, DataItem>;
+  /** 多选选中是否保留不存在的数据 */
+  reserveChecked: boolean;
+  /** 表格垂直滚动位置 */
+  scrollTop: number;
+}
+
 /**
  * 单元格获取自定义配置的参数
  */
@@ -207,3 +217,13 @@ export interface CellParams {
   /** 行索引 */
   rowIndex: number;
 }
+
+/**
+ * 自定义渲染组件属性
+ */
+export interface CustomRenderProps {
+  /** 自定义渲染方法 */
+  render?: (...params: any) => string | VNode | VNode[] | number | undefined;
+  /** 自定义渲染参数 */
+  params?: Array<any>;
+}

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

@@ -1,7 +1,8 @@
-import type { SetupContext } from 'vue';
+import { VirtualColumn, VirtualColumns, BodyColumns, HeaderColumn, HeaderRows, ColSize, CustomRenderProps, SortBy, TreeTableProps, CellSpan, CellParams, VirtualRow } from './types';
+import { DataKey, DataItem, Column, Columns, Sorter, Filter, FilterValue, OrderValue, TableSize, RowKey, RowSelectable, TreeProps, ShowOverflowTooltip, SpanMethod, ColumnIndex, SummaryMethod } from '../ele-data-table/types';
 import { TableV2SortOrder } from 'element-plus';
-import type { DataKey, DataItem, Column, Columns, Sorter, Filter, FilterValue, OrderValue, TableSize, RowKey, RowSelectable, TreeProps, ShowOverflowTooltip, SpanMethod, ColumnIndex, SummaryMethod } from '../ele-data-table/types';
-import type { VirtualColumn, VirtualColumns, BodyColumns, HeaderColumn, HeaderRows, ColSize, CustomRenderProps, SortBy, TreeTableProps, CellSpan, CellParams } from './types';
+import { SetupContext } from 'vue';
+
 /**
  * 获取行高
  * @param size 表格尺寸
@@ -86,16 +87,17 @@ export declare function colSizesIsChanged(colSizes: ColSize[], newSizes: ColSize
  * @param bodyCols 主体列配置
  * @param colSizes 列尺寸数据
  */
-export declare function getTableColumns(bodyCols: BodyColumns, colSizes: ColSize[]): Partial<import("element-plus").Column<DataItem>>[];
+export declare function getTableColumns(bodyCols: BodyColumns, colSizes: ColSize[]): Partial<import('element-plus').Column<DataItem>>[];
 /**
  * 处理表格数据
  * @param data 数据
  * @param hasExpandCol 是否有展开列
  * @param childrenName 树表格子级数据字段名
+ * @param hasChildrenName 树表格是否有子级字段名
  * @param rowKey 数据唯一值字段名
  * @param selectable 控制行是否可选中的方法
  */
-export declare function transformTableData(data: DataItem[] | undefined, hasExpandCol: boolean, childrenName: string, rowKey: RowKey, selectable?: RowSelectable | null): DataItem[];
+export declare function transformTableData(data: DataItem[] | undefined, hasExpandCol: boolean, childrenName: string, hasChildrenName: string, rowKey: RowKey, selectable?: RowSelectable | null): VirtualRow[];
 /**
  * 获取值对应的数据
  * @param key 值
@@ -103,14 +105,14 @@ export declare function transformTableData(data: DataItem[] | undefined, hasExpa
  * @param rowKey 数据值字段名
  * @param childrenField 子级字段名
  */
-export declare function getRowByKey(key: DataKey, data: DataItem[], rowKey?: RowKey, childrenField?: string): DataItem | undefined;
+export declare function getRowByKey<T extends DataItem | VirtualRow>(key: DataKey, data: T[], rowKey?: RowKey, childrenField?: string): T | undefined;
 /**
  * 获取平铺后的数据值和数据
  * @param data 表格数据
  * @param rowKey 数据值字段名
  * @param childrenField 子级字段名
  */
-export declare function getKeysAndList(data?: DataItem[], rowKey?: RowKey, childrenField?: string): [DataKey[], DataItem[]];
+export declare function getKeysAndList<T extends DataItem | VirtualRow>(data?: T[], rowKey?: RowKey, childrenField?: string): [DataKey[], T[]];
 /**
  * 判断是否自适应行高
  * @param hasExpandCol 是否有展开行
@@ -123,7 +125,7 @@ export declare function isAutoRowHeight(hasExpandCol: boolean, bodyCols: BodyCol
  * @param props 属性
  * @param ctx SetupContext
  */
-export declare function CellRender(props: CustomRenderProps, ctx: SetupContext): (string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+export declare function CellRender(props: CustomRenderProps, ctx: SetupContext): (string | number | import('vue').VNode<import('vue').RendererNode, import('vue').RendererElement, {
     [key: string]: any;
 }>)[] | undefined;
 /**
@@ -174,7 +176,7 @@ export declare function getTreeProps(treeProps?: TreeProps): TreeTableProps;
  * @param index 自定义起始索引
  * @param pageIndex 表格分页起始索引
  */
-export declare function getIndexValue(rowIndex?: number, index?: ColumnIndex, pageIndex?: number): string;
+export declare function getIndexValue(rowIndex: number, index?: ColumnIndex, pageIndex?: number): string;
 /**
  * 获取单元格的跨行和跨列
  * @param column 列配置
@@ -195,8 +197,10 @@ export declare function getUserSums(summaryMethod?: SummaryMethod, bodyCols?: Bo
  * 计算列合计值
  * @param data 表格数据
  * @param prop 列字段名称
+ * @param index 列索引
+ * @param sumText 第一列文本
  */
-export declare function getSumValue(data?: DataItem[], prop?: string): string;
+export declare function getSumValue(data?: DataItem[], prop?: string, index?: number, sumText?: string): string;
 /**
  * 获取原始列配置
  * @param columns 列配置
@@ -219,7 +223,7 @@ export declare function cellIsOverflow(cell: HTMLElement): boolean;
  * @param getEl 获取根节点的方法
  */
 export declare function useAutoResize(getEl: () => HTMLElement | null): {
-    wrapWidth: import("vue").Ref<number>;
-    wrapHeight: import("vue").Ref<number>;
+    wrapWidth: import('vue').Ref<number>;
+    wrapHeight: import('vue').Ref<number>;
     updateWrapSize: () => void;
 };

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

@@ -244,24 +244,24 @@ function getTableColumns(bodyCols, colSizes) {
   });
   return columns.filter((col) => !!col.width);
 }
-function transformTableData(data, hasExpandCol, childrenName, rowKey, selectable) {
+function transformTableData(data, hasExpandCol, childrenName, hasChildrenName, rowKey, selectable) {
   if (!data || !data.length) {
     return [];
   }
   if (hasExpandCol) {
     return data.map((d, i) => {
-      const key = getValue(d, rowKey);
+      const key = getValue(d, rowKey) ?? i;
       const temp = {
-        _rowKey: "_expand_" + key,
-        _isExpandRow: true,
-        _expandParent: d,
-        _expandParantIndex: i
+        rowId: "_expand_" + key,
+        rowIndex: i,
+        rowData: d,
+        isExpandRow: true
       };
       return {
-        ...d,
-        _rowKey: key,
-        _rowIndex: i,
-        _rowDisabled: !(selectable == null || selectable(d, index) === true),
+        rowId: key,
+        rowIndex: i,
+        rowData: d,
+        isDisabled: !(selectable == null || selectable(d, index) === true),
         children: [temp]
       };
     });
@@ -272,10 +272,11 @@ function transformTableData(data, hasExpandCol, childrenName, rowKey, selectable
     (d) => {
       index++;
       return {
-        ...d,
-        _rowKey: getValue(d, rowKey),
-        _rowIndex: index,
-        _rowDisabled: !!(selectable && !selectable(d, index))
+        rowId: getValue(d, rowKey) ?? index,
+        rowIndex: index,
+        rowData: d,
+        isDisabled: !(selectable == null || selectable(d, index) === true),
+        hasChildren: d[hasChildrenName] === true
       };
     },
     childrenName
@@ -283,7 +284,7 @@ function transformTableData(data, hasExpandCol, childrenName, rowKey, selectable
 }
 function getRowByKey(key, data, rowKey, childrenField) {
   if (rowKey == null) {
-    return findTree(data, (d) => d._rowKey === key && !d._isExpandRow);
+    return findTree(data, (d) => d.rowId === key && !d.isExpandRow);
   }
   return findTree(data, (d) => getValue(d, rowKey) === key, childrenField);
 }
@@ -294,8 +295,8 @@ function getKeysAndList(data, rowKey, childrenField) {
     data,
     (d) => {
       const flag = rowKey == null;
-      if (!flag || !d._isExpandRow) {
-        keys.push(flag ? d._rowKey : getValue(d, rowKey));
+      if (!flag || !d.isExpandRow) {
+        keys.push(flag ? d.rowId : getValue(d, rowKey));
         list.push(d);
       }
     },
@@ -414,14 +415,18 @@ function getTreeProps(treeProps) {
 }
 function getIndexValue(rowIndex, index, pageIndex) {
   if (index == null) {
-    return String((pageIndex || 0) + (rowIndex || 0));
+    return String((pageIndex ?? 1) + rowIndex);
   }
-  const start = typeof index === "function" ? index(rowIndex || 0) : index;
-  return String((start || 0) + (rowIndex || 0));
+  if (typeof index === "function") {
+    return String(index(rowIndex));
+  }
+  return String(index + rowIndex);
 }
 function getCellSpan(params, spanMethod) {
+  var _a;
   const span = { rowspan: 1, colspan: 1 };
-  if (typeof spanMethod === "function") {
+  const type = (_a = params.column) == null ? void 0 : _a.type;
+  if ((!type || !["index", "selection", "expand"].includes(type)) && typeof spanMethod === "function") {
     const result = spanMethod(params);
     if (result != null) {
       if (Array.isArray(result)) {
@@ -445,15 +450,18 @@ function getCellSpan(params, spanMethod) {
   return span;
 }
 function getUserSums(summaryMethod, bodyCols, data) {
-  if (typeof summaryMethod !== "function" || bodyCols == null) {
+  if (typeof summaryMethod !== "function" || bodyCols == null || data == null) {
     return;
   }
   const columns = bodyCols.map((col) => {
     return { ...col.originalCol || {}, property: col.dataKey };
   });
-  return summaryMethod({ columns, data: data ?? [] });
+  return summaryMethod({ columns, data });
 }
-function getSumValue(data, prop) {
+function getSumValue(data, prop, index, sumText) {
+  if (index === 0) {
+    return sumText ?? "Sum";
+  }
   if (!data || !prop) {
     return "";
   }

package/es/ele-watermark/index.d.ts

@@ -1,19 +1,20 @@
-import type { Ref } from 'vue';
-declare const _default: import("vue").DefineComponent<{
+import { Ref } from 'vue';
+
+declare const _default: import('vue').DefineComponent<{
     width: NumberConstructor;
     height: NumberConstructor;
     rotate: NumberConstructor;
     zIndex: NumberConstructor;
     image: StringConstructor;
-    content: import("vue").PropType<string | string[]>;
-    font: import("vue").PropType<import("./types").WatermarkFont>;
-    gap: import("vue").PropType<import("./types").WatermarkGap>;
-    offset: import("vue").PropType<import("./types").WatermarkOffset>;
+    content: import('vue').PropType<string | string[]>;
+    font: import('vue').PropType<import('./types').WatermarkFont>;
+    gap: import('vue').PropType<import('./types').WatermarkGap>;
+    offset: import('vue').PropType<import('./types').WatermarkOffset>;
     lineGap: {
         type: NumberConstructor;
         default: number;
     };
-    customStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    customStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
     fixed: BooleanConstructor;
     wrapPosition: {
         type: BooleanConstructor;
@@ -24,22 +25,22 @@ declare const _default: import("vue").DefineComponent<{
     rootKey: Ref<number>;
     rootRef: Ref<HTMLDivElement | null>;
     imgRef: Ref<HTMLDivElement | null>;
-    imgStyle: Ref<Partial<import("vue").CSSProperties>>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+    imgStyle: Ref<Partial<import('vue').CSSProperties>>;
+}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     width: NumberConstructor;
     height: NumberConstructor;
     rotate: NumberConstructor;
     zIndex: NumberConstructor;
     image: StringConstructor;
-    content: import("vue").PropType<string | string[]>;
-    font: import("vue").PropType<import("./types").WatermarkFont>;
-    gap: import("vue").PropType<import("./types").WatermarkGap>;
-    offset: import("vue").PropType<import("./types").WatermarkOffset>;
+    content: import('vue').PropType<string | string[]>;
+    font: import('vue').PropType<import('./types').WatermarkFont>;
+    gap: import('vue').PropType<import('./types').WatermarkGap>;
+    offset: import('vue').PropType<import('./types').WatermarkOffset>;
     lineGap: {
         type: NumberConstructor;
         default: number;
     };
-    customStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    customStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
     fixed: BooleanConstructor;
     wrapPosition: {
         type: BooleanConstructor;