zmdms-webui 1.8.1 → 1.8.2

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

@@ -238,7 +238,7 @@ interface IFuncInsertTableFromClipboardReturn {
 interface IFuncInsertTableFromClipboard {
     (e: any, options: IInserTableFromClipboard): Promise<IFuncInsertTableFromClipboardReturn>;
 }
-interface IColumnGroupType<RecordType> extends Omit<IColumnType<RecordType>, "dataIndex"> {
+interface IColumnGroupType<RecordType> extends IColumnType<RecordType> {
     children?: IColumnsType<RecordType>;
 }
 type IColumnsTypeProp<RecordType> = IColumnGroupType<RecordType>;

package/dist/es/table/table.js

@@ -17,7 +17,7 @@ import { useColumns } from './useColumns.js';
 import { useDynamicListByColumns } from './useDynamicListByColumns.js';
 import useSummary from './useSummary.js';
 import useInnerPagination, { getInnerIndex } from './useInnerPagination.js';
-import { useScuRfresh, useCustomSort, useCalcScrollY, useEditChange, useMoveRowChange, useAddAndDelChange, useMergeAddAndDel, useAutoMerge } from './hooks.js';
+import { useScuRfresh, useCustomSort, useCalcScrollY, useEditChange, useMoveRowChange, useAddAndDelChange, useAutoMerge } from './hooks.js';
 import { HTML5Backend } from '../node_modules/react-dnd-html5-backend/dist/index.js';
 import { VList, scrollTo } from '../node_modules/virtuallist-antd/dist/index.es.js';
 import useTableValidate, { tableValidate } from './useTableValidate.js';
@@ -114,15 +114,8 @@ var Table = function (props) {
         currentPage: currentPage,
         filterConfigRef: filterConfigRef,
     });
-    // 处理自动合并的加减和选择框
-    var _u = useMergeAddAndDel({
-        rowSelection: rowSelection,
-        addAndDelProps: addAndDelProps,
-        columns: columns,
-        isAutoMerge: isAutoMerge,
-    }), newRowSelection = _u[0], newAddAndDelProps = _u[1];
     // 处理列配置信息 得到新的列配置信息
-    var _newColumns = useColumns(columns, {
+    var _u = useColumns(columns, {
         // 动态列配置相关信息
         dynamicKey: dynamicKey,
         isRemeberFilter: isRemeberFilter,
@@ -158,11 +151,12 @@ var Table = function (props) {
         hiddenAddBtnHandleRef: hiddenAddBtnHandleRef,
         rowKey: props.rowKey,
         filterConfigRef: filterConfigRef,
-        addAndDelProps: newAddAndDelProps,
+        rowSelection: rowSelection,
+        addAndDelProps: addAndDelProps,
         headerAlign: headerAlign,
         mode: mode,
         isAutoMerge: isAutoMerge,
-    }).newColumns;
+    }), _newColumns = _u.newColumns, newRowSelection = _u.rowSelection;
     // 处理表格合并和维度
     var _v = useAutoMerge(currentTableDataSource, _newColumns, {
         isAutoMerge: isAutoMerge,

package/dist/es/table/useColumns.js

@@ -13,6 +13,7 @@ import SortTitle from './components/SortTitle.js';
 import PopoverIcon from './components/PopoverIcon.js';
 import FilterDropdown, { createFilterValue, filterHandle } from './components/FilterDropdown.js';
 import { PLACEHOLDER_NULL } from '../config/constant.js';
+import { useMergeAddAndDel } from './hooks.js';
 import SearchOutlined from '../node_modules/@ant-design/icons/es/icons/SearchOutlined.js';
 import ModalComponent from '../modal/modal.js';
 
@@ -22,8 +23,15 @@ import ModalComponent from '../modal/modal.js';
 function useColumns(columns, options) {
     var _this = this;
     var _a, _b;
-    var dynamicKey = options.dynamicKey, isRemeberFilter = options.isRemeberFilter, hiddenDynamicIcon = options.hiddenDynamicIcon, currentDynamicList = options.currentDynamicList, dataSource = options.dataSource, dataSourceRef = options.dataSourceRef, onEditableSave = options.onEditableSave, isEdit = options.isEdit, isAdd = options.isAdd, isTheadTitleAdd = options.isTheadTitleAdd, isDel = options.isDel, delPopTitle = options.delPopTitle, dynamicSettingRef = options.dynamicSettingRef, onCurrentListChange = options.onCurrentListChange, onAddAndDel = options.onAddAndDel, getRefreshScuCell = options.getRefreshScuCell, isDelAll = options.isDelAll, currentPage = options.currentPage, onTableChange = options.onTableChange, order = options.order, setOrder = options.setOrder, customSortHandle = options.customSortHandle, isResizableColumn = options.isResizableColumn, isResizableTitleEllipsis = options.isResizableTitleEllipsis, isRealTimeValidate = options.isRealTimeValidate, hiddenDelBtnHandleRef = options.hiddenDelBtnHandleRef, hiddenAddBtnHandleRef = options.hiddenAddBtnHandleRef, rowKey = options.rowKey, filterConfigRef = options.filterConfigRef, addAndDelProps = options.addAndDelProps, headerAlign = options.headerAlign, mode = options.mode, isAutoMerge = options.isAutoMerge;
+    var dynamicKey = options.dynamicKey, isRemeberFilter = options.isRemeberFilter, hiddenDynamicIcon = options.hiddenDynamicIcon, currentDynamicList = options.currentDynamicList, dataSource = options.dataSource, dataSourceRef = options.dataSourceRef, onEditableSave = options.onEditableSave, isEdit = options.isEdit, isAdd = options.isAdd, isTheadTitleAdd = options.isTheadTitleAdd, isDel = options.isDel, delPopTitle = options.delPopTitle, dynamicSettingRef = options.dynamicSettingRef, onCurrentListChange = options.onCurrentListChange, onAddAndDel = options.onAddAndDel, getRefreshScuCell = options.getRefreshScuCell, isDelAll = options.isDelAll, currentPage = options.currentPage, onTableChange = options.onTableChange, order = options.order, setOrder = options.setOrder, customSortHandle = options.customSortHandle, isResizableColumn = options.isResizableColumn, isResizableTitleEllipsis = options.isResizableTitleEllipsis, isRealTimeValidate = options.isRealTimeValidate, hiddenDelBtnHandleRef = options.hiddenDelBtnHandleRef, hiddenAddBtnHandleRef = options.hiddenAddBtnHandleRef, rowKey = options.rowKey, filterConfigRef = options.filterConfigRef, rowSelection = options.rowSelection, addAndDelProps = options.addAndDelProps, headerAlign = options.headerAlign, mode = options.mode, isAutoMerge = options.isAutoMerge;
     var newColumns = getTableColumns(columns, currentDynamicList).columns;
+    // 处理自动合并的加减和选择框
+    var _c = useMergeAddAndDel({
+        rowSelection: rowSelection,
+        addAndDelProps: addAndDelProps,
+        columns: newColumns,
+        isAutoMerge: isAutoMerge,
+    }), newRowSelection = _c[0], newAddAndDelProps = _c[1];
     // 表头过滤的一些配置（获取表头过滤的input的输入框的引用）
     var searchValueInputRef = useRef(null);
     // 记录表头过滤的一些配置（通过ref记录，key => filter） 复制整列时，需要先走过滤
@@ -380,7 +388,7 @@ function useColumns(columns, options) {
                         ? !(hiddenAddBtnHandleRef === null || hiddenAddBtnHandleRef === void 0 ? void 0 : hiddenAddBtnHandleRef.current(record, index))
                         : isAdd;
                     return (jsx(ColumnAddDel, { isAdd: hiddenAdd, isDel: hiddenDel, index: index, delPopTitle: delPopTitle, onAddAndDel: onAddAndDel }));
-                } }, addAndDelProps);
+                } }, newAddAndDelProps);
             myNewColumns.unshift(newColumn);
         }
         if (mode === "index") {
@@ -408,6 +416,7 @@ function useColumns(columns, options) {
     }
     return {
         newColumns: myNewColumns,
+        rowSelection: newRowSelection,
     };
 }
 /**

package/dist/es/table/utils.js

@@ -455,13 +455,15 @@ function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summa
         mergeKeys.length === 0) {
         return records;
     }
-    var result = __spreadArray([], records, true);
+    // 0. 首先根据维度字段对数据进行排序
+    var result = sortByDimensions(__spreadArray([], records, true), mergeKeys);
     // 1. 首先插入维度合计行
     if (dimensionSummaryKeys &&
         dimensionSummaryKeys.length > 0 &&
         summaryKeys &&
         summaryKeys.length > 0) {
-        result = insertDimensionSummaryRows(result, dimensionSummaryKeys, summaryKeys);
+        result = insertDimensionSummaryRows(result, mergeKeys, // 传入完整的维度字段列表
+        dimensionSummaryKeys, summaryKeys);
     }
     // 2. 为每行初始化合并信息
     for (var i = 0; i < result.length; i++) {
@@ -554,26 +556,61 @@ function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summa
     }
     return result;
 }
+/**
+ * 根据维度字段对数据进行排序
+ * 确保相同维度值的记录连续排列，以便正确进行合并处理
+ */
+function sortByDimensions(records, dimensionKeys) {
+    return records.sort(function (a, b) {
+        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;
+            // 如果当前字段相等，继续比较下一个字段
+        }
+        return 0; // 所有字段都相等
+    });
+}
 /**
  * 插入维度合计行
+ * 优化版本：使用完整的维度字段列表
  */
