zmdms-webui 2.3.7 → 2.3.8

package/dist/es/canvastable/canvasTable.js

@@ -91,6 +91,7 @@ function CanvasTable(props) {
         columns: processedColumnsOld,
         rowSelection: rowSelection,
         onFilterChange: onFilterChange,
+        isAutoMerge: isAutoMerge,
     }), state = _y.state, setState = _y.setState, processedDataSource = _y.processedDataSource, handleFilterChange = _y.handleFilterChange, closeFilterPopover = _y.closeFilterPopover, autoGeneratedFilters = _y.autoGeneratedFilters;
     var order = useMemo(function () {
         return state.sortOrder && state.sortField
@@ -323,7 +324,7 @@ function CanvasTable(props) {
     // 渲染表格
     useTableRender(__assign(__assign({ canvasRef: canvasRef, processedDataSource: finalDataSource, columnRenderInfos: columnRenderInfos, columns: processedColumns, // 传递原始columns用于渲染多级表头
         state: state, scrollState: scrollState, rowSelection: rowSelection, containerWidth: containerWidth, containerHeight: containerHeight, headerHeight: calculatedHeaderHeight, baseHeaderHeight: headerHeight, // 传入原始基础高度用于计算每层高度
-        rowHeight: rowHeight, bordered: bordered, striped: striped }, scrollbarMetrics), { getRowKey: getRowKey, resizeState: resizeState, getColumnWidth: getColumnWidth, RESIZE_HANDLE_WIDTH: RESIZE_HANDLE_WIDTH, mergeCellMap: mergeCellMap, hasSummaryRow: hasSummaryRow, fixedRowsCount: fixedRowsCount, fixedRowsConfig: fixedRowsConfig, summaryFixed: summaryFixed }));
+        rowHeight: rowHeight, bordered: bordered, striped: striped, headerAlign: headerAlign }, scrollbarMetrics), { getRowKey: getRowKey, resizeState: resizeState, getColumnWidth: getColumnWidth, RESIZE_HANDLE_WIDTH: RESIZE_HANDLE_WIDTH, mergeCellMap: mergeCellMap, hasSummaryRow: hasSummaryRow, fixedRowsCount: fixedRowsCount, fixedRowsConfig: fixedRowsConfig, summaryFixed: summaryFixed }));
     // 单元格覆盖层
     var cellOverlays = useTableCellOverlay({
         canvasRef: canvasRef,
@@ -458,7 +459,7 @@ function CanvasTable(props) {
                         MozOsxFontSmoothing: "grayscale",
                         textRendering: "optimizeLegibility",
                     } }), dynamicKey ? (jsx(DynamicSetting, { parentDynamicKey: TABLE_DYNAMIC_KEY, dynamicKey: dynamicKey, defaultList: defaultDynamicList, onCurrentListChange: onCurrentListChange, ref: dynamicSettingRef, hiddenOperationIcon: true, isMore: true, isFixed: true, isDimensionDynamic: isDimensionDynamic })) : null, jsx(EmptyPlaceholder, { visible: finalDataSource.length === 0, text: emptyText, headerHeight: calculatedHeaderHeight }), jsx(HeaderOverlay, { overlays: headerOverlays }), jsx(CellOverlay, { overlays: cellOverlays }), filterPopoverElement, jsx(Tooltip, { visible: state.tooltip.visible, content: state.tooltip.content, position: state.tooltip.position }), jsx(BadgePopover, { visible: state.badgePopover.visible, content: state.badgePopover.content, position: state.badgePopover.position, popoverRef: badgePopoverRef }), menuId ? (jsx(CanvasTableMenu, { menuId: menuId, containerRef: containerRef, isFullscreenHandle: isFullscreenHandle, tableMenuRef: tableMenuRef, onCopy: handleCopy, onExport: function () {
-                        return exportExcel((exportExcelConfig === null || exportExcelConfig === void 0 ? void 0 : exportExcelConfig.fileName) || "表格数据.xlsx", __assign({}, exportExcelConfig));
+                        return exportExcel((exportExcelConfig === null || exportExcelConfig === void 0 ? void 0 : exportExcelConfig.fileName) || "表格数据.xlsx", exportExcelConfig);
                     } })) : null] })) })));
 }
 

package/dist/es/canvastable/components/CellOverlay.js

@@ -1,5 +1,6 @@
 import { __assign } from '../../_virtual/_tslib.js';
 import { jsx, Fragment } from 'react/jsx-runtime';
