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

package/es/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/es/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 文件名

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

@@ -318,7 +318,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) => {
@@ -334,9 +334,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
     };
   });
 }
@@ -424,56 +425,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 } = 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 } = 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 = getUserSums(summaryMethod, bodyCols, data);
+    const uSum = getUserSums(summaryMethod, bodyCols, data);
     bodyCols.forEach((col, i) => {
-      const { key, dataKey, originalCol: column } = col;
-      const sumValue = 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 ? 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");
@@ -488,13 +619,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);
 }
 export {
   columnsExportFilter,
@@ -508,6 +639,7 @@ export {
   getColItems,
   getColsCacheKey,
   getDefaultFilter,
+  getExportBodyNode,
   getExportData,
   getHeaderCellText,
   getInitCacheColumns,

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

@@ -185,6 +185,22 @@
     table-layout: fixed;
     border-collapse: collapse;
     word-break: break-all;
+
+    &.is-border {
+      border-left: none;
+      border-right: 1px solid eleVar('table', 'border-color');
+
+      & > tr,
+      & > thead > tr,
+      & > tbody > tr,
+      & > tfoot > tr {
+        & > th,
+        & > td {
+          border-right-width: 0;
+          border-left-width: 1px;
+        }
+      }
+    }
   }
 }
 

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

@@ -7,6 +7,7 @@ declare const _default: import('vue').DefineComponent<{
     width: (StringConstructor | NumberConstructor)[];
     isPopover: BooleanConstructor;
     offset: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 12, boolean>;
+    zIndex: NumberConstructor;
     trigger: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => "hover" | "focus" | "click" | "contextmenu" | import('element-plus').TooltipTriggerType[]) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>) | ((new (...args: any[]) => "hover" | "focus" | "click" | "contextmenu" | import('element-plus').TooltipTriggerType[]) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>))[], unknown, unknown, "hover", boolean>;
     effect: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "dark", boolean>;
     placement: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, import('element-plus').Placement, unknown, "bottom", boolean>;
@@ -36,7 +37,6 @@ declare const _default: import('vue').DefineComponent<{
     visible: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => boolean) | (() => boolean | null) | ((new (...args: any[]) => boolean) | (() => boolean | null))[], unknown, unknown, null, boolean>;
     transition: StringConstructor;
     enterable: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    zIndex: NumberConstructor;
     gpuAcceleration: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     showAfter: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     hideAfter: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 200, boolean>;
@@ -68,6 +68,7 @@ declare const _default: import('vue').DefineComponent<{
     width: (StringConstructor | NumberConstructor)[];
     isPopover: BooleanConstructor;
     offset: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 12, boolean>;
+    zIndex: NumberConstructor;
     trigger: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => "hover" | "focus" | "click" | "contextmenu" | import('element-plus').TooltipTriggerType[]) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>) | ((new (...args: any[]) => "hover" | "focus" | "click" | "contextmenu" | import('element-plus').TooltipTriggerType[]) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>))[], unknown, unknown, "hover", boolean>;
     effect: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "dark", boolean>;
     placement: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, import('element-plus').Placement, unknown, "bottom", boolean>;
@@ -97,7 +98,6 @@ declare const _default: import('vue').DefineComponent<{
     visible: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => boolean) | (() => boolean | null) | ((new (...args: any[]) => boolean) | (() => boolean | null))[], unknown, unknown, null, boolean>;
     transition: StringConstructor;
     enterable: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    zIndex: NumberConstructor;
     gpuAcceleration: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     showAfter: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     hideAfter: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 200, boolean>;
@@ -106,10 +106,10 @@ declare const _default: import('vue').DefineComponent<{
     popperClass: StringConstructor;
     popperStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
 }>> & {
+    onClose?: ((e: any) => any) | undefined;
     "onUpdate:visible"?: ((visible: boolean) => any) | undefined;
     onHide?: ((e: Event) => any) | undefined;
     onOpen?: ((e: any) => any) | undefined;
-    onClose?: ((e: any) => any) | undefined;
     onShow?: ((e: Event) => any) | undefined;
     "onBefore-show"?: ((e: Event) => any) | undefined;
     "onBefore-hide"?: ((e: Event) => any) | undefined;

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

@@ -197,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 列配置

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

@@ -423,8 +423,10 @@ function getIndexValue(rowIndex, index, pageIndex) {
   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)) {
@@ -456,7 +458,10 @@ function getUserSums(summaryMethod, bodyCols, 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/icons/LoadingOutlined.js

@@ -16,7 +16,7 @@ const _hoisted_1 = {
   "stroke-width": "4",
   "stroke-linecap": "round"
 };
-const _hoisted_2 = /* @__PURE__ */ createElementVNode("path", { d: "M24 2C36 2 46 12 46 24" }, null, -1);
+const _hoisted_2 = /* @__PURE__ */ createElementVNode("path", { d: "M 22 6 C 34 6 42 14 42 26" }, null, -1);
 const _hoisted_3 = [
   _hoisted_2
 ];

package/es/lang/en_US.js

@@ -42,6 +42,8 @@ const localeValues = {
     columnTitle: "Check all",
     columnReset: "Reset",
     columnUntitled: "Untitled",
+    columnIndex: "Index",
+    columnExpand: "Expand",
     columnFixedLeft: "Pin to left",
     columnFixedRight: "Pin to right",
     exportOk: "Ok",
@@ -52,7 +54,11 @@ const localeValues = {
     exportSelectColumn: "Columns",
     exportDataTypePage: "Current",
     exportDataTypeSelected: "Selected",
-    exportDataTypeAll: "All"
+    exportDataTypeAll: "All",
+    exportOther: "Options",
+    exportOtherHeader: "Header",
+    exportOtherFooter: "Footer",
+    exportOtherTreeIndex: "Tree index"
   },
   copyable: {
     copy: "Copy",

package/es/lang/zh_CN.js

@@ -42,6 +42,8 @@ const localeValues = {
     columnTitle: "全选",
     columnReset: "重置",
     columnUntitled: "无标题",
+    columnIndex: "序号列",
+    columnExpand: "展开列",
     columnFixedLeft: "固定在左侧",
     columnFixedRight: "固定在右侧",
     exportOk: "确定",
@@ -52,7 +54,11 @@ const localeValues = {
     exportSelectColumn: "选择字段",
     exportDataTypePage: "当前页数据",
     exportDataTypeSelected: "选中数据",
-    exportDataTypeAll: "全部数据"
+    exportDataTypeAll: "全部数据",
+    exportOther: "其它选项",
+    exportOtherHeader: "表头",
+    exportOtherFooter: "表尾",
+    exportOtherTreeIndex: "层级序号"
   },
   copyable: {
     copy: "复制",

package/es/lang/zh_TW.js

@@ -42,6 +42,8 @@ const localeValues = {
     columnTitle: "列展示",
     columnReset: "重置",
     columnUntitled: "無標題",
+    columnIndex: "序號列",
+    columnExpand: "展開列",
     columnFixedLeft: "固定在左側",
     columnFixedRight: "固定在右側",
     exportOk: "確認",
@@ -52,7 +54,11 @@ const localeValues = {
     exportSelectColumn: "選擇字段",
     exportDataTypePage: "當前頁數據",
     exportDataTypeSelected: "選中數據",
-    exportDataTypeAll: "全部數據"
+    exportDataTypeAll: "全部數據",
+    exportOther: "更多選項",
+    exportOtherHeader: "表頭",
+    exportOtherFooter: "表尾",
+    exportOtherTreeIndex: "層級序號"
   },
   copyable: {
     copy: "複製",