-function insertDimensionSummaryRows(records, dimensionSummaryKeys, summaryKeys) {
+function insertDimensionSummaryRows(records, allDimensionKeys, // 完整的维度字段列表
+dimensionSummaryKeys, // 需要合计的维度字段
+summaryKeys) {
+    var result = __spreadArray([], records, true);
     // 按维度层级从深到浅处理
-    for (var level = dimensionSummaryKeys.length - 1; level >= 0; level--) {
-        var currentDimensionKeys = dimensionSummaryKeys.slice(0, level + 1);
+    for (var i = dimensionSummaryKeys.length - 1; i >= 0; i--) {
+        var currentDimensionKey = dimensionSummaryKeys[i];
+        // 找到当前维度字段在完整维度列表中的位置
+        var currentDimensionIndex = allDimensionKeys.indexOf(currentDimensionKey);
+        if (currentDimensionIndex === -1) {
+            console.warn("\u7EF4\u5EA6\u5B57\u6BB5 ".concat(currentDimensionKey, " \u4E0D\u5728\u7EF4\u5EA6\u5B57\u6BB5\u5217\u8868\u4E2D"));
+            continue;
+        }
+        // 获取当前维度及其前面的所有维度字段
+        var groupingKeys = allDimensionKeys.slice(0, currentDimensionIndex + 1);
         // 对当前处理的数据进行分组
-        var groups = groupByDimensions(records, currentDimensionKeys);
-        records = [];
+        var groups = groupByDimensions(result, groupingKeys);
+        var newResult = [];
         for (var _i = 0, groups_1 = groups; _i < groups_1.length; _i++) {
             var group = groups_1[_i];
             // 添加原始数据行
-            records.push.apply(records, group.items);
+            newResult.push.apply(newResult, group.items);
             // 创建合计行
-            var summaryRow = createSummaryRow(group.items, group.key, currentDimensionKeys, summaryKeys, level);
-            records.push(summaryRow);
+            var summaryRow = createSummaryRow(group.items, group.key, groupingKeys, allDimensionKeys, // 传入完整的维度字段列表
+            summaryKeys, currentDimensionIndex);
+            newResult.push(summaryRow);
         }
+        // 对插入合计行后的结果重新排序，确保数据顺序正确
+        result = sortByDimensions(newResult, allDimensionKeys);
     }
-    return records;
+    return result;
 }
 /**
  * 按维度分组
@@ -603,21 +640,25 @@ function groupByDimensions(records, dimensionKeys) {
 /**
  * 创建合计行
  */
-function createSummaryRow(items, groupKey, dimensionKeys, summaryKeys, level) {
+function createSummaryRow(items, groupKey, groupingKeys, // 当前分组使用的维度字段
+allDimensionKeys, // 完整的维度字段列表
+summaryKeys, summaryLevelIndex // 在完整维度列表中的索引
+) {
     var summaryRow = {};
-    // 设置维度字段
-    for (var i = 0; i < dimensionKeys.length; i++) {
-        if (i === level) {
-            // 最后一个维度字段加上"合计"后缀
-            summaryRow[dimensionKeys[i]] = "".concat(groupKey[i], "\u5408\u8BA1");
+    // 设置所有维度字段
+    for (var i = 0; i < allDimensionKeys.length; i++) {
+        var dimensionKey = allDimensionKeys[i];
+        if (i === summaryLevelIndex) {
+            // 当前合计维度字段加上"合计"后缀
+            summaryRow[dimensionKey] = "".concat(groupKey[i], "\u5408\u8BA1");
         }
-        else if (i < level) {
+        else if (i < summaryLevelIndex) {
             // 前面的维度字段保持原值
-            summaryRow[dimensionKeys[i]] = groupKey[i];
+            summaryRow[dimensionKey] = groupKey[i];
         }
         else {
             // 后面的维度字段置空
-            summaryRow[dimensionKeys[i]] = "";
+            summaryRow[dimensionKey] = "";
         }
     }
     var _loop_5 = function (summaryKey) {

package/package.json

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