zmdms-webui 1.8.4 → 1.8.6

package/dist/es/dynamicsetting/dynamicDrawer.js

@@ -61,6 +61,12 @@ var DynamicDrawer = function (props, ref) {
         var endIndex = isUp ? hoverIndex : dragIndex;
         var oldItem = tempDynamicList[startIndex];
         var dragItem = tempDynamicList[endIndex];
+        // 仅当同组且存在优先级时校验；不同组直接通过
+        var oldGroup = oldItem === null || oldItem === void 0 ? void 0 : oldItem.dimensionGroup;
+        var dragGroup = dragItem === null || dragItem === void 0 ? void 0 : dragItem.dimensionGroup;
+        if (oldGroup !== dragGroup) {
+            return true;
+        }
         if ((oldItem === null || oldItem === void 0 ? void 0 : oldItem.dimensionPriority) !== undefined) {
             if ((dragItem === null || dragItem === void 0 ? void 0 : dragItem.dimensionPriority) === undefined ||
                 (oldItem === null || oldItem === void 0 ? void 0 : oldItem.dimensionPriority) < (dragItem === null || dragItem === void 0 ? void 0 : dragItem.dimensionPriority)) {

package/dist/es/dynamicsetting/interface.d.ts

@@ -10,6 +10,8 @@ interface IDynamicItem {
     filter?: IFilter;
     isDimension?: boolean;
     dimensionPriority?: number;
+    /** 维度优先级分组，同组内遵循 dimensionPriority，跨组不比较 */
+    dimensionGroup?: string;
     dimensionExclusive?: string;
     isDimensionSum?: boolean;
     [props: string]: any;

package/dist/es/dynamicsetting/useDynamic.js

@@ -17,6 +17,7 @@ function recursionDynamicItems(list, currentDynamicList) {
             currentData.disabled = result.disabled;
             currentData.isDimension = result.isDimension;
             currentData.dimensionPriority = result.dimensionPriority;
+            currentData.dimensionGroup = result.dimensionGroup;
             currentData.dimensionExclusive = result.dimensionExclusive;
             // 判断是否是多级表头，这里的逻辑处理是为了兼容
             // 后面改造成多级表头的情况

package/dist/es/table/constant.d.ts

@@ -0,0 +1,3 @@
+declare const IS_SUMMARY = "__is_summary__";
+
+export { IS_SUMMARY };

package/dist/es/table/constant.js

@@ -8,6 +8,8 @@ var DESCEND = "descend"; // 降序
 // 合并后数据标识
 var MERGE_KEY = "__row_id";
 var MERGE_ROW_SPANS = "__row_spans";
-var MERGE_INDEX = "__row_index";
+var MERGE_INDEX = "__row_index";
+// 合计行标识
+var IS_SUMMARY = "__is_summary__";
 
-export { ASCEND, DESCEND, ERROR_TD_CLASSNAME, INNER_TABLE_PAGINATION_PAGESIZEOPTIONS, INNER_TABLE_PAGINATION_POSITION, MERGE_INDEX, MERGE_KEY, MERGE_ROW_SPANS, TABLE_DRAG_ROW_TYPE, TABLE_DYNAMIC_KEY };
+export { ASCEND, DESCEND, ERROR_TD_CLASSNAME, INNER_TABLE_PAGINATION_PAGESIZEOPTIONS, INNER_TABLE_PAGINATION_POSITION, IS_SUMMARY, MERGE_INDEX, MERGE_KEY, MERGE_ROW_SPANS, TABLE_DRAG_ROW_TYPE, TABLE_DYNAMIC_KEY };

package/dist/es/table/excel.js

@@ -8,24 +8,59 @@ import { MERGE_ROW_SPANS } from './constant.js';
 /**
  * 导出Excel，支持维度合并和小计
  */
-function exportToExcelWithMerge(records, columns, mergeKeys, summaryKeys, fileName, sheetName, columnHeaders) {
+function exportToExcelWithMerge(records, columns, mergeKeys, summaryKeys, fileName, sheetName, columnHeaders, summaryConfig) {
     if (fileName === void 0) { fileName = "export.xlsx"; }
     if (sheetName === void 0) { sheetName = "Sheet1"; }
     if (!records || records.length === 0) {
         throw new Error("没有数据可导出");
     }
     var processedData = records;
-    // 2. 准备Excel数据
+    // 2. 准备Excel数据（支持分组表头与合并）
     var excelData = prepareExcelData(processedData, columns, columnHeaders);
     // 3. 创建工作簿
     var workbook = xlsx_minExports.utils.book_new();
-    // 4. 创建工作表
-    var worksheet = createWorksheetWithMerge(excelData, mergeKeys);
-    // 5. 添加样式（合计行高亮）
-    applyExcelStyles(worksheet, excelData.data, mergeKeys, summaryKeys, excelData.columns);
-    // 6. 添加工作表到工作簿
+    // 4. 计算末尾合计行（当提供了 summaryConfig 时）
+    var summaryRow;
+    var dataForStyles = processedData;
+    if (summaryConfig !== undefined) {
+        var sumsByKey_1 = {};
+        excelData.leafColumns.forEach(function (col, colIndex) {
+            var key = col.dataIndex;
+            if (col.isSummary) {
+                var total = 0;
+                for (var i = 0; i < processedData.length; i++) {
+                    var v = processedData[i][key];
+                    var n = typeof v === "number" ? v : Number(v);
+                    if (!isNaN(n))
+                        total += n;
+                }
+                sumsByKey_1[key] = total;
+            }
+        });
+        // 生成用于写入Excel的末尾合计行
+        summaryRow = excelData.leafColumns.map(function (col, index) {
+            if (index === 0)
+                return "合计";
+            var key = col.dataIndex;
+            if (col.isSummary && sumsByKey_1[key] !== undefined) {
+                return sumsByKey_1[key];
+            }
+            return "";
+        });
+        // 生成用于样式应用的数据（追加一条 __is_summary__ 行）
+        var summaryDataObj_1 = { __is_summary__: true };
+        Object.keys(sumsByKey_1).forEach(function (k) {
+            summaryDataObj_1[k] = sumsByKey_1[k];
+        });
+        dataForStyles = __spreadArray(__spreadArray([], processedData, true), [summaryDataObj_1], false);
+    }
+    // 5. 创建工作表（带末尾合计行）
+    var worksheet = createWorksheetWithMerge(__assign(__assign({}, excelData), { summaryRow: summaryRow }), mergeKeys);
+    // 6. 添加样式（合计行高亮）
+    applyExcelStyles(worksheet, dataForStyles, mergeKeys, summaryKeys, excelData.leafColumns, excelData.headerRowCount);
+    // 7. 添加工作表到工作簿
     xlsx_minExports.utils.book_append_sheet(workbook, worksheet, sheetName);
-    // 7. 导出文件
+    // 8. 导出文件
     xlsx_minExports.writeFile(workbook, fileName, { bookType: "xlsx" });
     return {
         totalRows: excelData.data.length,
@@ -34,27 +69,94 @@ function exportToExcelWithMerge(records, columns, mergeKeys, summaryKeys, fileNa
     };
 }
 /**
- * 准备Excel数据
+ * 准备Excel数据（支持分组表头，构建多行表头与合并范围）
  */
 function prepareExcelData(processedData, columns, columnHeaders) {
-    // 过滤有效的列配置
-    var validColumns = columns.filter(function (item) {
-        return typeof item.dataIndex === "string" &&
-            typeof (item.dynamicTitle || item.title) === "string";
-    });
-    // 准备表头
-    var headers = validColumns.map(function (item) {
-        if (typeof item.dataIndex === "string") {
-            if (columnHeaders === null || columnHeaders === void 0 ? void 0 : columnHeaders[item.dataIndex]) {
-                return columnHeaders[item.dataIndex];
-            }
+    // 计算最大深度
+    var getMaxDepth = function (cols) {
+        var max = 0;
+        var dfs = function (nodes, depth) {
+            nodes.forEach(function (n) {
+                var hasChildren = Array.isArray(n.children) && n.children.length > 0;
+                if (hasChildren) {
+                    dfs(n.children, depth + 1);
+                }
+                else {
+                    if (depth > max)
+                        max = depth;
+                }
+            });
+        };
+        dfs(cols, 1);
+        return max || 1;
+    };
+    // 计算每个节点的 colSpan
+    var computeColSpan = function (node) {
+        if (Array.isArray(node.children) && node.children.length > 0) {
+            return node.children.reduce(function (sum, c) { return sum + computeColSpan(c); }, 0);
         }
-        return (item.dynamicTitle || item.title);
-    });
+        return 1;
+    };
+    var maxDepth = getMaxDepth(columns);
+    // 生成表头矩阵与merge区域，同时收集叶子列
+    var headerRows = Array.from({ length: maxDepth }, function () { return []; });
+    var headerMerges = [];
+    var leafColumns = [];
+    var walkHeader = function (nodes, depth, startColIndexRef) {
+        nodes.forEach(function (node) {
+            var text = node.dynamicTitle || node.title;
+            if (typeof text === "string") {
+                var hasChildren = Array.isArray(node.children) && node.children.length > 0;
+                var colSpan = computeColSpan(node);
+                var rowSpan = hasChildren ? 1 : maxDepth - depth + 1;
+                // 确保本行已经有足够的列位（填充空字符串到当前列索引）
+                while (headerRows[depth - 1].length < startColIndexRef.value) {
+                    headerRows[depth - 1].push("");
+                }
+                // 放置当前单元格文本
+                headerRows[depth - 1].push(text);
+                // 合并头：行合并或列合并
+                var currentCol = startColIndexRef.value;
+                var start = { r: depth - 1, c: currentCol };
+                var end = {
+                    r: depth - 1 + (rowSpan - 1),
+                    c: currentCol + (colSpan - 1),
+                };
+                if (rowSpan > 1 || colSpan > 1) {
+                    headerMerges.push({ s: start, e: end });
+                }
+                // 占位填充剩余列（如果是列合并，需要占满 colSpan 列位；如果是行合并仅占1列）
+                var occupyCols = colSpan;
+                for (var i = 1; i < occupyCols; i++) {
+                    headerRows[depth - 1].push("");
+                }
+                // 递归子节点或记录叶子列
+                if (hasChildren) {
+                    var childStartRef = { value: currentCol };
+                    walkHeader(node.children, depth + 1, childStartRef);
+                    // 子节点会推进 childStartRef.value 到当前块的末尾
+                    startColIndexRef.value = currentCol + colSpan;
+                }
+                else {
+                    // 叶子列用于数据映射；允许 columnHeaders 覆盖标题（仅叶子层）
+                    if (typeof node.dataIndex === "string" &&
+                        (columnHeaders === null || columnHeaders === void 0 ? void 0 : columnHeaders[node.dataIndex])) {
+                        headerRows[depth - 1][headerRows[depth - 1].length - occupyCols] =
+                            columnHeaders[node.dataIndex];
+                    }
+                    leafColumns.push(node);
+                    startColIndexRef.value = currentCol + 1;
+                }
+            }
+        });
+    };
+    walkHeader(columns, 1, { value: 0 });
     return {
-        headers: headers,
+        headerRows: headerRows,
+        headerMerges: headerMerges,
+        headerRowCount: headerRows.length,
         data: processedData,
-        columns: validColumns,
+        leafColumns: leafColumns,
     };
 }
 /**
@@ -62,54 +164,49 @@ function prepareExcelData(processedData, columns, columnHeaders) {
  */
 function createWorksheetWithMerge(excelData, mergeKeys) {
     var _a;
-    var headers = excelData.headers, data = excelData.data, columns = excelData.columns;
-    // 创建工作表数据（包含表头）
-    var worksheetData = __spreadArray([
-        headers
-    ], data.map(function (row) {
-        return columns.map(function (item) {
+    var headerRows = excelData.headerRows, headerMerges = excelData.headerMerges, headerRowCount = excelData.headerRowCount, data = excelData.data, leafColumns = excelData.leafColumns, summaryRow = excelData.summaryRow;
+    // 创建工作表数据（包含多行表头）
+    var dataRows = data.map(function (row) {
+        return leafColumns.map(function (item) {
             var value = row[item.dataIndex];
-            // 处理数值类型
-            if (typeof value === "number") {
+            if (typeof value === "number")
                 return value;
-            }
-            // 处理字符串类型，避免空值
             return value != null ? String(value) : "";
         });
-    }), true);
+    });
+    var worksheetData = __spreadArray(__spreadArray(__spreadArray([], headerRows, true), dataRows, true), (summaryRow ? [summaryRow] : []), true);
     // 创建工作表
     var worksheet = xlsx_minExports.utils.aoa_to_sheet(worksheetData);
-    // 设置列宽
-    var columnWidths = columns.map(function (col) {
+    // 设置列宽（按叶子列）
+    var columnWidths = leafColumns.map(function (col) {
         var _a;
         return ({
             wch: Math.max(15, ((_a = ((col.dynamicTitle || col.title))) === null || _a === void 0 ? void 0 : _a.length) * 2),
         });
     });
     worksheet["!cols"] = columnWidths;
-    // 添加合并单元格
-    var merges = [];
+    // 添加合并单元格：表头合并 + 数据区合并（带偏移）
+    var merges = __spreadArray([], headerMerges, true);
     if (mergeKeys && mergeKeys.length > 0) {
         var _loop_1 = function (colIndex) {
             var mergeKey = mergeKeys[colIndex];
-            var excelColIndex = columns.findIndex(function (item) { return item.dataIndex === mergeKey; });
-            if (excelColIndex === -1) {
+            var excelColIndex = leafColumns.findIndex(function (item) { return item.dataIndex === mergeKey; });
+            if (excelColIndex === -1)
                 return "continue";
-            }
             for (var rowIndex = 0; rowIndex < data.length; rowIndex++) {
                 var rowData = data[rowIndex];
                 var spanCount = (_a = rowData[MERGE_ROW_SPANS]) === null || _a === void 0 ? void 0 : _a[mergeKey];
-                // 如果合并数量大于1，添加合并单元格
                 if (spanCount && spanCount > 1) {
-                    var mergeRange = {
-                        s: { r: rowIndex + 1, c: excelColIndex },
-                        e: { r: rowIndex + spanCount, c: excelColIndex }, // 修复合并范围
-                    };
-                    merges.push(mergeRange);
+                    merges.push({
+                        s: { r: headerRowCount + rowIndex, c: excelColIndex },
+                        e: {
+                            r: headerRowCount + rowIndex + spanCount - 1,
+                            c: excelColIndex,
+                        },
+                    });
                 }
             }
         };
-        // 处理每个合并字段
         for (var colIndex = 0; colIndex < mergeKeys.length; colIndex++) {
             _loop_1(colIndex);
         }
@@ -120,8 +217,9 @@ function createWorksheetWithMerge(excelData, mergeKeys) {
 /**
  * 应用Excel样式 - 修复版本
  */
-function applyExcelStyles(worksheet, data, mergeKeys, summaryKeys, columns) {
+function applyExcelStyles(worksheet, data, mergeKeys, summaryKeys, columns, headerRowCount) {
     var _a;
+    if (headerRowCount === void 0) { headerRowCount = 1; }
     // 修复1：定义样式对象，确保格式正确
     var headerStyle = {
         font: { bold: true, color: { rgb: "FFFFFF" } },
@@ -165,22 +263,25 @@ function applyExcelStyles(worksheet, data, mergeKeys, summaryKeys, columns) {
         var maxRow = data.length; // +1 for header, but 0-indexed
         range = { s: { r: 0, c: 0 }, e: { r: maxRow, c: maxCol } };
     }
-    // 修复3：应用表头样式，确保单元格存在
-    for (var col = range.s.c; col <= range.e.c; col++) {
-        var cellAddress = xlsx_minExports.utils.encode_cell({ r: 0, c: col });
-        // 确保单元格存在
-        if (!worksheet[cellAddress]) {
-            worksheet[cellAddress] = { v: "", t: "s" };
+    // 修复3：应用表头样式（支持多行表头），确保单元格存在
+    for (var row = 0; row < headerRowCount; row++) {
+        for (var col = range.s.c; col <= range.e.c; col++) {
+            var cellAddress = xlsx_minExports.utils.encode_cell({ r: row, c: col });
+            if (!worksheet[cellAddress]) {
+                worksheet[cellAddress] = { v: "", t: "s" };
+            }
+            worksheet[cellAddress].s = headerStyle;
         }
-        // 应用样式
-        worksheet[cellAddress].s = headerStyle;
     }
     // 修复4：应用数据行样式
     for (var rowIndex = 0; rowIndex < data.length; rowIndex++) {
         var rowData = data[rowIndex];
         var isSubtotal = rowData.__is_summary__;
         for (var col = range.s.c; col <= range.e.c; col++) {
-            var cellAddress = xlsx_minExports.utils.encode_cell({ r: rowIndex + 1, c: col });
+            var cellAddress = xlsx_minExports.utils.encode_cell({
+                r: headerRowCount + rowIndex,
+                c: col,
+            });
             // 确保单元格存在
             if (!worksheet[cellAddress]) {
                 worksheet[cellAddress] = { v: "", t: "s" };
@@ -209,7 +310,7 @@ function applyExcelStyles(worksheet, data, mergeKeys, summaryKeys, columns) {
                 if (colIndex === -1)
                     return "continue";
                 var cellAddress = xlsx_minExports.utils.encode_cell({
-                    r: rowIndex + 1,
+                    r: headerRowCount + rowIndex,
                     c: colIndex,
                 });
                 var cellValue = rowData[summaryKey];
@@ -232,7 +333,7 @@ function applyExcelStyles(worksheet, data, mergeKeys, summaryKeys, columns) {
     // 修复6：确保工作表引用正确
     if (!worksheet["!ref"]) {
         var lastCol = Math.max(0, ((columns === null || columns === void 0 ? void 0 : columns.length) || 1) - 1);
-        var lastRow = data.length; // header + data rows
+        var lastRow = headerRowCount + data.length - 1; // header + data rows (0-indexed end)
         worksheet["!ref"] = xlsx_minExports.utils.encode_range({
             s: { r: 0, c: 0 },
             e: { r: lastRow, c: lastCol },
@@ -243,13 +344,13 @@ function applyExcelStyles(worksheet, data, mergeKeys, summaryKeys, columns) {
  * 导出Excel的简化版本（只提供必要参数）
  */
 function exportToExcelSimple(records, config) {
-    return exportToExcelWithMerge(records, config.columns || [], config.mergeKeys, config.summaryKeys || [], config.fileName || "export.xlsx", config.sheetName || "Sheet1", config.columnHeaders);
+    return exportToExcelWithMerge(records, config.columns || [], config.mergeKeys, config.summaryKeys || [], config.fileName || "export.xlsx", config.sheetName || "Sheet1", config.columnHeaders, config.summaryConfig);
 }
 /**
  * excel导出
  */
 function useExcelExport(records, config) {
-    var columns = config.columns, fileName = config.fileName, isAutoMerge = config.isAutoMerge, columnHeaders = config.columnHeaders;
+    var columns = config.columns, isAutoMerge = config.isAutoMerge, columnHeaders = config.columnHeaders, summaryConfig = config.summaryConfig;
     // 计算需要合并的字段key集合
     var mergeKeys = useMergeKeys(columns, isAutoMerge);
     // 需要合计的字段
@@ -258,13 +359,14 @@ function useExcelExport(records, config) {
             .filter(function (item) { return item.isSummary; })
             .map(function (item) { return item.dataIndex; });
     }, [columns]);
-    var exportFunction = useMemoizedFn(function () {
+    var exportFunction = useMemoizedFn(function (fileName) {
         exportToExcelSimple(records, {
             columns: columns,
             mergeKeys: mergeKeys,
             summaryKeys: summaryKeys,
             fileName: fileName,
             columnHeaders: columnHeaders,
+            summaryConfig: summaryConfig,
         });
     });
     return exportFunction;

package/dist/es/table/hooks.js

@@ -3,7 +3,8 @@ import { useCallback, useRef, useState, useEffect, useMemo } from 'react';
 import update from '../node_modules/immutability-helper/index.js';
 import { getInnerIndex } from './useInnerPagination.js';
 import { flattenRecordsOptimized } from './utils.js';
-import { MERGE_INDEX, MERGE_ROW_SPANS } from './constant.js';
+import { IS_SUMMARY, MERGE_INDEX, MERGE_ROW_SPANS } from './constant.js';
+import { useMemoizedFn } from 'ahooks';
 
 /**
  * @param dataSourceRef 数据引用
@@ -57,7 +58,7 @@ function useMoveRowChange(dataSourceRef, onTableChange, options) {
                 hoverIndex: hoverIndex,
             });
     }, [dataSourceRef, onTableChange, refreshScuCell, currentPage]);
-    var onRow = useCallback(function (_, index) {
+    var onRow = useCallback(function (record, index) {
         var baseProps = {
             index: index,
             moveRow: moveRow,
@@ -80,8 +81,16 @@ function useMoveRowChange(dataSourceRef, onTableChange, options) {
         }
         return baseProps;
     }, [moveRow, fixedRowsCount, fixedRowsConfig]);
+    var defaultOnRow = useMemoizedFn(function (record) {
+        var extra = extraOnRow === null || extraOnRow === void 0 ? void 0 : extraOnRow(record);
+        var summaryStyle = __assign({ background: "#ebf3fe", fontWeight: "bold" }, extra === null || extra === void 0 ? void 0 : extra.style);
+        if (record[IS_SUMMARY]) {
+            return __assign(__assign({}, extra), { style: summaryStyle });
+        }
+        return {};
+    });
     return {
-        onRow: isMove || fixedRowsCount || fixedRowsConfig ? onRow : extraOnRow,
+        onRow: isMove || fixedRowsCount || fixedRowsConfig ? onRow : defaultOnRow,
     };
 }
 /**
@@ -347,7 +356,7 @@ var useMergeKeys = function (columns, isAutoMerge) {
  * 自动合并的一些处理
  */
 function useAutoMerge(dataSource, columns, _a) {
-    var mode = _a.mode, isAutoMerge = _a.isAutoMerge;
+    var isAutoMerge = _a.isAutoMerge, isDimensionDynamic = _a.isDimensionDynamic;
     // 计算需要合并的字段key集合
     var mergeKeys = useMergeKeys(columns, isAutoMerge);
     var firstMergeKey = mergeKeys === null || mergeKeys === void 0 ? void 0 : mergeKeys[0];
@@ -369,33 +378,20 @@ function useAutoMerge(dataSource, columns, _a) {
             if (!mergeKeys)
                 return dataSource;
             else {
-                var newDataSource_2 = flattenRecordsOptimized(__spreadArray([], (dataSource || []), true), mergeKeys, dimensionSummaryKeys, summaryKeys);
+                var newDataSource_2 = flattenRecordsOptimized(__spreadArray([], (dataSource || []), true), mergeKeys, dimensionSummaryKeys, summaryKeys, isDimensionDynamic);
                 return newDataSource_2;
             }
         }
-    }, [dataSource, isAutoMerge, mergeKeys, dimensionSummaryKeys, summaryKeys]);
+    }, [
+        dataSource,
+        isAutoMerge,
+        mergeKeys,
+        dimensionSummaryKeys,
+        summaryKeys,
+        isDimensionDynamic,
+    ]);
     var newColumns = useMemo(function () {
         var _columns = columns;
-        if (mode === "index") {
-            // 自动添加序号列，支持合并不参与自定义配置
-            _columns = __spreadArray([
-                {
-                    title: "序号",
-                    width: 60,
-                    key: "index",
-                    fixed: "left",
-                    align: "center",
-                    isMerge: isAutoMerge,
-                    isFilter: false,
-                    render: function (value, record, index) {
-                        if (isAutoMerge) {
-                            return record[MERGE_INDEX] + 1;
-                        }
-                        return "".concat(index + 1);
-                    },
-                }
-            ], _columns, true);
-        }
         // 递归处理多级表头，自动补充render/合并/编辑等逻辑
         var newColumns = _columns.map(function (item) {
             return getColumnItem(item);
@@ -429,7 +425,7 @@ function useAutoMerge(dataSource, columns, _a) {
                 return getItem(item);
             }
         }
-    }, [columns, mode, isAutoMerge, firstMergeKey]);
+    }, [columns, isAutoMerge, firstMergeKey]);
     return [newDataSource, newColumns];
 }
 /**

package/dist/es/table/interface.d.ts

@@ -5,6 +5,7 @@ import { IInputProps } from '../input/input.js';
 import { IInputNumberProps } from '../inputnumber/inputNumber.js';
 import { IDynamicItem } from '../dynamicsetting/interface.js';
 import _default from './components/TitleDirectionColumn.js';
+import { IS_SUMMARY } from './constant.js';
 
 type IEditableConfigOtherProps = IInputProps & IInputNumberProps & TextAreaProps;
 interface IEditableConfig extends Partial<IEditableConfigOtherProps> {
@@ -199,6 +200,10 @@ interface IColumnType<RecordType> extends Omit<ColumnType<RecordType>, "render">
      * 自定义排序的优先级，数字越小，优先级越高，比如2的不能排序到1的前面
      */
     dimensionPriority?: number;
+    /**
+     * 维度优先级分组，同组内遵循 dimensionPriority，跨组自由排序
+     */
+    dimensionGroup?: string;
     /**
      * 自定义维度互斥的字段，多个需要逗号分隔，比如：name,age
      */
@@ -277,7 +282,7 @@ interface ITableRefHandel {
     /**
      * 导出excel
      */
-    exportExcel?: () => void;
+    exportExcel?: (fileName: string) => void;
 }
 interface ITableProps<RecordType> extends Omit<TableProps<RecordType>, "columns"> {
     /**
@@ -536,6 +541,7 @@ interface TableComponent<T> extends React.FC<ITableProps<T>> {
     Summary: typeof Table.Summary;
     TitleDirectionColumn: typeof _default;
     DifferencesClassName: string;
+    IS_SUMMARY: typeof IS_SUMMARY;
 }
 /**
  * 排序相关类型

package/dist/es/table/table.js

@@ -9,7 +9,7 @@ import EnhanceHeaderCellMemo from './components/EnhanceHeaderCell.js';
 import './components/ColumnDynamic.js';
 import './components/ColumnAddDel.js';
 import './components/TitleOperation.js';
-import { TABLE_DYNAMIC_KEY, INNER_TABLE_PAGINATION_POSITION, INNER_TABLE_PAGINATION_PAGESIZEOPTIONS } from './constant.js';
+import { IS_SUMMARY, TABLE_DYNAMIC_KEY, INNER_TABLE_PAGINATION_POSITION, INNER_TABLE_PAGINATION_PAGESIZEOPTIONS } from './constant.js';
 import './components/PopoverIcon.js';
 import { useLatest } from 'ahooks';
 import { useParseColumns } from './useParseColumns.js';
@@ -161,6 +161,7 @@ var Table = function (props) {
     // 处理表格合并和维度
     var _v = useAutoMerge(currentTableDataSource, _newColumns, {
         isAutoMerge: isAutoMerge,
+        isDimensionDynamic: isDimensionDynamic,
     }), newDataSource = _v[0], newColumns = _v[1];
     // 内部表格总结栏
     var getSummaryHandle = useSummary(summaryConfig, newColumns, {
@@ -246,7 +247,7 @@ var Table = function (props) {
     var exportExcel = useExcelExport(newDataSource, {
         columns: newColumns,
         isAutoMerge: isAutoMerge,
-        fileName: "导出.xlsx",
+        summaryConfig: summaryConfig,
     });
     // 暴露给外部一些方法
     useImperativeHandle(tableRefHandle, function () {
@@ -337,6 +338,7 @@ MemoTable.Column = Table$1.Column;
 MemoTable.ColumnGroup = Table$1.ColumnGroup;
 MemoTable.Summary = Table$1.Summary;
 MemoTable.TitleDirectionColumn = TitleDirectionColumn;
-MemoTable.DifferencesClassName = "ztxk-table--differences";
+MemoTable.DifferencesClassName = "ztxk-table--differences";
+MemoTable.IS_SUMMARY = IS_SUMMARY;
 
 export { MemoTable as default };

package/dist/es/table/useColumns.js

@@ -40,11 +40,11 @@ function useColumns(columns, options) {
     var myNewColumns = [];
     var enhanceColumnHandle = function (_column, options) {
         var _a;
-        var _b, _c, _d, _e, _f;
+        var _b, _c, _d, _e, _f, _g;
         var isCopy = _column.isCopy, editable = _column.editable, editableConfig = _column.editableConfig, title = _column.title, key = _column.key, validate = _column.validate, isRequire = _column.isRequire, isFillDown = _column.isFillDown, isOrder = _column.isOrder, isStress = _column.isStress, popoverText = _column.popoverText, showType = _column.showType, isFilter = _column.isFilter, __dynamicItem__ = _column.__dynamicItem__;
         // 表格列，唯一key
         var _key = key ? key : _column === null || _column === void 0 ? void 0 : _column.dataIndex;
-        var _g = options || {}, _h = _g.keyIndex, keyIndex = _h === void 0 ? [] : _h, headerAlign = _g.headerAlign;
+        var _h = options || {}, _j = _h.keyIndex, keyIndex = _j === void 0 ? [] : _j, headerAlign = _h.headerAlign;
         var align = headerAlign || _column.align;
         var isRequireNode = isRequire ? (jsx("i", __assign({ className: "ztxk-column--required" }, { children: "*" }))) : null;
         if (showType) {
@@ -315,10 +315,8 @@ function useColumns(columns, options) {
         }
         // 如果配置了伸缩列
         if (isResizableColumn) {
-            _column.onHeaderCell = function (column) { return ({
-                width: column.width,
-                isResizableTitleEllipsis: isResizableTitleEllipsis,
-                onResize: (function (e, _a) {
+            var extraOnHeaderCell_1 = (_g = _column.onHeaderCell) === null || _g === void 0 ? void 0 : _g.call(_column, _column);
+            _column.onHeaderCell = function (column) { return (__assign({ width: column.width, isResizableTitleEllipsis: isResizableTitleEllipsis, onResize: (function (e, _a) {
                     var _b;
                     var size = _a.size;
                     // 获取当前列配置项
@@ -337,11 +335,9 @@ function useColumns(columns, options) {
                     else {
                         onCurrentListChange === null || onCurrentListChange === void 0 ? void 0 : onCurrentListChange(newList);
                     }
-                }),
-                style: {
+                }), style: {
                     textAlign: align,
-                },
-            }); };
+                } }, extraOnHeaderCell_1)); };
         }
         // 如果有子元素 递归执行逻辑
         // 支持多级表头控制

package/dist/es/table/useDynamicListByColumns.js

@@ -5,7 +5,7 @@ import isEqual from 'lodash/isEqual';
 
 // 处理列信息
 function parseColumn(column, index, indexs) {
-    var _a = column, key = _a.key, dataIndex = _a.dataIndex, title = _a.title, dynamicTitle = _a.dynamicTitle, dynamicDisabled = _a.dynamicDisabled, defaultUnChecked = _a.defaultUnChecked, width = _a.width, fixed = _a.fixed, isDimension = _a.isDimension, dimensionPriority = _a.dimensionPriority, dimensionExclusive = _a.dimensionExclusive, isDimensionSum = _a.isDimensionSum;
+    var _a = column, key = _a.key, dataIndex = _a.dataIndex, title = _a.title, dynamicTitle = _a.dynamicTitle, dynamicDisabled = _a.dynamicDisabled, defaultUnChecked = _a.defaultUnChecked, width = _a.width, fixed = _a.fixed, isDimension = _a.isDimension, dimensionPriority = _a.dimensionPriority, dimensionGroup = _a.dimensionGroup, dimensionExclusive = _a.dimensionExclusive, isDimensionSum = _a.isDimensionSum;
     // 动态列配置 title必须为一个字符串
     if (title && !dynamicTitle && typeof title !== "string") {
         console.error("\u4F60\u4F20\u5165\u7684title\u4E0D\u662F\u4E00\u4E2A\u5B57\u7B26\u4E32,\u5E76\u4E14\u4F60\u6CA1\u6709\u4F20\u5165dynamicTitle\u7684\u914D\u7F6E\u3002\n    \u95EE\u9898\u53EF\u80FD\u51FA\u73B0\u518D:".concat(key || dataIndex, " \u5217\u3002\u8BF7\u4F20\u5165\u4E00\u4E2AdynamicTitle \u4F5C\u4E3A\u52A8\u6001\u5217\u914D\u7F6E\u7684title\u503C"));
@@ -30,6 +30,7 @@ function parseColumn(column, index, indexs) {
         fixed: fixed,
         isDimension: isDimension,
         dimensionPriority: dimensionPriority,
+        dimensionGroup: dimensionGroup,
         dimensionExclusive: dimensionExclusive,
         isDimensionSum: isDimensionSum,
     };

package/dist/es/table/useSummary.js

@@ -3,6 +3,7 @@ import { jsx } from 'react/jsx-runtime';
 import { useCallback } from 'react';
 import { Table } from 'antd';
 import { plus } from 'zmdms-utils';
+import { IS_SUMMARY } from './constant.js';
 
 function useSummary(summaryConfig, columns, options) {
     var summaryFixed = options.summaryFixed, rowSelection = options.rowSelection, expandable = options.expandable, isAdd = options.isAdd, isDel = options.isDel;
@@ -131,7 +132,10 @@ function getSubtotalObj(fields, dataSource) {
     }
     var summaryTotalObj = {};
     var summaryTotalConfigObj = {};
-    dataSource.forEach(function (item, index) {
+    // 过滤掉按维度合计行
+    dataSource
+        .filter(function (item) { return !item[IS_SUMMARY]; })
+        .forEach(function (item, index) {
         fields.forEach(function (field) {
             if (typeof field === "string") {
                 var dataItem = Number(item === null || item === void 0 ? void 0 : item[field]);

package/dist/es/table/utils.js

@@ -1,6 +1,6 @@
 import { __spreadArray, __assign, __awaiter, __generator } from '../_virtual/_tslib.js';
 import { filterHandle } from './components/FilterDropdown.js';
-import { MERGE_ROW_SPANS, MERGE_KEY, MERGE_INDEX } from './constant.js';
+import { MERGE_ROW_SPANS, MERGE_KEY, MERGE_INDEX, IS_SUMMARY } from './constant.js';
 import { message } from 'antd';
 
 // 递归处理columns
@@ -447,7 +447,7 @@ function startColumnInsertTableData(options) {
  * @param dimensionSummaryKeys 维度合计字段
  * @param summaryKeys 合计字段
  */
-function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summaryKeys) {
+function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summaryKeys, isDimensionDynamic) {
     var _a;
     if (!records ||
         records.length === 0 ||
@@ -456,7 +456,7 @@ function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summa
         return records;
     }
     // 0. 首先根据维度字段对数据进行排序
-    var result = (dimensionSummaryKeys === null || dimensionSummaryKeys === void 0 ? void 0 : dimensionSummaryKeys.length) > 0
+    var result = isDimensionDynamic
         ? sortByDimensions(__spreadArray([], records, true), mergeKeys)
         : __spreadArray([], records, true);
     // 1. 首先插入维度合计行
@@ -677,14 +677,14 @@ summaryKeys, summaryLevelIndex // 在完整维度列表中的索引
         _loop_5(summaryKey);
     }
     // 标记为合计行
-    summaryRow.__is_summary__ = true;
+    summaryRow[IS_SUMMARY] = true;
     return summaryRow;
 }
 /**
  * 判断是否为合计行
  */
 function isSummaryRow(row) {
-    return row.__is_summary__ === true;
+    return row[IS_SUMMARY] === true;
 }
 /**
  * 检查父级分组是否发生变化

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-webui",
-  "version": "1.8.4",
+  "version": "1.8.6",
   "private": false,
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",