ele-admin-plus 1.4.1-beta.1 → 1.5.0-beta.1

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

@@ -71,6 +71,10 @@ export interface DatasourceParams {
   filter: Filter;
   /** 树表懒加载父级数据 */
   parent?: DataItem;
+  /** 表格的列配置 */
+  columns: Columns;
+  /** 表格的列配置(含未勾选的列) */
+  tableColumns?: Columns;
 }
 
 /**
@@ -263,8 +267,17 @@ export interface ResponseResult {
   data?: DataItem[];
   /** 总数量 */
   total?: number;
+  /** 原始请求结果 */
+  result: DatasourceResult;
 }
 
+/**
+ * 获取数据源返回结果方法
+ */
+export type GetDatasourceResultFunction = (
+  response: DatasourceResult
+) => ResponseResult;
+
 /**
  * 复合属性类型
  */
@@ -280,6 +293,8 @@ export interface TableState {
   filter: Filter;
   /** 当前搜索参数 */
   where: Where;
+  /** 当前查询任务标识 */
+  reloadId: string | null;
 }
 
 /**
@@ -366,7 +381,7 @@ export interface BeforeExportParams {
   /** 导出的数据来源类型 */
   dataType: ExportDataType;
   /** 导出的列配置 */
-  columns?: Columns;
+  columns: Columns;
   /** 导出的表头数据封装 */
   headerData: ExportDataItem[][];
   /** 导出的主体数据封装 */
