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

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

@@ -1,7 +1,8 @@
-import type { PropType, ExtractPropTypes } from 'vue';
-import type { EleLoadingProps, EleToolbarProps } from '../ele-app/plus';
-import type { DataItem, Columns, TableSize } from '../ele-data-table/types';
-import type { Where, Datasource, RequestOption, ResponseOption, ParseData, DoneParams, TablePagination, TableLocale, ExportConfig, PrintConfig } from './types';
+import { Where, Datasource, RequestOption, ResponseOption, ParseData, DoneParams, TablePagination, TableLocale, ExportConfig, PrintConfig } from './types';
+import { DataItem, Columns, TableSize } from '../ele-data-table/types';
+import { EleLoadingProps, EleToolbarProps } from '../ele-app/plus';
+import { PropType, ExtractPropTypes } from 'vue';
+
 /**
  * 属性
  */
@@ -64,9 +65,9 @@ export declare const proTableProps: {
     /** 表格全屏状态的高度 */
     maximizedHeight: (StringConstructor | NumberConstructor)[];
     /** 自定义表格样式 */
-    tableStyle: PropType<Partial<import("vue").CSSProperties>>;
+    tableStyle: PropType<Partial<import('vue').CSSProperties>>;
     /** 自定义底部样式 */
-    footerStyle: PropType<Partial<import("vue").CSSProperties>>;
+    footerStyle: PropType<Partial<import('vue').CSSProperties>>;
     /** 分页组件 */
     pagination: {
         type: PropType<boolean | TablePagination>;
@@ -86,14 +87,14 @@ export declare const proTableProps: {
     exportConfig: PropType<ExportConfig>;
     /** 打印配置 */
     printConfig: PropType<PrintConfig>;
-    width: (StringConstructor | NumberConstructor)[];
-    height: (StringConstructor | NumberConstructor)[];
     size: {
-        readonly type: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
+        readonly type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
+    width: (StringConstructor | NumberConstructor)[];
+    height: (StringConstructor | NumberConstructor)[];
     maxHeight: (StringConstructor | NumberConstructor)[];
     fit: {
         type: BooleanConstructor;
@@ -108,11 +109,8 @@ export declare const proTableProps: {
         type: PropType<Columns>;
         required: boolean;
     };
-    scrollbarAlwaysOn: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    showOverflowTooltip: PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    scrollbarAlwaysOn: BooleanConstructor;
+    showOverflowTooltip: 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;
@@ -132,26 +130,26 @@ export declare const proTableProps: {
     };
     showSummary: BooleanConstructor;
     sumText: StringConstructor;
-    summaryMethod: PropType<import("element-plus/es/components/table/src/table/defaults").SummaryMethod<any> | undefined>;
-    rowClassName: PropType<import("element-plus/es/components/table/src/table/defaults").ColumnCls<any> | undefined>;
-    rowStyle: PropType<import("element-plus/es/components/table/src/table/defaults").ColumnStyle<any> | undefined>;
-    cellClassName: PropType<import("element-plus/es/components/table/src/table/defaults").CellCls<any> | undefined>;
-    cellStyle: PropType<import("element-plus/es/components/table/src/table/defaults").CellStyle<any> | undefined>;
-    headerRowClassName: PropType<import("element-plus/es/components/table/src/table/defaults").ColumnCls<any> | undefined>;
-    headerRowStyle: PropType<import("element-plus/es/components/table/src/table/defaults").ColumnStyle<any> | undefined>;
-    headerCellClassName: PropType<import("element-plus/es/components/table/src/table/defaults").CellCls<any> | undefined>;
-    headerCellStyle: PropType<import("element-plus/es/components/table/src/table/defaults").CellStyle<any> | undefined>;
+    summaryMethod: PropType<import('element-plus').SummaryMethod<any> | undefined>;
+    rowClassName: PropType<import('element-plus').ColumnCls<any> | undefined>;
+    rowStyle: PropType<import('element-plus').ColumnStyle<any> | undefined>;
+    cellClassName: PropType<import('element-plus').CellCls<any> | undefined>;
+    cellStyle: PropType<import('element-plus').CellStyle<any> | undefined>;
+    headerRowClassName: PropType<import('element-plus').ColumnCls<any> | undefined>;
+    headerRowStyle: PropType<import('element-plus').ColumnStyle<any> | undefined>;
+    headerCellClassName: PropType<import('element-plus').CellCls<any> | undefined>;
+    headerCellStyle: PropType<import('element-plus').CellStyle<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (StringConstructor | NumberConstructor)[];
     expandRowKeys: PropType<any[] | undefined>;
     defaultExpandAll: BooleanConstructor;
-    defaultSort: PropType<import("element-plus/es/components/table/src/table/defaults").Sort | undefined>;
+    defaultSort: PropType<import('element-plus').Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: PropType<Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    tooltipOptions: PropType<Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     spanMethod: 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;
@@ -171,9 +169,9 @@ export declare const proTableProps: {
             children: string;
         };
     };
-    load: PropType<((row: any, treeNode: import("element-plus/es/components/table/src/table/defaults").TreeNode, resolve: (data: any[]) => void) => void) | undefined>;
+    load: PropType<((row: any, treeNode: import('element-plus').TreeNode, resolve: (data: any[]) => void) => void) | undefined>;
     tableLayout: {
-        type: PropType<"auto" | "fixed">;
+        type: PropType<"fixed" | "auto">;
         default: string;
     };
     flexible: BooleanConstructor;
@@ -192,12 +190,12 @@ export declare const proTableProps: {
         default: boolean;
     };
     emptyProps: {
-        type: PropType<import("../ele-data-table/types").TableEmptyProps>;
+        type: PropType<import('../ele-data-table/types').TableEmptyProps>;
         default: () => null;
     };
-    rowClickChecked: PropType<import("../ele-data-table/types").RowClickChecked>;
+    rowClickChecked: PropType<import('../ele-data-table/types').RowClickChecked>;
     reserveCurrent: BooleanConstructor;
-    selectedRowKeys: PropType<import("../ele-data-table/types").DataKey[]>;
+    selectedRowKeys: PropType<import('../ele-data-table/types').DataKey[]>;
 };
 export type ProTableProps = ExtractPropTypes<typeof proTableProps>;
 /**
@@ -221,22 +219,22 @@ export declare const proTableEmits: {
     select: (_selection: DataItem[], _row: DataItem) => boolean;
     selectAll: (_selection: DataItem[]) => boolean;
     selectionChange: (_selection: DataItem[]) => boolean;
-    cellMouseEnter: (_row: DataItem, _column: import("./types").Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
-    cellMouseLeave: (_row: DataItem, _column: import("./types").Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
-    cellClick: (_row: DataItem, _column: import("./types").Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
-    cellDblclick: (_row: DataItem, _column: import("./types").Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
-    cellContextmenu: (_row: DataItem, _column: import("./types").Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
-    rowClick: (_row: DataItem, _column: import("./types").Column, _e: MouseEvent) => boolean;
-    rowContextmenu: (_row: DataItem, _column: import("./types").Column, _e: MouseEvent) => boolean;
+    cellMouseEnter: (_row: DataItem, _column: import('./types').Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
+    cellMouseLeave: (_row: DataItem, _column: import('./types').Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
+    cellClick: (_row: DataItem, _column: import('./types').Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
+    cellDblclick: (_row: DataItem, _column: import('./types').Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
+    cellContextmenu: (_row: DataItem, _column: import('./types').Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
+    rowClick: (_row: DataItem, _column: import('./types').Column, _e: MouseEvent) => boolean;
+    rowContextmenu: (_row: DataItem, _column: import('./types').Column, _e: MouseEvent) => boolean;
     /** 导出配置 */
-    rowDblclick: (_row: DataItem, _column: import("./types").Column, _e: MouseEvent) => boolean;
-    headerClick: (_column: import("./types").Column, _e: MouseEvent) => boolean;
-    headerContextmenu: (_column: import("./types").Column, _e: MouseEvent) => boolean;
-    sortChange: (_sorter: import("./types").Sorter) => boolean;
-    filterChange: (_filter: import("./types").Filter) => boolean;
+    rowDblclick: (_row: DataItem, _column: import('./types').Column, _e: MouseEvent) => boolean;
+    headerClick: (_column: import('./types').Column, _e: MouseEvent) => boolean;
+    headerContextmenu: (_column: import('./types').Column, _e: MouseEvent) => boolean;
+    sortChange: (_sorter: import('./types').Sorter) => boolean;
+    filterChange: (_filter: import('./types').Filter) => boolean;
     currentChange: (_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => boolean;
-    headerDragend: (_width: number, _old: number, _column: import("./types").Column, _e: MouseEvent) => boolean;
+    headerDragend: (_width: number, _old: number, _column: import('./types').Column, _e: MouseEvent) => boolean;
     expandChange: (_row: 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; /** 数组数据源时刷新按钮点击事件 */
+    'update:currentRowKey': (_currentRowKey?: import('../ele-data-table/types').DataKey | undefined) => boolean;
+    'update:selectedRowKeys': (_selectedRowKeys?: import('../ele-data-table/types').DataKey[] | undefined) => boolean; /** 数组数据源时刷新按钮点击事件 */
 };

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

@@ -269,3 +269,12 @@
     border-top-right-radius: elVar('border-radius', 'base');
   }
 }
+
+.ele-tool-form-options {
+  width: 100%;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  box-sizing: border-box;
+  padding-left: 8px;
+}

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

@@ -29,6 +29,11 @@ export type {
   ResolveFunction
 };
 
+/**
+ * 分页参数
+ */
+export type Pages = Record<string, number>;
+
 /**
  * 搜索参数
  */
@@ -52,6 +57,8 @@ export interface DatasourceParams {
   page?: number;
   /** 每页显示数量 */
   limit?: number;
+  /** 分页参数 */
+  pages: Pages;
   /** 搜索参数 */
   where: Where;
   /** 排序参数 */
@@ -121,6 +128,10 @@ export type OrderValue = string | number | boolean | null | undefined;
  * 请求参数设置
  */
 export interface RequestOption {
+  /** 页码参数名称 */
+  pageName?: string;
+  /** 每页数量参数名称 */
+  limitName?: string;
   /** 排序字段参数名称 */
   sortName?: string;
   /** 排序方式参数名称 */
@@ -216,6 +227,8 @@ export interface ColItem {
   fixed?: boolean | string;
   /** 子级数据 */
   children?: ColItem[];
+  /** 列类型 */
+  type?: string;
 }
 
 /**
@@ -280,6 +293,20 @@ export type TableViewInstance =
  */
 export type ExportDataType = 'selections' | 'pageData' | 'data';
 
+/**
+ * 导出主体数据节点
+ */
+export interface ExportBodyNode {
+  /** 数据 */
+  row: DataItem;
+  /** 索引 */
+  index: number;
+  /** 所处深度 */
+  level: number;
+  /** 子级数量 */
+  childSize: number;
+}
+
 /**
  * 导出的数据每一项
  */
@@ -298,6 +325,16 @@ export interface ExportDataItem {
   colspan?: number;
   /** 所占行数 */
   rowspan?: number;
+  /** 是否是展开行的单元格 */
+  isExpandCell?: boolean;
+  /** 是否是层级序号 */
+  isTreeIndex?: boolean;
+  /** 是否显示树展开图标 */
+  isTreeCell?: boolean;
+  /** 是否是树叶子节点 */
+  isTreeLeaf?: boolean;
+  /** 树层级缩进 */
+  indent?: number;
 }
 
 /**
@@ -387,6 +424,8 @@ export interface TablePrintOptions extends ExportDataResult {
   hasHeader: boolean;
   /** 是否有表尾 */
   hasFooter: boolean;
+  /** 打印的数据 */
+  data: DataItem[];
 }
 
 /**
@@ -405,6 +444,8 @@ export interface TableLocale {
   columnTitle: string;
   columnReset: string;
   columnUntitled: string;
+  columnIndex: string;
+  columnExpand: string;
   columnFixedLeft: string;
   columnFixedRight: string;
   exportOk: string;
@@ -416,4 +457,8 @@ export interface TableLocale {
   exportDataTypePage: string;
   exportDataTypeSelected: string;
   exportDataTypeAll: string;
+  exportOther: string;
+  exportOtherHeader: string;
+  exportOtherFooter: string;
+  exportOtherTreeIndex: string;
 }

package/lib/ele-pro-table/util.cjs

@@ -67,6 +67,8 @@ function getDefaultFilter(columns) {
 }
 function getRequestName(globalRequest, request) {
   const defaultRequest = {
+    pageName: "page",
+    limitName: "limit",
     sortName: "sort",
     orderName: "order",
     ascValue: "asc",
@@ -145,6 +147,16 @@ function getRequestFilters(filter) {
   }
   return filters;
 }
+function getRequestPages(page, limit, request, globalRequest) {
+  const pages = {};
+  const { pageName, limitName } = getRequestName(globalRequest, request);
+  if (!pageName || !limitName) {
+    return pages;
+  }
+  pages[pageName] = page;
+  pages[limitName] = limit;
+  return pages;
+}
 function getResponseResult(data, response, globalResponse, lazy, treeOpt) {
   if (!data || Array.isArray(data)) {
     return { data: getResponseData(data, lazy, treeOpt) };
@@ -207,7 +219,10 @@ function sortData(datasource, sorter) {
   return data;
 }
 function getColId(column) {
-  return column ? column.columnKey || column.prop : void 0;
+  if (column.columnKey == null || column.columnKey === "") {
+    return column.prop;
+  }
+  return column.columnKey;
 }
 function getInitColumns(columns) {
   const data = [];
@@ -305,19 +320,26 @@ function getCheckedColumns(columns, cols, sortable, filter) {
   });
   return data;
 }
-function getColItems(columns, untitledText, filter) {
-  return core.mapTree(columns, (d) => {
+function getColItems(columns, untitledText, indexText, expandText, filter, sortFixed, cancelFixed) {
+  const temp = columns == null ? [] : [...columns];
+  if (sortFixed) {
+    temp.sort((a, b) => {
+      return util.getColFixedNumber(a.fixed) - util.getColFixedNumber(b.fixed);
+    });
+  }
+  return core.mapTree(temp, (d, _i, parent) => {
     const colId = getColId(d);
-    if (!colId || filter && !filter(d)) {
+    if (colId == null || filter && !filter(d)) {
       return;
     }
     return {
       uid: colId,
-      prop: d.prop,
-      columnKey: d.columnKey,
-      label: d.label || untitledText,
+      //prop: d.prop,
+      //columnKey: d.columnKey,
+      label: d.label || (d.type === "index" ? indexText : d.type === "expand" ? expandText : untitledText),
       checked: !d.hideInTable,
-      fixed: d.fixed
+      fixed: cancelFixed ? false : parent == null ? d.fixed : false,
+      type: d.type
     };
   });
 }
@@ -375,21 +397,13 @@ function getCacheSize(cacheKey) {
     }
   }
 }
-function getDefaultRowKey(rowKey) {
-  return rowKey ? void 0 : "_rowKey";
-}
 function getRowKey(rowKey) {
-  return rowKey ?? getDefaultRowKey();
-}
-function addDefaultRowKey(data, rowKey, page) {
-  if (rowKey == null) {
-    return data;
+  if (rowKey != null) {
+    return rowKey;
   }
-  return data.map((d, i) => {
-    const item = { ...d };
-    item[rowKey] = `${page}-${i}`;
-    return item;
-  });
+  return (row) => {
+    return JSON.stringify(row);
+  };
 }
 function getCellText(column, row, index, pageIndex) {
   if (!column) {
@@ -400,7 +414,7 @@ function getCellText(column, row, index, pageIndex) {
   }
   const propValue = util.getValue(row, column.prop);
   if (typeof column.formatter === "function") {
-    return column.formatter(row, column, propValue, index, "export");
+    return column.formatter(row, column, propValue, index);
   }
   return propValue == null ? "" : String(propValue);
 }
@@ -409,61 +423,190 @@ function getHeaderCellText(column, index) {
     return "";
   }
   if (typeof column.renderHeader === "function") {
-    const params = { column, $index: index, action: "export" };
-    return column.renderHeader(params);
+    return column.renderHeader({ column, $index: index });
   }
   return column.label == null ? "" : String(column.label);
 }
-function getExportData(data, columns, spanMethod, pageIndex, showSummary, sumText, summaryMethod) {
+function getExportBodyNode(data, childrenField = "children", level = 0, parents = []) {
+  const bodyDodes = [];
+  let maxDepth = 0;
+  data.forEach((row, index) => {
+    const node = { row, index, level, childSize: 0 };
+    bodyDodes.push(node);
+    parents.forEach((parent) => {
+      parent.childSize++;
+    });
+    const children = row[childrenField];
+    if (children && children.length) {
+      const { depth, nodes } = getExportBodyNode(
+        children,
+        childrenField,
+        level + 1,
+        [...parents, node]
+      );
+      maxDepth = Math.max(maxDepth, depth);
+      nodes.forEach((n) => {
+        bodyDodes.push(n);
+      });
+    }
+  });
+  return { depth: maxDepth + 1, nodes: bodyDodes };
+}
+function getExportData(data, columns, spanMethod, pageIndex, showSummary, sumText, summaryMethod, childrenField, showTreeIndex, showHeader) {
+  const { nodes, depth } = getExportBodyNode(data, childrenField);
   const { rows: headerRows, cols: bodyCols } = util$1.analyseColumns(columns);
+  const showExpandIndex = bodyCols.some((c) => {
+    var _a;
+    return ((_a = c.originalCol) == null ? void 0 : _a.type) === "expand";
+  }) ? showTreeIndex : false;
+  if (depth <= 1 || showExpandIndex) {
+    showTreeIndex = false;
+  }
+  const treeIconIndex = showTreeIndex ? void 0 : bodyCols.findIndex(
+    (c) => {
+      var _a;
+      return !((_a = c.originalCol) == null ? void 0 : _a.type) || !["index", "expand", "selection"].includes(c.originalCol.type);
+    }
+  );
   const bodyData = [];
-  data.forEach((row, index) => {
+  nodes.forEach((node, index) => {
+    const row = node.row;
     const bodyRowData = [];
+    const expandRowData = [];
     bodyCols.forEach((col, columnIndex) => {
-      const { key, originalCol: column } = col;
+      const { key: colKey, originalCol: column } = col;
+      const key = `${index}-${columnIndex}-${colKey}`;
       const { colspan, rowspan } = util$1.getCellSpan(
         { column, columnIndex, row, rowIndex: index },
         spanMethod
       );
       const isNone = colspan == 0 || rowspan == 0;
       const text = isNone ? "" : getCellText(column, row, index, pageIndex);
-      bodyRowData.push({ key, row, index, column, text, colspan, rowspan });
+      const dataItem = {
+        key,
+        row,
+        index,
+        column,
+        text,
+        colspan,
+        rowspan,
+        isTreeCell: depth > 1 ? columnIndex === treeIconIndex : false,
+        isTreeLeaf: !node.childSize,
+        indent: node.level
+      };
+      if (column.type === "expand") {
+        dataItem.text = showExpandIndex ? String(node.index + 1) : "";
+        if (showExpandIndex && !expandRowData.length) {
+          dataItem.rowspan = 2;
+        }
+        const expandDataItem = {
+          key: "_expand_" + key,
+          row,
+          index,
+          column,
+          text,
+          colspan: showExpandIndex ? bodyCols.length - 1 : bodyCols.length,
+          isExpandCell: true
+        };
+        if (showExpandIndex) {
+          expandRowData[0] = {
+            key: "_expand_0-" + key,
+            row,
+            index,
+            rowspan: 0,
+            colspan: 0,
+            isExpandCell: true
+          };
+          expandRowData[1] = expandDataItem;
+        } else {
+          expandRowData[0] = expandDataItem;
+        }
+      }
+      bodyRowData.push(dataItem);
     });
     bodyData.push(bodyRowData);
+    if (expandRowData.length) {
+      bodyData.push(expandRowData);
+    }
+    if (showTreeIndex) {
+      for (let i = depth - 1; i >= 0; i--) {
+        const colspan = i < node.level ? 0 : 1;
+        bodyRowData.unshift({
+          key: `_index_${index}-${i}`,
+          index,
+          text: i === node.level ? String(node.index + 1) : void 0,
+          colspan,
+          rowspan: i === node.level ? node.childSize + 1 : colspan,
+          isTreeIndex: true
+        });
+      }
+    }
   });
   const headerData = [];
-  headerRows.forEach((headerCols, index) => {
-    const headerRowData = [];
-    headerCols.forEach((col) => {
-      const { key, colspan, rowspan, originalCol: column } = col;
-      const isNone = colspan == 0 || rowspan == 0;
-      const text = isNone ? "" : getHeaderCellText(column, index);
-      headerRowData.push({ key, index, column, text, colspan, rowspan });
+  if (showHeader) {
+    headerRows.forEach((headerCols, index) => {
+      const headerRowData = [];
+      headerCols.forEach((col) => {
+        const { key, colspan, rowspan, originalCol: column } = col;
+        const isNone = colspan == 0 || rowspan == 0;
+        const text = isNone ? "" : getHeaderCellText(column, index);
+        headerRowData.push({ key, index, column, text, colspan, rowspan });
+      });
+      headerData.push(headerRowData);
+      if (showTreeIndex) {
+        for (let i = depth - 1; i >= 0; i--) {
+          headerRowData.unshift({
+            key: `_index_th_${index}-${i}`,
+            index,
+            colspan: i === 0 ? index === 0 ? depth : 0 : 0,
+            rowspan: i === 0 ? index === 0 ? headerRows.length : 0 : 0,
+            isTreeIndex: true
+          });
+        }
+      }
     });
-    headerData.push(headerRowData);
-  });
+  }
   const footerData = [];
   if (showSummary && data.length) {
     const footerRowData = [];
-    const userSums = util$1.getUserSums(summaryMethod, bodyCols, data);
+    const uSum = util$1.getUserSums(summaryMethod, bodyCols, data);
     bodyCols.forEach((col, i) => {
-      const { key, dataKey, originalCol: column } = col;
-      const sumValue = util$1.getSumValue(data, dataKey);
-      footerRowData.push({
-        key,
-        column,
-        text: userSums == null ? i === 0 ? sumText : sumValue : userSums[i],
-        index: 0
-      });
+      const { key, dataKey: dKey, originalCol: column } = col;
+      const text = uSum == null ? util$1.getSumValue(data, dKey, i, sumText) : uSum[i];
+      footerRowData.push({ key, column, text, index: 0 });
     });
     footerData.push(footerRowData);
+    if (showTreeIndex) {
+      for (let i = depth - 1; i >= 0; i--) {
+        footerRowData.unshift({
+          key: `_index_tf-${i}`,
+          index: 0,
+          colspan: i === 0 ? depth : 0,
+          rowspan: i === 0 ? headerRows.length : 0,
+          isTreeIndex: true
+        });
+      }
+    }
+  }
+  if (showTreeIndex) {
+    for (let i = depth - 1; i >= 0; i--) {
+      bodyCols.unshift({ key: `_index_${i}`, width: 26 });
+    }
   }
   return { headerData, bodyData, footerData, bodyCols };
 }
 function exportCSV(fileName, headerData, bodyData, footerData) {
   const csvRows = [];
   [...headerData, ...bodyData, ...footerData].forEach((item) => {
-    csvRows.push(item.map((d) => d.text ?? "").join(","));
+    const cells = item.map((d) => {
+      const text = (d.text ?? "").replace(/,/g, "，").replace(/\n/g, "    ");
+      if (!d.isTreeCell || !d.indent) {
+        return text;
+      }
+      const indent = Array.from({ length: d.indent }).fill("  ").join("");
+      return indent + text;
+    });
+    csvRows.push(cells.join(","));
   });
   const content = encodeURIComponent(csvRows.join("\n"));
   const a = document.createElement("a");
@@ -474,12 +617,21 @@ function exportCSV(fileName, headerData, bodyData, footerData) {
   a.click();
   document.body.removeChild(a);
 }
-function exportColumnsfilter(item) {
-  return !item.type || !["selection", "expand"].includes(item.type);
+function columnsExportFilter(item) {
+  if (item.hideInExport) {
+    return false;
+  }
+  return !item.type || !["selection"].includes(item.type);
+}
+function columnsPrintFilter(item) {
+  if (item.hideInPrint) {
+    return false;
+  }
+  return !item.type || !["selection"].includes(item.type);
 }
-exports.addDefaultRowKey = addDefaultRowKey;
+exports.columnsExportFilter = columnsExportFilter;
+exports.columnsPrintFilter = columnsPrintFilter;
 exports.exportCSV = exportCSV;
-exports.exportColumnsfilter = exportColumnsfilter;
 exports.getCacheCols = getCacheCols;
 exports.getCacheSize = getCacheSize;
 exports.getCellText = getCellText;
@@ -488,7 +640,7 @@ exports.getColId = getColId;
 exports.getColItems = getColItems;
 exports.getColsCacheKey = getColsCacheKey;
 exports.getDefaultFilter = getDefaultFilter;
-exports.getDefaultRowKey = getDefaultRowKey;
+exports.getExportBodyNode = getExportBodyNode;
 exports.getExportData = getExportData;
 exports.getHeaderCellText = getHeaderCellText;
 exports.getInitCacheColumns = getInitCacheColumns;
@@ -498,6 +650,7 @@ exports.getPaginationProps = getPaginationProps;
 exports.getRequestFilters = getRequestFilters;
 exports.getRequestName = getRequestName;
 exports.getRequestOrders = getRequestOrders;
+exports.getRequestPages = getRequestPages;
 exports.getResponseData = getResponseData;
 exports.getResponseName = getResponseName;
 exports.getResponseResult = getResponseResult;