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

package/lib/ele-pro-table/components/tool-print.d.ts

@@ -1,33 +1,16 @@
-import { ExportDataType, BeforeExport, Datasource, FetchFunction, ColItem, TablePrintOptions } from '../types';
+import { TableLocale, ExportDataType, BeforeExport, Datasource, FetchFunction, ColItem, TablePrintOptions } from '../types';
 import { Columns, DataItem } from '../../ele-data-table/types';
 import { EleModalProps, ElePrinterProps, EleTableProps } from '../../ele-app/plus';
 import { PropType } from 'vue';
 
 declare const _default: import('vue').DefineComponent<{
-    /** 提示文字 */
-    title: StringConstructor;
     /** 提示位置 */
     placement: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, import('element-plus').Placement, unknown> | undefined>;
-    /** 全选文字 */
-    checkAllText: StringConstructor;
-    /** 重置文字 */
-    resetText: StringConstructor;
-    /** 无标题列文字 */
-    untitledText: StringConstructor;
-    /** 选择数据文字 */
-    selectDataText: StringConstructor;
-    /** 选择字段文字 */
-    selectColumnText: StringConstructor;
-    /** 当前页数据文字 */
-    dataTypePageText: StringConstructor;
-    /** 选中数据文字 */
-    dataTypeSelectedText: StringConstructor;
-    /** 全部数据文字 */
-    dataTypeAllText: StringConstructor;
-    /** 取消文字 */
-    cancelText: StringConstructor;
-    /** 确定文字 */
-    okText: StringConstructor;
+    /** 表格国际化 */
+    locale: {
+        type: PropType<TableLocale>;
+        required: true;
+    };
     /** 弹窗参数 */
     modalProps: PropType<EleModalProps>;
     /** 打印组件参数 */
@@ -45,14 +28,15 @@ declare const _default: import('vue').DefineComponent<{
     /** 单元格合并行列方法 */
     spanMethod: PropType<((data: {
         row: DataItem;
-        /** 单元格样式 */
-        rowIndex: number;
+        rowIndex: number; /** 序号列起始索引 */
         column: import('element-plus').TableColumnCtx<DataItem>;
         columnIndex: number;
     }) => number[] | {
         rowspan: number;
         colspan: number;
     } | undefined) | undefined>;
+    /** 表格是否有表头 */
+    tableHeader: BooleanConstructor;
     /** 是否显示合计行 */
     showSummary: BooleanConstructor;
     /** 合计行文本 */
@@ -69,6 +53,8 @@ declare const _default: import('vue').DefineComponent<{
     headerCellClassName: PropType<import('element-plus').CellCls<DataItem> | undefined>;
     /** 序号列起始索引 */
     pageIndex: NumberConstructor;
+    /** 子级字段名 */
+    childrenField: StringConstructor;
     /** 表格请求数据方法 */
     fetch: PropType<FetchFunction>;
     /** 默认数据类型 */
@@ -88,43 +74,32 @@ declare const _default: import('vue').DefineComponent<{
         checked?: boolean | undefined;
         fixed?: string | boolean | undefined;
         children?: any[] | undefined;
+        type?: string | undefined;
     }[]>;
     isCheckAll: import('vue').Ref<boolean>;
     isIndeterminate: import('vue').Ref<boolean>;
+    showHeader: import('vue').Ref<boolean>;
+    showFooter: import('vue').Ref<boolean>;
+    showTreeIndex: import('vue').Ref<boolean>;
+    treeIndexDisabled: import('vue').Ref<boolean>;
     printOptions: TablePrintOptions;
     openModal: () => void;
     closeModal: () => void;
     onPrintDone: () => void;
     handlePrint: () => void;
-    onCheckedChange: (item: ColItem, checked: boolean) => void;
+    onCheckedChange: (item?: ColItem, checked?: boolean, type?: string) => void;
     onSortChange: (items: ColItem[], parent?: ColItem) => void;
     onCheckAllChange: (checked: boolean) => void;
     onReset: () => void;
+    handleTreeIndexChange: (checked?: boolean | string | number) => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
-    /** 提示文字 */
-    title: StringConstructor;
     /** 提示位置 */
     placement: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, import('element-plus').Placement, unknown> | undefined>;
-    /** 全选文字 */
-    checkAllText: StringConstructor;
-    /** 重置文字 */
-    resetText: StringConstructor;
-    /** 无标题列文字 */
-    untitledText: StringConstructor;
-    /** 选择数据文字 */
-    selectDataText: StringConstructor;
-    /** 选择字段文字 */
-    selectColumnText: StringConstructor;
-    /** 当前页数据文字 */
-    dataTypePageText: StringConstructor;
-    /** 选中数据文字 */
-    dataTypeSelectedText: StringConstructor;
-    /** 全部数据文字 */
-    dataTypeAllText: StringConstructor;
-    /** 取消文字 */
-    cancelText: StringConstructor;
-    /** 确定文字 */
-    okText: StringConstructor;
+    /** 表格国际化 */
+    locale: {
+        type: PropType<TableLocale>;
+        required: true;
+    };
     /** 弹窗参数 */
     modalProps: PropType<EleModalProps>;
     /** 打印组件参数 */
@@ -142,14 +117,15 @@ declare const _default: import('vue').DefineComponent<{
     /** 单元格合并行列方法 */
     spanMethod: PropType<((data: {
         row: DataItem;
-        /** 单元格样式 */
-        rowIndex: number;
+        rowIndex: number; /** 序号列起始索引 */
         column: import('element-plus').TableColumnCtx<DataItem>;
         columnIndex: number;
     }) => number[] | {
         rowspan: number;
         colspan: number;
     } | undefined) | undefined>;
+    /** 表格是否有表头 */
+    tableHeader: BooleanConstructor;
     /** 是否显示合计行 */
     showSummary: BooleanConstructor;
     /** 合计行文本 */
@@ -166,6 +142,8 @@ declare const _default: import('vue').DefineComponent<{
     headerCellClassName: PropType<import('element-plus').CellCls<DataItem> | undefined>;
     /** 序号列起始索引 */
     pageIndex: NumberConstructor;
+    /** 子级字段名 */
+    childrenField: StringConstructor;
     /** 表格请求数据方法 */
     fetch: PropType<FetchFunction>;
     /** 默认数据类型 */
@@ -177,6 +155,7 @@ declare const _default: import('vue').DefineComponent<{
     beforePrint: PropType<BeforeExport>;
 }>>, {
     showSummary: boolean;
+    tableHeader: boolean;
     defaultDataType: ExportDataType;
 }, {}>;
 export default _default;

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

@@ -229,6 +229,7 @@ const _sfc_main = vue.defineComponent({
       });
     };
     const requestCallback = (data, total, parent, response, resolve) => {
+      var _a;
       if (!Array.isArray(data)) {
         tableData.value = [];
         tableLoading.value = false;
@@ -246,6 +247,9 @@ const _sfc_main = vue.defineComponent({
         return;
       }
       if (resolve) {
+        if (parent != null) {
+          parent[((_a = props2.treeProps) == null ? void 0 : _a.children) || "children"] = data;
+        }
         resolve(data);
       } else {
         if (util$1.isAutoAmend(props2.pagination, globalProps.value.pagination) && !data.length && total && "*" !== total && tablePage.value && tableLimit.value) {
@@ -513,56 +517,61 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return vue.openBlock(), vue.createBlock(_component_EleLoading, vue.normalizeProps(vue.guardReactiveProps(_ctx.loadingProps)), {
     default: vue.withCtx(() => [
       _ctx.toolbar ? (vue.openBlock(), vue.createBlock(_component_EleToolbar, vue.normalizeProps(vue.mergeProps({ key: 0 }, _ctx.toolbar === true ? {} : _ctx.toolbar)), {
-        tools: vue.withCtx(() => [
-          vue.renderSlot(_ctx.$slots, "tools"),
-          _ctx.toolNames && _ctx.toolNames.length ? (vue.openBlock(), vue.createBlock(_component_TableTools, {
-            key: 0,
-            tools: _ctx.toolNames,
-            size: _ctx.tableSize,
-            columns: _ctx.columns,
-            columnSortable: _ctx.columnSortable,
-            columnFixed: _ctx.columnFixed,
-            maximized: _ctx.tableMaximized,
-            cacheKey: _ctx.cacheKey,
-            locale: _ctx.locale,
-            selections: _ctx.selections,
-            pageData: _ctx.tableData,
-            spanMethod: _ctx.spanMethod,
-            showSummary: _ctx.showSummary,
-            sumText: _ctx.sumText,
-            summaryMethod: _ctx.summaryMethod,
-            cellStyle: _ctx.cellStyle,
-            cellClassName: _ctx.cellClassName,
-            headerCellStyle: _ctx.headerCellStyle,
-            headerCellClassName: _ctx.headerCellClassName,
-            pageIndex: _ctx.tableIndex,
-            fetch: _ctx.fetch,
-            exportConfig: _ctx.toolExportConfig,
-            printConfig: _ctx.toolPrintConfig,
-            onReload: _ctx.onRefresh,
-            "onUpdate:size": _ctx.onSizeChange,
-            "onUpdate:columns": _ctx.onColumnsChange,
-            "onUpdate:maximized": _ctx.onMaximizedChange
-          }, vue.createSlots({ _: 2 }, [
-            vue.renderList(Object.keys(_ctx.$slots).filter(
-              (k) => ![
-                "default",
-                "toolbar",
-                "tools",
-                "footer",
-                "empty",
-                "append"
-              ].includes(k)
-            ), (name) => {
-              return {
-                name,
-                fn: vue.withCtx((slotProps) => [
-                  vue.renderSlot(_ctx.$slots, name, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
-                ])
-              };
-            })
-          ]), 1032, ["tools", "size", "columns", "columnSortable", "columnFixed", "maximized", "cacheKey", "locale", "selections", "pageData", "spanMethod", "showSummary", "sumText", "summaryMethod", "cellStyle", "cellClassName", "headerCellStyle", "headerCellClassName", "pageIndex", "fetch", "exportConfig", "printConfig", "onReload", "onUpdate:size", "onUpdate:columns", "onUpdate:maximized"])) : vue.createCommentVNode("", true)
-        ]),
+        tools: vue.withCtx(() => {
+          var _a;
+          return [
+            vue.renderSlot(_ctx.$slots, "tools"),
+            _ctx.toolNames && _ctx.toolNames.length ? (vue.openBlock(), vue.createBlock(_component_TableTools, {
+              key: 0,
+              tools: _ctx.toolNames,
+              size: _ctx.tableSize,
+              columns: _ctx.columns,
+              columnSortable: _ctx.columnSortable,
+              columnFixed: _ctx.columnFixed,
+              maximized: _ctx.tableMaximized,
+              cacheKey: _ctx.cacheKey,
+              locale: _ctx.locale,
+              selections: _ctx.selections,
+              pageData: _ctx.tableData,
+              spanMethod: _ctx.spanMethod,
+              tableHeader: _ctx.showHeader,
+              showSummary: _ctx.showSummary,
+              sumText: _ctx.sumText,
+              summaryMethod: _ctx.summaryMethod,
+              cellStyle: _ctx.cellStyle,
+              cellClassName: _ctx.cellClassName,
+              headerCellStyle: _ctx.headerCellStyle,
+              headerCellClassName: _ctx.headerCellClassName,
+              pageIndex: _ctx.tableIndex,
+              childrenField: (_a = _ctx.treeProps) == null ? void 0 : _a.children,
+              fetch: _ctx.fetch,
+              exportConfig: _ctx.toolExportConfig,
+              printConfig: _ctx.toolPrintConfig,
+              onReload: _ctx.onRefresh,
+              "onUpdate:size": _ctx.onSizeChange,
+              "onUpdate:columns": _ctx.onColumnsChange,
+              "onUpdate:maximized": _ctx.onMaximizedChange
+            }, vue.createSlots({ _: 2 }, [
+              vue.renderList(Object.keys(_ctx.$slots).filter(
+                (k) => ![
+                  "default",
+                  "toolbar",
+                  "tools",
+                  "footer",
+                  "empty",
+                  "append"
+                ].includes(k)
+              ), (name) => {
+                return {
+                  name,
+                  fn: vue.withCtx((slotProps) => [
+                    vue.renderSlot(_ctx.$slots, name, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
+                  ])
+                };
+              })
+            ]), 1032, ["tools", "size", "columns", "columnSortable", "columnFixed", "maximized", "cacheKey", "locale", "selections", "pageData", "spanMethod", "tableHeader", "showSummary", "sumText", "summaryMethod", "cellStyle", "cellClassName", "headerCellStyle", "headerCellClassName", "pageIndex", "childrenField", "fetch", "exportConfig", "printConfig", "onReload", "onUpdate:size", "onUpdate:columns", "onUpdate:maximized"])) : vue.createCommentVNode("", true)
+          ];
+        }),
         default: vue.withCtx(() => [
           vue.renderSlot(_ctx.$slots, "toolbar")
         ]),

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

@@ -227,6 +227,8 @@ export interface ColItem {
   fixed?: boolean | string;
   /** 子级数据 */
   children?: ColItem[];
+  /** 列类型 */
+  type?: string;
 }
 
 /**
@@ -291,6 +293,20 @@ export type TableViewInstance =
  */
 export type ExportDataType = 'selections' | 'pageData' | 'data';
 
+/**
+ * 导出主体数据节点
+ */
+export interface ExportBodyNode {
+  /** 数据 */
+  row: DataItem;
+  /** 索引 */
+  index: number;
+  /** 所处深度 */
+  level: number;
+  /** 子级数量 */
+  childSize: number;
+}
+
 /**
  * 导出的数据每一项
  */
@@ -309,6 +325,16 @@ export interface ExportDataItem {
   colspan?: number;
   /** 所占行数 */
   rowspan?: number;
+  /** 是否是展开行的单元格 */
+  isExpandCell?: boolean;
+  /** 是否是层级序号 */
+  isTreeIndex?: boolean;
+  /** 是否显示树展开图标 */
+  isTreeCell?: boolean;
+  /** 是否是树叶子节点 */
+  isTreeLeaf?: boolean;
+  /** 树层级缩进 */
+  indent?: number;
 }
 
 /**
@@ -418,6 +444,8 @@ export interface TableLocale {
   columnTitle: string;
   columnReset: string;
   columnUntitled: string;
+  columnIndex: string;
+  columnExpand: string;
   columnFixedLeft: string;
   columnFixedRight: string;
   exportOk: string;
@@ -429,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

@@ -320,7 +320,7 @@ function getCheckedColumns(columns, cols, sortable, filter) {
   });
   return data;
 }
-function getColItems(columns, untitledText, filter, sortFixed, cancelFixed) {
+function getColItems(columns, untitledText, indexText, expandText, filter, sortFixed, cancelFixed) {
   const temp = columns == null ? [] : [...columns];
   if (sortFixed) {
     temp.sort((a, b) => {
@@ -336,9 +336,10 @@ function getColItems(columns, untitledText, filter, sortFixed, cancelFixed) {
       uid: colId,
       //prop: d.prop,
       //columnKey: d.columnKey,
-      label: d.label || untitledText,
+      label: d.label || (d.type === "index" ? indexText : d.type === "expand" ? expandText : untitledText),
       checked: !d.hideInTable,
-      fixed: cancelFixed ? false : parent == null ? d.fixed : false
+      fixed: cancelFixed ? false : parent == null ? d.fixed : false,
+      type: d.type
     };
   });
 }
@@ -426,56 +427,186 @@ function getHeaderCellText(column, 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");
@@ -490,13 +621,13 @@ function columnsExportFilter(item) {
   if (item.hideInExport) {
     return false;
   }
-  return !item.type || !["selection", "expand"].includes(item.type);
+  return !item.type || !["selection"].includes(item.type);
 }
 function columnsPrintFilter(item) {
   if (item.hideInPrint) {
     return false;
   }
-  return !item.type || !["selection", "expand"].includes(item.type);
+  return !item.type || !["selection"].includes(item.type);
 }
 exports.columnsExportFilter = columnsExportFilter;
 exports.columnsPrintFilter = columnsPrintFilter;
@@ -509,6 +640,7 @@ exports.getColId = getColId;
 exports.getColItems = getColItems;
 exports.getColsCacheKey = getColsCacheKey;
 exports.getDefaultFilter = getDefaultFilter;
+exports.getExportBodyNode = getExportBodyNode;
 exports.getExportData = getExportData;
 exports.getHeaderCellText = getHeaderCellText;
 exports.getInitCacheColumns = getInitCacheColumns;

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

@@ -1,4 +1,4 @@
-import { Pages, Orders, Filters, OrderItem, RequestOption, ResponseOption, TablePagination, DatasourceResult, ResponseResult, ReloadDataResult, ColItem, ProProps, ExportDataItem, ExportDataResult } from './types';
+import { Pages, Orders, Filters, OrderItem, RequestOption, ResponseOption, TablePagination, DatasourceResult, ResponseResult, ReloadDataResult, ColItem, ProProps, ExportBodyNode, ExportDataItem, ExportDataResult } from './types';
 import { DataItem, Column, Columns, Sorter, Filter, TableSize, TreeProps, RowKey, SpanMethod, SummaryMethod } from '../ele-data-table/types';
 import { ElePaginationProps } from '../ele-app/plus';
 
@@ -141,11 +141,13 @@ export declare function getCheckedColumns(columns: Columns | undefined, cols: Co
  * 获取列展示列表数据
  * @param columns 列配置
  * @param untitledText 未命名列文字
+ * @param indexText 序号列文字
+ * @param expandText 展开列文字
  * @param filter 过滤列的方法
  * @param sortFixed 是否对固定列排序
  * @param cancelFixed 是否取消固定列
  */
-export declare function getColItems(columns?: Columns, untitledText?: string, filter?: (item: Column) => boolean, sortFixed?: boolean, cancelFixed?: boolean): ColItem[];
+export declare function getColItems(columns?: Columns, untitledText?: string, indexText?: string, expandText?: string, filter?: (item: Column) => boolean, sortFixed?: boolean, cancelFixed?: boolean): ColItem[];
 /**
  * 获取列配置
  * @param columns 列数据
@@ -190,6 +192,17 @@ export declare function getCellText(column: Column | undefined, row: DataItem, i
  * @param index 行索引
  */
 export declare function getHeaderCellText(column: Column | undefined, index: number): string;
+/**
+ * 获取主体数据封装节点
+ * @param data 数据
+ * @param childrenField 子级字段名
+ * @param level 树形所处深度
+ * @param parents 父级节点
+ */
+export declare function getExportBodyNode(data: DataItem[], childrenField?: string, level?: number, parents?: ExportBodyNode[]): {
+    depth: number;
+    nodes: ExportBodyNode[];
+};
 /**
  * 获取导出的数据
  * @param data 元数据
@@ -199,8 +212,10 @@ export declare function getHeaderCellText(column: Column | undefined, index: num
  * @param showSummary 是否显示合计行
  * @param sumText 合计行文本
  * @param summaryMethod 合计行自定义方法
+ * @param childrenField 子级字段名
+ * @param showTreeIndex 是否显示层级序号
  */
-export declare function getExportData(data: DataItem[], columns: Columns, spanMethod?: SpanMethod, pageIndex?: number, showSummary?: boolean, sumText?: string, summaryMethod?: SummaryMethod): ExportDataResult;
+export declare function getExportData(data: DataItem[], columns: Columns, spanMethod?: SpanMethod, pageIndex?: number, showSummary?: boolean, sumText?: string, summaryMethod?: SummaryMethod, childrenField?: string, showTreeIndex?: boolean, showHeader?: boolean): ExportDataResult;
 /**
  * 导出csv文件
  * @param fileName 文件名