@@ -382,7 +397,7 @@ export interface BeforeExportParams {
   /** 关闭弹窗 */
   closeModal: () => void;
   /** 导出的列配置(含未勾选的列) */
-  tableColumns?: Columns;
+  tableColumns: Columns;
   /** 是否导出表头 */
   showHeader?: boolean;
   /** 是否导出表尾 */
@@ -396,6 +411,11 @@ export interface BeforeExportParams {
  */
 export type BeforeExport = (params: BeforeExportParams) => boolean | void;
 
+/**
+ * 导出插件
+ */
+export type ExportPlugin = (params: BeforeExportParams) => Promise<void>;
+
 /**
  * 导出配置
  */
@@ -418,6 +438,8 @@ export interface ExportConfig {
   showFooter?: boolean;
   /** 默认是否展示层级序号 */
   showTreeIndex?: boolean;
+  /** 导出插件 */
+  exportPlugin?: ExportPlugin;
 }
 
 /**
@@ -444,6 +466,8 @@ export interface PrintConfig {
   showFooter?: boolean;
   /** 默认是否展示层级序号 */
   showTreeIndex?: boolean;
+  /** 打印插件 */
+  printPlugin?: ExportPlugin;
 }
 
 /**
@@ -468,6 +492,8 @@ export interface TableExportParams {
   data?: DataItem[];
   /** 打印的列 */
   columns?: Columns;
+  /** 打印的列配置(含未勾选的列) */
+  tableColumns?: Columns;
   /** 是否打印表头 */
   showHeader?: boolean;
   /** 是否打印表尾 */

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

@@ -85,13 +85,13 @@ export declare function getRequestFilters(filter?: Filter): Filters;
 export declare function getRequestPages(page: number, limit: number, request?: RequestOption, globalRequest?: RequestOption): Pages;
 /**
  * 获取数据源请求结果
- * @param data 数据源请求的原始数据
+ * @param result 数据源请求的原始数据
  * @param response 响应参数配置
  * @param globalResponse 全局响应参数配置
  * @param lazy 表格是否开启懒加载
  * @param treeOpt 树形表格字段名配置
  */
-export declare function getResponseResult(data: DatasourceResult, response?: ResponseOption, globalResponse?: ResponseOption, lazy?: boolean, treeOpt?: TreeProps): ResponseResult;
+export declare function getResponseResult(result: DatasourceResult, response?: ResponseOption, globalResponse?: ResponseOption, lazy?: boolean, treeOpt?: TreeProps): ResponseResult;
 /**
  * 树形懒加载时数据增加可展开的字段标识
  * @param data 请求数据

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

@@ -35,11 +35,11 @@ function getPaginationProps(size, pagination, globalPagination, pageProps) {
 }
 function getTablePage(pagination, globalPagination) {
   const props = getPaginationProps(void 0, pagination, globalPagination);
-  return (props == null ? void 0 : props.currentPage) ?? 1;
+  return props?.currentPage ?? 1;
 }
 function getTableLimit(pagination, globalPagination) {
   const props = getPaginationProps(void 0, pagination, globalPagination);
-  return (props == null ? void 0 : props.pageSize) ?? 10;
+  return props?.pageSize ?? 10;
 }
 function isAutoAmend(pagination, globalPagination) {
   const props = mergeProps(pagination, globalPagination);
@@ -83,14 +83,13 @@ function getResponseName(globalResponse, response) {
   return Object.assign(defaultResponse, globalResponse, response);
 }
 function getOrderItems(sorter) {
-  var _a, _b;
   const orders = [];
   if (!sorter || !sorter.order) {
     return orders;
   }
   const descend = sorter.order === "descending";
-  const sortMethod = (_a = sorter.column) == null ? void 0 : _a.sortMethod;
-  const sortBy = (_b = sorter.column) == null ? void 0 : _b.sortBy;
+  const sortMethod = sorter.column?.sortMethod;
+  const sortBy = sorter.column?.sortBy;
   if (Array.isArray(sortBy) && sortBy.length) {
     sortBy.forEach((field) => {
       if (typeof field === "string" && field.length) {
@@ -156,24 +155,28 @@ function getRequestPages(page, limit, request, globalRequest) {
   pages[limitName] = limit;
   return pages;
 }
-function getResponseResult(data, response, globalResponse, lazy, treeOpt) {
-  if (!data || Array.isArray(data)) {
-    return { data: getResponseData(data, lazy, treeOpt) };
+function getResponseResult(result, response, globalResponse, lazy, treeOpt) {
+  if (!result || Array.isArray(result)) {
+    return {
+      data: getResponseData(result, lazy, treeOpt),
+      result
+    };
   }
   const { dataName, countName } = getResponseName(globalResponse, response);
   if (!dataName) {
-    return {};
+    return { result };
   }
   return {
-    data: getResponseData(getValue(data, dataName), lazy, treeOpt),
-    total: (countName ? getValue(data, countName) : void 0) ?? 0
+    data: getResponseData(getValue(result, dataName), lazy, treeOpt),
+    total: (countName ? getValue(result, countName) : void 0) ?? 0,
+    result
   };
 }
 function getResponseData(data, lazy, treeProps) {
   if (!data || !lazy) {
     return data || [];
   }
-  const name = (treeProps == null ? void 0 : treeProps.hasChildren) ?? "hasChildren";
+  const name = treeProps?.hasChildren ?? "hasChildren";
   return data.map((d) => {
     const temp = { ...d };
     temp[name] = temp[name] ?? true;
@@ -191,12 +194,9 @@ function sortData(datasource, sorter) {
         const r2 = item.sortMethod(a, b);
         return item.descend ? -r2 : r2;
       }
-      const aValue = a[item.field];
-      const bValue = b[item.field];
-      if (aValue == bValue) {
-        return 0;
-      }
-      const r = aValue < bValue ? -1 : 1;
+      const aValue = getValue(a, item.field);
+      const bValue = getValue(b, item.field);
+      const r = aValue < bValue ? -1 : aValue > bValue ? 1 : 0;
       return item.descend ? -r : r;
     });
   });
@@ -226,10 +226,9 @@ function getColId(column) {
 function getInitColumns(columns, cacheColsWidth) {
   const data = [];
   columns.forEach((d) => {
-    var _a;
     if (!d.hideInTable) {
       const width = getCacheColWidth(cacheColsWidth, d) ?? d.width;
-      if ((_a = d.children) == null ? void 0 : _a.length) {
+      if (d.children?.length) {
         const children = getInitColumns(d.children);
         if (children.length) {
           data.push({ ...d, width, children });
@@ -272,7 +271,7 @@ function getCheckedColumns(columns, cols, sortable, isHideInCol, filter, reserve
       return;
     }
     const width = getCacheColWidth(cacheColsWidth, d) ?? d.width;
-    const fixed = (temp == null ? void 0 : temp.fixed) ?? d.fixed;
+    const fixed = temp?.fixed ?? d.fixed;
     const uid = uuid(8);
     if (d.children && d.children.length) {
       const children = getCheckedColumns(
@@ -309,7 +308,7 @@ function getCheckedColumns(columns, cols, sortable, isHideInCol, filter, reserve
       }
       i++;
     });
-    if (ai == null && (isHideInCol == null ? void 0 : isHideInCol(a)) && a.fixed === "right") {
+    if (ai == null && isHideInCol?.(a) && a.fixed === "right") {
       ai = i;
     }
     if (ai == null) {
@@ -317,10 +316,10 @@ function getCheckedColumns(columns, cols, sortable, isHideInCol, filter, reserve
     }
     if (a.fixed === true || a.fixed === "left") {
       ai -= i;
-    } else if (a.fixed === "right" || (isHideInCol == null ? void 0 : isHideInCol(a)) && !a.fixed) {
+    } else if (a.fixed === "right" || isHideInCol?.(a) && !a.fixed) {
       ai += i;
     }
-    if (bi == null && (isHideInCol == null ? void 0 : isHideInCol(b)) && b.fixed === "right") {
+    if (bi == null && isHideInCol?.(b) && b.fixed === "right") {
       bi = i;
     }
     if (bi == null) {
@@ -328,7 +327,7 @@ function getCheckedColumns(columns, cols, sortable, isHideInCol, filter, reserve
     }
     if (b.fixed === true || b.fixed === "left") {
       bi -= i;
-    } else if (b.fixed === "right" || (isHideInCol == null ? void 0 : isHideInCol(b)) && !b.fixed) {
+    } else if (b.fixed === "right" || isHideInCol?.(b) && !b.fixed) {
       bi += i;
     }
     return ai - bi;
@@ -352,8 +351,8 @@ function getColItems(columns, locale, filter, cacheCols, sortFixed, cancelFixed,
       uid: colId,
       type: d.type,
       label: d.label || (d.type === "index" ? locale.columnIndex : d.type === "selection" ? locale.columnSelection : d.type === "expand" ? locale.columnExpand : locale.columnUntitled),
-      checked: (old == null ? void 0 : old.checked) ?? !d.hideInTable,
-      fixed: cancelFixed || parent != null ? false : (old == null ? void 0 : old.fixed) ?? d.fixed,
+      checked: old?.checked ?? !d.hideInTable,
+      fixed: cancelFixed || parent != null ? false : old?.fixed ?? d.fixed,
       width: getCacheColWidth(cacheColsWidth, d) ?? d.width
     };
     return item;
@@ -367,9 +366,8 @@ function getColItems(columns, locale, filter, cacheCols, sortFixed, cancelFixed,
       return ai - bi;
     });
     eachTree(cols, (item) => {
-      var _a;
       if (item.children && item.children.length) {
-        const oldC = (_a = findTree(cacheCols, (t) => t.uid === item.uid)) == null ? void 0 : _a.children;
+        const oldC = findTree(cacheCols, (t) => t.uid === item.uid)?.children;
         if (oldC && oldC.length) {
           item.children.sort((a, b) => {
             const oldAI = oldC.findIndex((t) => t.uid === a.uid);
@@ -535,18 +533,12 @@ function getExportBodyNode(data, childrenField = "children", level = 0, parents
 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;
+  const showExpandIndex = bodyCols.some((c) => c.originalCol?.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);
-    }
+    (c) => !c.originalCol?.type || !["index", "expand", "selection"].includes(c.originalCol.type)
   );
   const bodyData = [];
   nodes.forEach((node, index) => {
@@ -580,7 +572,7 @@ function getExportData(data, columns, spanMethod, pageIndex, showSummary, sumTex
           dataItem.rowspan = 2;
         }
         const expandDataItem = {
-          key: "_expand_" + key,
+          key: `_expand_${key}`,
           row,
           index,
           column,
@@ -590,7 +582,7 @@ function getExportData(data, columns, spanMethod, pageIndex, showSummary, sumTex
         };
         if (showExpandIndex) {
           expandRowData[0] = {
-            key: "_expand_0-" + key,
+            key: `_expand_0-${key}`,
             row,
             index,
             rowspan: 0,
@@ -693,7 +685,7 @@ function exportCSV(fileName, headerData, bodyData, footerData) {
   });
   const content = encodeURIComponent(csvRows.join("\n"));
   const a = document.createElement("a");
-  a.href = "data:text/csv;charset=utf-8," + content;
+  a.href = `data:text/csv;charset=utf-8,${content}`;
   a.download = fileName + ".csv";
   a.style.display = "none";
   document.body.appendChild(a);