+import { TEXT_PADDING } from '../utils/constants.js';
 
 var CellOverlay = function (_a) {
     var overlays = _a.overlays;
@@ -27,9 +28,9 @@ var CellOverlay = function (_a) {
                 })(), // 根据固定列和固定行设置 z-index
             } }, { children: jsx("div", __assign({ className: "canvas-table-cell-content", style: {
                     position: "absolute",
-                    left: -overlay.offsetLeft + 16,
+                    left: -overlay.offsetLeft + TEXT_PADDING,
                     top: -overlay.offsetTop,
-                    width: overlay.originalWidth - 32,
+                    width: overlay.originalWidth - TEXT_PADDING * 2,
                     height: overlay.originalHeight,
                     display: "flex",
                     alignItems: "center",

package/dist/es/canvastable/hooks/useTableRender.js

@@ -8,7 +8,7 @@ import 'react/jsx-runtime';
 import 'zmdms-utils';
 import '../../node_modules/exceljs/dist/exceljs.min.js';
 import 'dayjs';
-import { COLORS, FONT_WEIGHT, FONT_SIZE, FONT_FAMILY, SCROLLBAR_SIZE, SCROLLBAR_PADDING } from '../utils/constants.js';
+import { COLORS, FONT_WEIGHT, FONT_SIZE, FONT_FAMILY, TEXT_PADDING, SCROLLBAR_SIZE, SCROLLBAR_PADDING } from '../utils/constants.js';
 import { drawCheckbox, wrapText, truncateText, drawFilterIcon, drawSortIcon } from '../utils/canvasDrawHelpers.js';
 import { getMaxDepth, flattenHeaders, calculateLayerHeights, getLeafColumns } from '../utils/multiHeaderHelpers.js';
 import { extractCellText } from '../utils/cellHelpers.js';
@@ -19,7 +19,7 @@ import { calculateSelectionState, calculateIconArea } from '../utils/interaction
  * 表格渲染 Hook
  */
 var useTableRender = function (params) {
-    var canvasRef = params.canvasRef, processedDataSource = params.processedDataSource, columnRenderInfos = params.columnRenderInfos, columns = params.columns, state = params.state, scrollState = params.scrollState, rowSelection = params.rowSelection, containerWidth = params.containerWidth, containerHeight = params.containerHeight, headerHeight = params.headerHeight, baseHeaderHeight = params.baseHeaderHeight, rowHeight = params.rowHeight, bordered = params.bordered, striped = params.striped, needVerticalScrollbar = params.needVerticalScrollbar, needHorizontalScrollbar = params.needHorizontalScrollbar, verticalScrollbarTop = params.verticalScrollbarTop, verticalScrollbarHeight = params.verticalScrollbarHeight, horizontalScrollbarLeft = params.horizontalScrollbarLeft, horizontalScrollbarWidth = params.horizontalScrollbarWidth, getRowKey = params.getRowKey, resizeState = params.resizeState, getColumnWidth = params.getColumnWidth, _a = params.RESIZE_HANDLE_WIDTH, RESIZE_HANDLE_WIDTH = _a === void 0 ? 8 : _a, mergeCellMap = params.mergeCellMap, _b = params.hasSummaryRow, hasSummaryRow = _b === void 0 ? false : _b, fixedRowsCount = params.fixedRowsCount, fixedRowsConfig = params.fixedRowsConfig, _c = params.summaryFixed, summaryFixed = _c === void 0 ? false : _c;
+    var canvasRef = params.canvasRef, processedDataSource = params.processedDataSource, columnRenderInfos = params.columnRenderInfos, columns = params.columns, state = params.state, scrollState = params.scrollState, rowSelection = params.rowSelection, containerWidth = params.containerWidth, containerHeight = params.containerHeight, headerHeight = params.headerHeight, baseHeaderHeight = params.baseHeaderHeight, rowHeight = params.rowHeight, bordered = params.bordered, striped = params.striped, _a = params.headerAlign, headerAlign = _a === void 0 ? "center" : _a, needVerticalScrollbar = params.needVerticalScrollbar, needHorizontalScrollbar = params.needHorizontalScrollbar, verticalScrollbarTop = params.verticalScrollbarTop, verticalScrollbarHeight = params.verticalScrollbarHeight, horizontalScrollbarLeft = params.horizontalScrollbarLeft, horizontalScrollbarWidth = params.horizontalScrollbarWidth, getRowKey = params.getRowKey, resizeState = params.resizeState, getColumnWidth = params.getColumnWidth, _b = params.RESIZE_HANDLE_WIDTH, RESIZE_HANDLE_WIDTH = _b === void 0 ? 8 : _b, mergeCellMap = params.mergeCellMap, _c = params.hasSummaryRow, hasSummaryRow = _c === void 0 ? false : _c, fixedRowsCount = params.fixedRowsCount, fixedRowsConfig = params.fixedRowsConfig, _d = params.summaryFixed, summaryFixed = _d === void 0 ? false : _d;
     // 判断是否是多级表头
     var maxDepth = useMemo(function () { return getMaxDepth(columns); }, [columns]);
     var isMultiHeader = maxDepth > 1;
@@ -27,13 +27,13 @@ var useTableRender = function (params) {
     var flattenedHeaderRows = useMemo(function () { return (isMultiHeader ? flattenHeaders(columns) : []); }, [columns, isMultiHeader]);
     // 计算多级表头每一层的高度（考虑换行）
     // 使用 baseHeaderHeight 或默认计算出的基础高度
-    var _d = useMemo(function () {
+    var _e = useMemo(function () {
         var maxDepth = getMaxDepth(columns);
         // 如果提供了 baseHeaderHeight，使用它；否则根据 headerHeight 和深度计算
         var baseHeight = baseHeaderHeight ||
             (maxDepth > 1 ? Math.floor(headerHeight / maxDepth) : headerHeight);
         return calculateLayerHeights(columns, baseHeight, columnRenderInfos);
-    }, [columns, headerHeight, baseHeaderHeight, columnRenderInfos]), layerHeights = _d.layerHeights, layerStartY = _d.layerStartY;
+    }, [columns, headerHeight, baseHeaderHeight, columnRenderInfos]), layerHeights = _e.layerHeights, layerStartY = _e.layerStartY;
     var dpr = window.devicePixelRatio || 1;
     // ==================== 通用辅助函数 ====================
     /**
@@ -141,8 +141,8 @@ var useTableRender = function (params) {
         else {
             // 计算图标占用的宽度
             var iconArea = calculateIconArea(column, width);
-            // 确定表头对齐方式，优先使用列的 headerAlign，其次是 align，最后是默认值
-            var headerAlign = column.headerAlign || column.align || "center";
+            // 确定表头对齐方式，优先使用列的 headerAlign，其次是全局 headerAlign
+            var columnHeaderAlign = column.headerAlign || headerAlign;
             // 绘制文本（如果 title 是 React 元素，跳过Canvas渲染，在覆盖层中渲染）
             if (!isValidElement(column.title)) {
                 var titleText = String(column.title || "");
@@ -150,39 +150,39 @@ var useTableRender = function (params) {
                 var textX_1;
                 var textMaxWidth = void 0;
                 if (iconArea.iconsWidth > 0) {
-                    // 有图标时，根据headerAlign调整文本位置和最大宽度
-                    if (headerAlign === "right") {
+                    // 有图标时，根据columnHeaderAlign调整文本位置和最大宽度
+                    if (columnHeaderAlign === "right") {
                         ctx.textAlign = "right";
-                        textX_1 = drawX + width - 5 - iconArea.iconsWidth;
-                        textMaxWidth = width - 10 - iconArea.iconsWidth;
+                        textX_1 = drawX + width - TEXT_PADDING - iconArea.iconsWidth;
+                        textMaxWidth = width - TEXT_PADDING * 2 - iconArea.iconsWidth;
                     }
-                    else if (headerAlign === "center") {
+                    else if (columnHeaderAlign === "center") {
                         ctx.textAlign = "center";
                         textX_1 = drawX + (width - iconArea.iconsWidth) / 2;
-                        textMaxWidth = width - 10 - iconArea.iconsWidth;
+                        textMaxWidth = width - TEXT_PADDING * 2 - iconArea.iconsWidth;
                     }
                     else {
                         ctx.textAlign = "left";
-                        textX_1 = drawX + 5;
-                        textMaxWidth = width - 5 - iconArea.iconsWidth;
+                        textX_1 = drawX + TEXT_PADDING;
+                        textMaxWidth = width - TEXT_PADDING - iconArea.iconsWidth;
                     }
                 }
                 else {
-                    // 没有图标时，根据headerAlign设置对齐方式
-                    if (headerAlign === "left") {
+                    // 没有图标时，根据columnHeaderAlign设置对齐方式
+                    if (columnHeaderAlign === "left") {
                         ctx.textAlign = "left";
-                        textX_1 = drawX + 5;
-                        textMaxWidth = width - 10;
+                        textX_1 = drawX + TEXT_PADDING;
+                        textMaxWidth = width - TEXT_PADDING * 2;
                     }
-                    else if (headerAlign === "right") {
+                    else if (columnHeaderAlign === "right") {
                         ctx.textAlign = "right";
-                        textX_1 = drawX + width - 5;
-                        textMaxWidth = width - 10;
+                        textX_1 = drawX + width - TEXT_PADDING;
+                        textMaxWidth = width - TEXT_PADDING * 2;
                     }
                     else {
                         ctx.textAlign = "center";
                         textX_1 = drawX + width / 2;
-                        textMaxWidth = width - 10;
+                        textMaxWidth = width - TEXT_PADDING * 2;
                     }
                 }
                 // 根据 ellipsis 和 wrap 属性处理文本
@@ -325,27 +325,27 @@ var useTableRender = function (params) {
                 var iconArea = shouldShowIcons
                     ? calculateIconArea(column, width)
                     : { hasOrder: false, hasFilter: false, iconsWidth: 0 };
-                // 确定表头对齐方式，优先使用列的 headerAlign，其次是 align，最后是默认值
-                var headerAlign = column.headerAlign || column.align || "center";
+                // 确定表头对齐方式，优先使用列的 headerAlign，其次是全局 headerAlign
+                var columnHeaderAlign = column.headerAlign || headerAlign;
                 // 如果是最末级且有图标，需要调整对齐方式
                 if (isLastLevel && iconArea.iconsWidth > 0) {
-                    // 有图标时，根据headerAlign调整文本位置和最大宽度
+                    // 有图标时，根据columnHeaderAlign调整文本位置和最大宽度
                     var textX_2;
                     var textMaxWidth = void 0;
-                    if (headerAlign === "right") {
+                    if (columnHeaderAlign === "right") {
                         ctx.textAlign = "right";
-                        textX_2 = drawX + width - 5 - iconArea.iconsWidth;
-                        textMaxWidth = width - 10 - iconArea.iconsWidth;
+                        textX_2 = drawX + width - TEXT_PADDING - iconArea.iconsWidth;
+                        textMaxWidth = width - TEXT_PADDING * 2 - iconArea.iconsWidth;
                     }
-                    else if (headerAlign === "center") {
+                    else if (columnHeaderAlign === "center") {
                         ctx.textAlign = "center";
                         textX_2 = drawX + (width - iconArea.iconsWidth) / 2;
-                        textMaxWidth = width - 10 - iconArea.iconsWidth;
+                        textMaxWidth = width - TEXT_PADDING * 2 - iconArea.iconsWidth;
                     }
                     else {
                         ctx.textAlign = "left";
-                        textX_2 = drawX + 5;
-                        textMaxWidth = width - 5 - iconArea.iconsWidth;
+                        textX_2 = drawX + TEXT_PADDING;
+                        textMaxWidth = width - TEXT_PADDING - iconArea.iconsWidth;
                     }
                     // 根据 wrap 属性处理文本
                     if (column.wrap) {
@@ -364,15 +364,15 @@ var useTableRender = function (params) {
                     }
                 }
                 else {
-                    // 没有图标时，根据headerAlign设置对齐方式
+                    // 没有图标时，根据columnHeaderAlign设置对齐方式
                     var textX_3;
-                    if (headerAlign === "left") {
+                    if (columnHeaderAlign === "left") {
                         ctx.textAlign = "left";
-                        textX_3 = drawX + 5;
+                        textX_3 = drawX + TEXT_PADDING;
                     }
-                    else if (headerAlign === "right") {
+                    else if (columnHeaderAlign === "right") {
                         ctx.textAlign = "right";
-                        textX_3 = drawX + width - 5;
+                        textX_3 = drawX + width - TEXT_PADDING;
                     }
                     else {
                         ctx.textAlign = "center";
@@ -381,7 +381,7 @@ var useTableRender = function (params) {
                     // 根据 wrap 属性处理文本
                     if (column.wrap) {
                         // 换行显示（支持\n和自动换行）
-                        var lines = wrapText(ctx, titleText, width - 10); // 左右各5px
+                        var lines = wrapText(ctx, titleText, width - TEXT_PADDING * 2); // 左右各TEXT_PADDING
                         var lineHeight_3 = FONT_SIZE + 5; // 字体大小 + 行间距5px
                         var startY_3 = textY - ((lines.length - 1) * lineHeight_3) / 2;
                         lines.forEach(function (line, index) {
@@ -390,7 +390,7 @@ var useTableRender = function (params) {
                         });
                     }
                     else {
-                        var truncated = truncateText(ctx, titleText, width - 10); // 左右各5px
+                        var truncated = truncateText(ctx, titleText, width - TEXT_PADDING * 2); // 左右各TEXT_PADDING
                         ctx.fillText(truncated, textX_3, textY);
                     }
                 }
@@ -672,20 +672,20 @@ var useTableRender = function (params) {
                         : "".concat(FONT_WEIGHT, " ").concat(FONT_SIZE, "px ").concat(FONT_FAMILY);
                     ctx.textBaseline = "middle";
                     var align = column.align || "left";
-                    var textX_4 = drawX + 5;
+                    var textX_4 = drawX + TEXT_PADDING;
                     if (align === "center") {
                         ctx.textAlign = "center";
                         textX_4 = drawX + width / 2;
                     }
                     else if (align === "right") {
                         ctx.textAlign = "right";
-                        textX_4 = drawX + width - 5;
+                        textX_4 = drawX + width - TEXT_PADDING;
                     }
                     else {
                         ctx.textAlign = "left";
                     }
                     // 处理文本显示（ellipsis 或 wrap）
-                    var maxWidth = width - 10; // 左右各5px
+                    var maxWidth = width - TEXT_PADDING * 2; // 左右各TEXT_PADDING
                     var ellipsis = column.ellipsis !== false; // 默认为true
                     var wrap = column.wrap === true; // 默认为false
                     if (wrap) {

package/dist/es/canvastable/hooks/useTableState.js

@@ -9,7 +9,7 @@ import { getAllLeafColumns, findColumnByKey } from '../utils/columnHelpers.js';
  * 表格状态管理 Hook
  */
 var useTableState = function (params) {
-    var dataSource = params.dataSource, columns = params.columns, rowSelection = params.rowSelection, onFilterChange = params.onFilterChange;
+    var dataSource = params.dataSource, columns = params.columns, rowSelection = params.rowSelection, onFilterChange = params.onFilterChange, isAutoMerge = params.isAutoMerge;
     // 表格状态
     var _a = useState({
         sortField: null,
@@ -157,7 +157,7 @@ var useTableState = function (params) {
             }
         });
         // 应用排序
-        if (state.sortField && state.sortOrder) {
+        if (state.sortField && state.sortOrder && !isAutoMerge) {
             var column_2 = findColumnByKey(columns, state.sortField);
             if (column_2 && column_2.isOrder !== false) {
                 var sortFn_1 = typeof column_2.sorter === "function"
@@ -187,7 +187,14 @@ var useTableState = function (params) {
             }
         }
         return data;
-    }, [dataSource, columns, state.filters, state.sortField, state.sortOrder]);
+    }, [
+        dataSource,
+        columns,
+        state.filters,
+        state.sortField,
+        state.sortOrder,
+        isAutoMerge,
+    ]);
     // 处理过滤变化
     var handleFilterChange = useMemoizedFn(function (columnKey, values) {
         var _a;

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

@@ -405,7 +405,7 @@ interface ICanvasTableProps<RecordType = any> {
     /**
      * 表格ref句柄，用于暴露表格的一些方法
      */
-    tableRefHandle?: React__default.Ref<ICanvasTableRefHandle>;
+    tableRefHandle?: React__default.Ref<ICanvasTableRefHandle | undefined>;
     /**
      * 导出excel的一些配置
      */

package/dist/es/canvastable/utils/interactionHelpers.js

@@ -104,26 +104,43 @@ var toggleSelectAll = function (dataSource, isAllSelected, getRowKey, getCheckbo
 };
 /**
  * 处理排序点击
+ * 优化后的逻辑：
+ * - 点击上箭头：升序 → 降序 → 取消排序 → 升序...（循环）
+ * - 点击下箭头：降序 → 升序 → 取消排序 → 降序...（循环）
  */
 var handleSortClick = function (clickedUpper, currentSortField, currentSortOrder, columnKey) {
     var newOrder = null;
+    // 判断当前列是否已经是排序列
+    var isCurrentColumn = currentSortField === columnKey;
     if (clickedUpper) {
-        // 点击上箭头：升序
-        if (currentSortField === columnKey && currentSortOrder === "ascend") {
-            newOrder = null; // 取消排序
-        }
-        else {
+        // 点击上箭头的循环逻辑：升序 → 降序 → 取消排序
+        if (!isCurrentColumn || currentSortOrder === null) {
+            // 没有排序或不是当前列，设置为升序
             newOrder = "ascend";
         }
+        else if (currentSortOrder === "ascend") {
+            // 已经是升序，切换到降序
+            newOrder = "descend";
+        }
+        else if (currentSortOrder === "descend") {
+            // 已经是降序，取消排序
+            newOrder = null;
+        }
     }
     else {
-        // 点击下箭头：降序
-        if (currentSortField === columnKey && currentSortOrder === "descend") {
-            newOrder = null; // 取消排序
-        }
-        else {
+        // 点击下箭头的循环逻辑：降序 → 升序 → 取消排序
+        if (!isCurrentColumn || currentSortOrder === null) {
+            // 没有排序或不是当前列，设置为降序
             newOrder = "descend";
         }
+        else if (currentSortOrder === "descend") {
+            // 已经是降序，切换到升序
+            newOrder = "ascend";
+        }
+        else if (currentSortOrder === "ascend") {
+            // 已经是升序，取消排序
+            newOrder = null;
+        }
     }
     return {
         sortField: newOrder ? columnKey : null,

package/dist/es/table/hooks.js

@@ -423,7 +423,8 @@ function useAutoMerge(dataSource, columns, _a) {
             if (!mergeKeys)
                 return dataSource;
             else {
-                var newDataSource_2 = flattenRecordsOptimized(__spreadArray([], (dataSource || []), true), mergeKeys, dimensionSummaryKeys, summaryKeys, isDimensionDynamic, order, dimensionCustomSumKeys);
+                var newDataSource_2 = flattenRecordsOptimized(__spreadArray([], (dataSource || []), true), mergeKeys, dimensionSummaryKeys, summaryKeys, isDimensionDynamic, order, dimensionCustomSumKeys, columns // 添加 columns 参数，支持自定义排序
+                );
                 return newDataSource_2;
             }
         }
@@ -436,6 +437,7 @@ function useAutoMerge(dataSource, columns, _a) {
         isDimensionDynamic,
         order,
         dimensionCustomSumKeys,
+        columns, // 添加 columns 依赖
     ]);
     var newColumns = useMemo(function () {
         var _columns = columns;

package/dist/es/table/utils.js

@@ -449,7 +449,7 @@ function startColumnInsertTableData(options) {
  * @param summaryKeys 合计字段
  * @param isDimensionDynamic 维度合并
  */
-function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summaryKeys, isDimensionDynamic, order, dimensionCustomSumKeys) {
+function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summaryKeys, isDimensionDynamic, order, dimensionCustomSumKeys, columns) {
     var _a;
     if (!records ||
         records.length === 0 ||
@@ -461,7 +461,7 @@ function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summa
     var result = [];
     // 如果order没有排序方向，但isDimensionDynamic为true，则按维度字段排序
     if (isDimensionDynamic) {
-        result = sortByDimensions(__spreadArray([], records, true), mergeKeys);
+        result = sortByDimensions(__spreadArray([], records, true), mergeKeys, undefined, columns);
     }
     // 否则保持原样
     else {
@@ -478,6 +478,7 @@ function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summa
         // 开启自定义维度后因为最后一个维度字段会合并为一行，所以可以不排序最后一个维度字段
         mergeKeys: isDimensionDynamic ? mergeKeys.slice(0, -1) : mergeKeys,
         order: order,
+        columns: columns,
     });
     // 2. 首先插入维度合计行
     if (dimensionSummaryKeys &&
@@ -579,10 +580,10 @@ function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summa
     return result;
 }
 function sortRecords(_a) {
-    var records = _a.records, mergeKeys = _a.mergeKeys, order = _a.order;
+    var records = _a.records, mergeKeys = _a.mergeKeys, order = _a.order, columns = _a.columns;
     var result = [];
     if (order && order.order) {
-        result = sortByDimensions(__spreadArray([], records, true), mergeKeys, order);
+        result = sortByDimensions(__spreadArray([], records, true), mergeKeys, order, columns);
     }
     // 否则保持原样
     else {
@@ -597,92 +598,145 @@ function sortRecords(_a) {
  * @param dimensionKeys 维度字段
  * @param order 排序配置
  */
-function sortByDimensions(records, dimensionKeys, order) {
-    return records.sort(function (a, b) {
-        // 如果有排序配置且有排序方向
-        if (order && order.order && order.field) {
-            var field = order.field, sortOrder = order.order;
-            // 找到排序字段在维度字段中的位置
-            var sortFieldIndex = dimensionKeys.indexOf(field);
-            if (sortFieldIndex !== -1) {
-                // 先按维度字段排序到排序字段之前的字段
-                for (var i = 0; i < sortFieldIndex; i++) {
-                    var key = dimensionKeys[i];
-                    var valueA_1 = a[key] || "";
-                    var valueB_1 = b[key] || "";
-                    // 字符串比较
-                    if (valueA_1 < valueB_1)
-                        return -1;
-                    if (valueA_1 > valueB_1)
-                        return 1;
-                    // 如果当前字段相等，继续比较下一个字段
-                }
-                // 按排序字段进行排序
-                var valueA = a[field] || "";
-                var valueB = b[field] || "";
-                var compareResult = 0;
-                if (valueA < valueB)
-                    compareResult = -1;
-                else if (valueA > valueB)
-                    compareResult = 1;
-                if (compareResult !== 0) {
-                    return sortOrder === "ascend" ? compareResult : -compareResult;
+function sortByDimensions(records, dimensionKeys, order, columns) {
+    // 根据字段名查找对应的列配置
+    var findColumnByKey = function (field) {
+        if (!columns)
+            return null;
+        var findInColumns = function (cols) {
+            for (var _i = 0, cols_1 = cols; _i < cols_1.length; _i++) {
+                var col = cols_1[_i];
+                if (col.key === field || col.dataIndex === field) {
+                    return col;
                 }
-                // 如果排序字段相等，继续按后面的维度字段排序
-                for (var i = sortFieldIndex + 1; i < dimensionKeys.length; i++) {
-                    var key = dimensionKeys[i];
-                    var valueA_2 = a[key] || "";
-                    var valueB_2 = b[key] || "";
-                    // 字符串比较
-                    if (valueA_2 < valueB_2)
-                        return -1;
-                    if (valueA_2 > valueB_2)
-                        return 1;
-                    // 如果当前字段相等，继续比较下一个字段
+                // 如果有子列，递归查找
+                if (col.children && Array.isArray(col.children)) {
+                    var found = findInColumns(col.children);
+                    if (found)
+                        return found;
                 }
             }
+            return null;
+        };
+        return findInColumns(columns);
+    };
+    // 通用排序比较函数
+    var compareValues = function (valueA, valueB, order, recordA, recordB, field) {
+        // 处理 null/undefined
+        if (valueA === valueB)
+            return 0;
+        if (valueA === null || valueA === undefined)
+            return 1;
+        if (valueB === null || valueB === undefined)
+            return -1;
+        var compareResult = 0;
+        // 如果提供了字段名，尝试获取自定义排序函数
+        if (field && recordA && recordB) {
+            var column = findColumnByKey(field);
+            if (column && typeof column.sorter === "function") {
+                // 使用列配置中的自定义排序函数
+                compareResult = column.sorter(recordA, recordB);
+            }
             else {
-                // 如果排序字段不在维度字段中，按原逻辑排序维度字段
-                for (var i = 0; i < dimensionKeys.length; i++) {
-                    var key = dimensionKeys[i];
-                    var valueA_3 = a[key] || "";
-                    var valueB_3 = b[key] || "";
-                    // 字符串比较
-                    if (valueA_3 < valueB_3)
-                        return -1;
-                    if (valueA_3 > valueB_3)
-                        return 1;
-                    // 如果当前字段相等，继续比较下一个字段
-                }
-                // 最后按排序字段排序
-                var valueA = a[field] || "";
-                var valueB = b[field] || "";
-                var compareResult = 0;
-                if (valueA < valueB)
-                    compareResult = -1;
-                else if (valueA > valueB)
-                    compareResult = 1;
-                if (compareResult !== 0) {
-                    return sortOrder === "ascend" ? compareResult : -compareResult;
-                }
+                // 使用默认排序逻辑
+                compareResult = getDefaultCompareResult(valueA, valueB);
             }
         }
         else {
-            // 没有排序配置，按原逻辑排序
-            for (var i = 0; i < dimensionKeys.length; i++) {
-                var key = dimensionKeys[i];
-                var valueA = a[key] || "";
-                var valueB = b[key] || "";
-                // 字符串比较
-                if (valueA < valueB)
-                    return -1;
-                if (valueA > valueB)
-                    return 1;
-                // 如果当前字段相等，继续比较下一个字段
+            // 使用默认排序逻辑
+            compareResult = getDefaultCompareResult(valueA, valueB);
+        }
+        return compareResult !== 0
+            ? order === "ascend"
+                ? compareResult
+                : -compareResult
+            : 0;
+    };
+    // 默认排序比较逻辑
+    var getDefaultCompareResult = function (valueA, valueB) {
+        // 数字比较
+        if (typeof valueA === "number" && typeof valueB === "number") {
+            return valueA - valueB;
+        }
+        // 字符串比较（使用 localeCompare 支持中文等）
+        else {
+            return String(valueA).localeCompare(String(valueB), "zh-CN", {
+                numeric: true,
+                sensitivity: "base", // 忽略大小写和重音符号
+            });
+        }
+    };
+    // 通用的分层分组函数
+    var groupByDimensionsHierarchical = function (data, dimensions, currentDimensionIndex, sortConfig) {
+        if (currentDimensionIndex === void 0) { currentDimensionIndex = 0; }
+        if (currentDimensionIndex >= dimensions.length) {
+            // 到达叶子节点，如果排序字段不是维度字段，在这里排序
+            if (sortConfig && !dimensions.includes(sortConfig.field)) {
+                return data.sort(function (a, b) {
+                    var valueA = a[sortConfig.field];
+                    var valueB = b[sortConfig.field];
+                    return compareValues(valueA, valueB, sortConfig.order, a, b, sortConfig.field);
+                });
+            }
+            else {
+                // 无排序配置或排序字段是维度字段，直接返回
+                return data;
             }
         }
-        return 0; // 所有字段都相等
-    });
+        var currentDimension = dimensions[currentDimensionIndex];
+        // 按当前维度分组，同时记录原始值用于排序
+        var groupData = new Map();
+        var groupOrder = []; // 记录分组出现的顺序
+        data.forEach(function (item) {
+            var value = item[currentDimension];
+            var key = String(value || "");
+            if (!groupData.has(key)) {
+                groupData.set(key, { items: [], originalValue: value });
+                groupOrder.push(key); // 记录第一次出现的顺序
+            }
+            groupData.get(key).items.push(item);
+        });
+        // 如果当前维度是排序字段，对分组的key进行排序
+        var finalGroupOrder = groupOrder;
+        if (sortConfig && sortConfig.field === currentDimension) {
+            finalGroupOrder = __spreadArray([], groupOrder, true).sort(function (keyA, keyB) {
+                // 使用保存的原始值进行比较
+                var valueA = groupData.get(keyA).originalValue;
+                var valueB = groupData.get(keyB).originalValue;
+                // 获取对应的记录用于自定义排序
+                var recordA = groupData.get(keyA).items[0];
+                var recordB = groupData.get(keyB).items[0];
+                return compareValues(valueA, valueB, sortConfig.order, recordA, recordB, sortConfig.field);
+            });
+        }
+        // 递归处理每个分组的子维度，并按排序后的顺序合并结果
+        var result = [];
+        for (var _i = 0, finalGroupOrder_1 = finalGroupOrder; _i < finalGroupOrder_1.length; _i++) {
+            var groupKey = finalGroupOrder_1[_i];
+            var group = groupData.get(groupKey);
+            var sortedGroupData = groupByDimensionsHierarchical(group.items, dimensions, currentDimensionIndex + 1, sortConfig);
+            result.push.apply(result, sortedGroupData);
+        }
+        return result;
+    };
+    // 根据是否有排序配置调用分组函数
+    var sortConfig;
+    if (order && order.order && order.field) {
+        // 如果有明确的排序配置，使用它
+        sortConfig = { field: order.field, order: order.order };
+    }
+    else {
+        // 如果没有明确排序，检查维度字段是否有自定义sorter，优先使用第一个有sorter的字段
+        for (var _i = 0, dimensionKeys_1 = dimensionKeys; _i < dimensionKeys_1.length; _i++) {
+            var dimensionKey = dimensionKeys_1[_i];
+            var column = findColumnByKey(dimensionKey);
+            if (column && typeof column.sorter === "function") {
+                sortConfig = { field: dimensionKey, order: "ascend" };
+                break; // 找到第一个有sorter的字段就使用，按维度顺序优先
+            }
+        }
+    }
+    return groupByDimensionsHierarchical(records, dimensionKeys, 0, sortConfig);
 }
 /**
  * 插入维度合计行

package/package.json

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