zmdms-webui 2.9.8 → 2.9.9

package/dist/es/canvastable/canvasTable.js

@@ -41,7 +41,7 @@ import DynamicSetting from '../dynamicsetting/dynamicSetting.js';
 
 function CanvasTable(props) {
     var _a;
-    var _b = props.dataSource, dataSource = _b === void 0 ? [] : _b, _c = props.columns, columns = _c === void 0 ? [] : _c, _d = props.rowKey, rowKey = _d === void 0 ? "id" : _d, _e = props.height, height = _e === void 0 ? 600 : _e, width = props.width, _f = props.rowHeight, rowHeight = _f === void 0 ? 36 : _f, _g = props.headerHeight, headerHeight = _g === void 0 ? 36 : _g, rowSelection = props.rowSelection, onSortChange = props.onSortChange, onFilterChange = props.onFilterChange, onScroll = props.onScroll, onRowClick = props.onRowClick, onColumnResize = props.onColumnResize, _h = props.bordered, bordered = _h === void 0 ? true : _h, _j = props.striped, striped = _j === void 0 ? false : _j, _k = props.emptyText, emptyText = _k === void 0 ? "暂无数据" : _k, style = props.style, className = props.className, _l = props.loading, loading = _l === void 0 ? false : _l, _m = props.isContextMenu, isContextMenu = _m === void 0 ? true : _m, isFullscreenHandle = props.isFullscreenHandle, mode = props.mode, dynamicKey = props.dynamicKey, dynamicVersion = props.dynamicVersion, customDynamicListHandle = props.customDynamicListHandle, isDimensionDynamic = props.isDimensionDynamic, dimensionCustomSumKeys = props.dimensionCustomSumKeys, isAutoMerge = props.isAutoMerge, _o = props.isIndexMerge, isIndexMerge = _o === void 0 ? true : _o, _p = props.isSelectionMerge, isSelectionMerge = _p === void 0 ? false : _p, _q = props.renderMode, renderMode = _q === void 0 ? "object" : _q, fixedRowsCount = props.fixedRowsCount, fixedRowsConfig = props.fixedRowsConfig, _r = props.summaryFixed, summaryFixed = _r === void 0 ? false : _r, _s = props.isAutoScrollY, isAutoScrollY = _s === void 0 ? false : _s, _t = props.autoScrollYMarginBottom, autoScrollYMarginBottom = _t === void 0 ? 65 : _t, canvasTableId = props.canvasTableId, headerWrap = props.headerWrap, _u = props.headerAlign, headerAlign = _u === void 0 ? "center" : _u, tableRefHandle = props.tableRefHandle, exportExcelConfig = props.exportExcelConfig, _v = props.maxHeight, maxHeight = _v === void 0 ? 3000 : _v, expandable = props.expandable;
+    var _b = props.dataSource, dataSource = _b === void 0 ? [] : _b, _c = props.columns, columns = _c === void 0 ? [] : _c, _d = props.rowKey, rowKey = _d === void 0 ? "id" : _d, _e = props.height, height = _e === void 0 ? 600 : _e, width = props.width, _f = props.rowHeight, rowHeight = _f === void 0 ? 36 : _f, _g = props.headerHeight, headerHeight = _g === void 0 ? 36 : _g, rowSelection = props.rowSelection, onSortChange = props.onSortChange, onFilterChange = props.onFilterChange, onScroll = props.onScroll, onRowClick = props.onRowClick, onColumnResize = props.onColumnResize, _h = props.bordered, bordered = _h === void 0 ? true : _h, _j = props.striped, striped = _j === void 0 ? false : _j, _k = props.emptyText, emptyText = _k === void 0 ? "暂无数据" : _k, style = props.style, className = props.className, _l = props.loading, loading = _l === void 0 ? false : _l, _m = props.isContextMenu, isContextMenu = _m === void 0 ? true : _m, isFullscreenHandle = props.isFullscreenHandle, mode = props.mode, dynamicKey = props.dynamicKey, dynamicVersion = props.dynamicVersion, customDynamicListHandle = props.customDynamicListHandle, isDimensionDynamic = props.isDimensionDynamic, _o = props.isDimensionMergeChildren, isDimensionMergeChildren = _o === void 0 ? true : _o, dimensionCustomSumKeys = props.dimensionCustomSumKeys, isAutoMerge = props.isAutoMerge, _p = props.isIndexMerge, isIndexMerge = _p === void 0 ? true : _p, _q = props.isSelectionMerge, isSelectionMerge = _q === void 0 ? false : _q, _r = props.renderMode, renderMode = _r === void 0 ? "object" : _r, fixedRowsCount = props.fixedRowsCount, fixedRowsConfig = props.fixedRowsConfig, _s = props.summaryFixed, summaryFixed = _s === void 0 ? false : _s, _t = props.isAutoScrollY, isAutoScrollY = _t === void 0 ? false : _t, _u = props.autoScrollYMarginBottom, autoScrollYMarginBottom = _u === void 0 ? 65 : _u, canvasTableId = props.canvasTableId, headerWrap = props.headerWrap, _v = props.headerAlign, headerAlign = _v === void 0 ? "center" : _v, tableRefHandle = props.tableRefHandle, exportExcelConfig = props.exportExcelConfig, _w = props.maxHeight, maxHeight = _w === void 0 ? 3000 : _w, expandable = props.expandable;
     var actualMode = "mode" in props ? mode : "index";
     var canvasRef = useRef(null);
     var containerRef = useRef(null);
@@ -64,17 +64,17 @@ function CanvasTable(props) {
         return String((_a = record[rowKey]) !== null && _a !== void 0 ? _a : index);
     }, [rowKey]);
     // 动态列配置
-    var _w = useDynamicListByColumns(columns, {
+    var _x = useDynamicListByColumns(columns, {
         dynamicKey: dynamicKey,
         dynamicVersion: dynamicVersion,
         customDynamicListHandle: customDynamicListHandle,
-    }), defaultDynamicList = _w.defaultDynamicList, currentDynamicList = _w.currentDynamicList, onCurrentListChange = _w.onCurrentListChange, dynamicSettingRef = _w.dynamicSettingRef;
+    }), defaultDynamicList = _x.defaultDynamicList, currentDynamicList = _x.currentDynamicList, onCurrentListChange = _x.onCurrentListChange, dynamicSettingRef = _x.dynamicSettingRef;
     // 根据动态列配置处理columns
     var dynamicColumns = useMemo(function () { return getTableColumns(columns, currentDynamicList); }, [columns, currentDynamicList]).columns;
     // 内部列宽状态（未开启动态配置时使用）
-    var _x = useState({}), internalColumnWidths = _x[0], setInternalColumnWidths = _x[1];
+    var _y = useState({}), internalColumnWidths = _y[0], setInternalColumnWidths = _y[1];
     // 跟踪用户手动调整过宽度的列（用于排除自动宽度分配）
-    var _y = useState(new Set()), manuallyResizedColumnKeys = _y[0], setManuallyResizedColumnKeys = _y[1];
+    var _z = useState(new Set()), manuallyResizedColumnKeys = _z[0], setManuallyResizedColumnKeys = _z[1];
     // 处理选中框列、序号列等
     var processedColumnsOld = useProcessedColumns({
         columns: columns,
@@ -89,30 +89,31 @@ function CanvasTable(props) {
         headerAlign: headerAlign,
     });
     // 表格状态管理
-    var _z = useTableState({
+    var _0 = useTableState({
         dataSource: dataSource,
         columns: processedColumnsOld,
         rowSelection: rowSelection,
         onFilterChange: onFilterChange,
         isAutoMerge: isAutoMerge,
-    }), state = _z.state, setState = _z.setState, processedDataSource = _z.processedDataSource, handleFilterChange = _z.handleFilterChange, closeFilterPopover = _z.closeFilterPopover, autoGeneratedFilters = _z.autoGeneratedFilters;
+    }), state = _0.state, setState = _0.setState, processedDataSource = _0.processedDataSource, handleFilterChange = _0.handleFilterChange, closeFilterPopover = _0.closeFilterPopover, autoGeneratedFilters = _0.autoGeneratedFilters;
     // 树形展开管理
-    var _0 = useExpandable({
+    var _1 = useExpandable({
         dataSource: dataSource,
         expandable: expandable,
         rowKey: rowKey,
-    }), expandedKeys = _0.expandedKeys, flattenedData = _0.flattenedData, toggleExpand = _0.toggleExpand, expandRow = _0.expandRow, collapseRow = _0.collapseRow, setExpandedRowKeys = _0.setExpandedRowKeys, hasExpandable = _0.hasExpandable;
+    }), expandedKeys = _1.expandedKeys, flattenedData = _1.flattenedData, toggleExpand = _1.toggleExpand, expandRow = _1.expandRow, collapseRow = _1.collapseRow, setExpandedRowKeys = _1.setExpandedRowKeys, hasExpandable = _1.hasExpandable;
     var order = useMemo(function () {
         return state.sortOrder && state.sortField
             ? { field: state.sortField, order: state.sortOrder }
             : undefined;
     }, [state.sortOrder, state.sortField]);
-    var _1 = useAutoMerge(processedDataSource, processedColumnsOld, {
+    var _2 = useAutoMerge(processedDataSource, processedColumnsOld, {
         isAutoMerge: isAutoMerge,
         isDimensionDynamic: isDimensionDynamic,
+        isDimensionMergeChildren: isDimensionMergeChildren,
         order: order,
         dimensionCustomSumKeys: dimensionCustomSumKeys,
-    }), newDataSource = _1[0], processedColumns = _1[1];
+    }), newDataSource = _2[0], processedColumns = _2[1];
     // 如果开启了树形展开，使用扁平化后的数据源
     var expandedDataSource = useMemo(function () {
         if (hasExpandable) {
@@ -121,14 +122,14 @@ function CanvasTable(props) {
         return newDataSource;
     }, [hasExpandable, flattenedData, newDataSource]);
     // 生成合计行和最终数据源
-    var _2 = useSummaryRow({
+    var _3 = useSummaryRow({
         columns: processedColumns,
         dataSource: expandedDataSource,
-    }), finalDataSource = _2.finalDataSource, hasSummaryRow = _2.hasSummaryRow;
+    }), finalDataSource = _3.finalDataSource, hasSummaryRow = _3.hasSummaryRow;
     // 用于存储计算后的表头高度（用于自动高度的精确计算）
-    var _3 = useState(undefined), preciseHeaderHeight = _3[0], setPreciseHeaderHeight = _3[1];
+    var _4 = useState(undefined), preciseHeaderHeight = _4[0], setPreciseHeaderHeight = _4[1];
     // 用于存储是否需要横向滚动条（用于自动高度的精确计算）
-    var _4 = useState(false), needHorizontalScrollbar = _4[0], setNeedHorizontalScrollbar = _4[1];
+    var _5 = useState(false), needHorizontalScrollbar = _5[0], setNeedHorizontalScrollbar = _5[1];
     // 自动高度计算（需要在容器尺寸计算之前）
     var autoHeight = useCanvasTableAutoHeight(isAutoScrollY, autoScrollYMarginBottom, canvasTableId, finalDataSource.length, // 数据行数（用于 content 模式）
     headerHeight, // 表头基础高度（用于 content 模式的初始计算）
@@ -195,7 +196,7 @@ function CanvasTable(props) {
         return calculateTotalHeight(calculatedHeaderHeight, finalDataSource.length, rowHeight);
     }, [calculatedHeaderHeight, finalDataSource.length, rowHeight]);
     // 计算滚动条指标
-    var _5 = useScrollbarMetrics({
+    var _6 = useScrollbarMetrics({
         containerWidth: containerWidth,
         containerHeight: containerHeight,
         totalWidth: totalWidth,
@@ -203,14 +204,14 @@ function CanvasTable(props) {
         headerHeight: calculatedHeaderHeight,
         scrollTop: 0,
         scrollLeft: 0,
-    }), maxScrollTop = _5.maxScrollTop, maxScrollLeft = _5.maxScrollLeft;
+    }), maxScrollTop = _6.maxScrollTop, maxScrollLeft = _6.maxScrollLeft;
     // 滚动管理（使用预先计算的maxScrollTop和maxScrollLeft）
-    var _6 = useTableScroll({
+    var _7 = useTableScroll({
         containerRef: containerRef,
         maxScrollTop: maxScrollTop,
         maxScrollLeft: maxScrollLeft,
         onScroll: onScroll,
-    }), scrollState = _6.scrollState, setScrollState = _6.setScrollState;
+    }), scrollState = _7.scrollState, setScrollState = _7.setScrollState;
     // 使用 ref 保存最新的滚动位置，确保在组件卸载过程中仍能访问
     var scrollPositionRef = useRef({ x: 0, y: 0 });
     useEffect(function () {
@@ -254,12 +255,12 @@ function CanvasTable(props) {
         needHorizontalScrollbar,
     ]);
     // 单元格框选
-    var _7 = useTableSelection({
+    var _8 = useTableSelection({
         state: state,
         setState: setState,
     }), 
     // selectionStartRef,
-    startSelection = _7.startSelection, updateSelection = _7.updateSelection, extendSelection = _7.extendSelection;
+    startSelection = _8.startSelection, updateSelection = _8.updateSelection, extendSelection = _8.extendSelection;
     // 处理列宽调整
     var handleColumnResize = useCallback(function (columnKey, newWidth) {
         var _a;
@@ -314,20 +315,20 @@ function CanvasTable(props) {
         onCurrentListChange,
     ]);
     // 列宽调整
-    var _8 = useColumnResize({
+    var _9 = useColumnResize({
         columnRenderInfos: columnRenderInfos,
         containerWidth: containerWidth,
         headerHeight: calculatedHeaderHeight,
         scrollLeft: scrollState.scrollLeft,
         onColumnResize: handleColumnResize,
-    }), resizeState = _8.resizeState, checkResizeHandle = _8.checkResizeHandle, startResize = _8.startResize, updateResize = _8.updateResize, endResize = _8.endResize, setHoverResizeColumn = _8.setHoverResizeColumn, getColumnWidth = _8.getColumnWidth, RESIZE_HANDLE_WIDTH = _8.RESIZE_HANDLE_WIDTH;
+    }), resizeState = _9.resizeState, checkResizeHandle = _9.checkResizeHandle, startResize = _9.startResize, updateResize = _9.updateResize, endResize = _9.endResize, setHoverResizeColumn = _9.setHoverResizeColumn, getColumnWidth = _9.getColumnWidth, RESIZE_HANDLE_WIDTH = _9.RESIZE_HANDLE_WIDTH;
     // 复制到剪贴板
-    var _9 = useCopyToClipboard({
+    var _10 = useCopyToClipboard({
         cellSelection: state.cellSelection,
         processedDataSource: finalDataSource,
         columns: processedColumns,
         containerRef: containerRef,
-    }), getSelectedCellsText = _9.getSelectedCellsText, copyToClipboard = _9.copyToClipboard;
+    }), getSelectedCellsText = _10.getSelectedCellsText, copyToClipboard = _10.copyToClipboard;
     // 处理右键菜单的复制操作
     var handleCopy = useCallback(function () {
         var text = getSelectedCellsText();
@@ -347,7 +348,7 @@ function CanvasTable(props) {
         childrenColumnName: (_a = props.expandable) === null || _a === void 0 ? void 0 : _a.childrenColumnName,
     });
     // 交互事件处理（使用baseScrollbarMetrics的maxScrollTop/maxScrollLeft以保持稳定）
-    var _10 = useTableInteraction({
+    var _11 = useTableInteraction({
         state: state,
         setState: setState,
         scrollState: scrollState,
@@ -397,7 +398,7 @@ function CanvasTable(props) {
         fixedRowsCount: fixedRowsCount,
         fixedRowsConfig: fixedRowsConfig,
         summaryFixed: summaryFixed,
-    }), handleCanvasMouseDown = _10.handleCanvasMouseDown, handleCanvasMouseMove = _10.handleCanvasMouseMove, handleCanvasMouseUp = _10.handleCanvasMouseUp, handleCanvasMouseLeave = _10.handleCanvasMouseLeave, handleCanvasContextMenu = _10.handleCanvasContextMenu;
+    }), handleCanvasMouseDown = _11.handleCanvasMouseDown, handleCanvasMouseMove = _11.handleCanvasMouseMove, handleCanvasMouseUp = _11.handleCanvasMouseUp, handleCanvasMouseLeave = _11.handleCanvasMouseLeave, handleCanvasContextMenu = _11.handleCanvasContextMenu;
     // 渲染表格
     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, // 传入原始基础高度用于计算每层高度

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

@@ -48,17 +48,17 @@ function useCanvasTableAutoHeight(isAutoScrollY, marginBottom, canvasTableId, da
             return;
         }
         // 视口模式：根据页面位置计算高度
+        // 构建表格选择器
+        var tableSelector = canvasTableId
+            ? "#".concat(CSS.escape(canvasTableId), " .canvas-table-container")
+            : ".canvas-table-container";
         var calculateHeight = function () {
-            var _a, _b;
-            // 查找容器元素
-            var containerRect = (_a = document
-                .querySelector(".ztxk-container")) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect();
             // 查找CanvasTable元素
-            var tableSelector = canvasTableId
-                ? "#".concat(CSS.escape(canvasTableId), " .canvas-table-container")
-                : ".canvas-table-container";
-            var tableRect = (_b = document
-                .querySelector(tableSelector)) === null || _b === void 0 ? void 0 : _b.getBoundingClientRect();
+            var tableElement = document.querySelector(tableSelector);
+            var tableRect = tableElement === null || tableElement === void 0 ? void 0 : tableElement.getBoundingClientRect();
+            // 通过表格元素向上查找包含它的 .ztxk-container 容器
+            var containerElement = tableElement === null || tableElement === void 0 ? void 0 : tableElement.closest(".ztxk-container");
+            var containerRect = containerElement === null || containerElement === void 0 ? void 0 : containerElement.getBoundingClientRect();
             if (containerRect && tableRect) {
                 var calculatedHeight = containerRect.height +
                     containerRect.top -
@@ -80,7 +80,9 @@ function useCanvasTableAutoHeight(isAutoScrollY, marginBottom, canvasTableId, da
         var observer = new MutationObserver(function () {
             calculateHeight();
         });
-        var container = document.querySelector(".ztxk-container");
+        // 找到包含目标表格的容器
+        var tableElement = document.querySelector(tableSelector);
+        var container = tableElement === null || tableElement === void 0 ? void 0 : tableElement.closest(".ztxk-container");
         if (container) {
             observer.observe(container, {
                 childList: true,

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

@@ -403,6 +403,10 @@ interface ICanvasTableProps<RecordType = any> {
      * 开启维度自定义（需配合 isAutoMerge 使用）
      */
     isDimensionDynamic?: boolean;
+    /**
+     * 开启维度自定义后，是否合并子数据。默认为true，会将相同维度组合的子数据合并为一行；为false时保留所有原始记录
+     */
+    isDimensionMergeChildren?: boolean;
     /**
      * 开启维度自定义后，开启维度合计的字段
      */

package/dist/es/table/hooks.js

@@ -432,7 +432,7 @@ var useDateKeys = function (columns) {
  * 自动合并的一些处理
  */
 function useAutoMerge(dataSource, columns, _a) {
-    var isAutoMerge = _a.isAutoMerge, isDimensionDynamic = _a.isDimensionDynamic, order = _a.order, dimensionCustomSumKeys = _a.dimensionCustomSumKeys;
+    var isAutoMerge = _a.isAutoMerge, isDimensionDynamic = _a.isDimensionDynamic, _b = _a.isDimensionMergeChildren, isDimensionMergeChildren = _b === void 0 ? true : _b, order = _a.order, dimensionCustomSumKeys = _a.dimensionCustomSumKeys;
     // 计算需要合并的字段key集合
     var mergeKeys = useMergeKeys(columns, isAutoMerge);
     var firstMergeKey = mergeKeys === null || mergeKeys === void 0 ? void 0 : mergeKeys[0];
@@ -473,7 +473,8 @@ function useAutoMerge(dataSource, columns, _a) {
                 }
             }
             var startTime = performance.now();
-            var result = flattenRecordsOptimized(__spreadArray([], sourceData, true), mergeKeysParam, dimensionSummaryKeys, summaryKeys, isDimensionDynamic, order, dimensionCustomSumKeys, columns // 添加 columns 参数，支持自定义排序
+            var result = flattenRecordsOptimized(__spreadArray([], sourceData, true), mergeKeysParam, dimensionSummaryKeys, summaryKeys, isDimensionDynamic, order, dimensionCustomSumKeys, columns, // 添加 columns 参数，支持自定义排序
+            isDimensionMergeChildren // 是否合并子数据
             );
             var endTime = performance.now();
             var duration = endTime - startTime;
@@ -497,6 +498,7 @@ function useAutoMerge(dataSource, columns, _a) {
         dimensionSummaryKeys,
         summaryKeys,
         isDimensionDynamic,
+        isDimensionMergeChildren,
         order,
         dimensionCustomSumKeys,
         columns,

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

@@ -536,6 +536,10 @@ interface ITableProps<RecordType> extends Omit<TableProps<RecordType>, "columns"
      * 开启维度自定义。开启后，会根据columns中的isDimension属性来是否开启维度自定义，需要合并行时，需要开启这个属性isAutoMerge
      */
     isDimensionDynamic?: boolean;
+    /**
+     * 开启维度自定义后，是否合并子数据。默认为true，会将相同维度组合的子数据合并为一行；为false时保留所有原始记录
+     */
+    isDimensionMergeChildren?: boolean;
     /**
      * 开启维度自定义后，开启维度合计的字段，与column中的isSummary相同，主要用于自定义合计字段
      */

package/dist/es/table/table.js

@@ -48,8 +48,8 @@ import DynamicSetting from '../dynamicsetting/dynamicSetting.js';
 var Table = function (props) {
     var _a;
     // console.log("表格渲染");
-    var className = props.className, _b = props.bordered, bordered = _b === void 0 ? true : _b, _c = props.pagination, pagination = _c === void 0 ? false : _c, isFlex = props.isFlex; props.tablePreferences; var dynamicKey = props.dynamicKey, dynamicVersion = props.dynamicVersion, customDynamicListHandle = props.customDynamicListHandle, isRemeberFilter = props.isRemeberFilter, _d = props.isOrderUpdateData, isOrderUpdateData = _d === void 0 ? true : _d, hiddenDynamicIcon = props.hiddenDynamicIcon, _columns = props.columns, dataSource = props.dataSource, onTableChange = props.onTableChange, isEdit = props.isEdit, isMove = props.isMove, isAdd = props.isAdd, hiddenAddBtnHandle = props.hiddenAddBtnHandle, _e = props.isTheadTitleAdd, isTheadTitleAdd = _e === void 0 ? true : _e, addMode = props.addMode, addCallback = props.addCallback, isDel = props.isDel, delPopTitle = props.delPopTitle, hiddenDelBtnHandle = props.hiddenDelBtnHandle, _f = props.isDelAll, isDelAll = _f === void 0 ? true : _f, isAddAndDelAuto = props.isAddAndDelAuto, summaryConfig = props.summaryConfig, _g = props.summaryFixed, summaryFixed = _g === void 0 ? true : _g, isInnerPagination = props.isInnerPagination, _h = props.innerPaginationPageSize, innerPaginationPageSize = _h === void 0 ? 30 : _h, _j = props.innerPaginationPosition, innerPaginationPosition = _j === void 0 ? INNER_TABLE_PAGINATION_POSITION : _j, _k = props.innerPaginationPageSizeOptions, innerPaginationPageSizeOptions = _k === void 0 ? INNER_TABLE_PAGINATION_PAGESIZEOPTIONS : _k, innerPaginationConfig = props.innerPaginationConfig, tableRefHandle = props.tableRefHandle, tableName = props.tableName, serviceOrder = props.serviceOrder, differences = props.differences, virtualKey = props.virtualKey, _l = props.isResizableColumn, isResizableColumn = _l === void 0 ? true : _l, _m = props.isResizableTitleEllipsis, isResizableTitleEllipsis = _m === void 0 ? true : _m, _o = props.isRealTimeValidate, isRealTimeValidate = _o === void 0 ? true : _o, isMarginTop = props.isMarginTop, isMarginBottom = props.isMarginBottom, scroll = props.scroll, addAndDelProps = props.addAndDelProps, _p = props.autoScrollYMarginBottom, autoScrollYMarginBottom = _p === void 0 ? 65 : _p, _q = props.isAutoScrollY, isAutoScrollY = _q === void 0 ? false : _q, tableId = props.tableId, extraOnRow = props.onRow, fixedRowsCount = props.fixedRowsCount, fixedRowsConfig = props.fixedRowsConfig, headerAlign = props.headerAlign, isDimensionDynamic = props.isDimensionDynamic, dimensionCustomSumKeys = props.dimensionCustomSumKeys, isAutoMerge = props.isAutoMerge, mode = props.mode, rowSelection = props.rowSelection, isContextMenu = props.isContextMenu, isFullscreenHandle = props.isFullscreenHandle, _r = props.isExportSummary, isExportSummary = _r === void 0 ? true : _r, isAutoMergeAddAndDel = props.isAutoMergeAddAndDel, isDynamicColumnText = props.isDynamicColumnText, isTableSummaryCollapse = props.isTableSummaryCollapse, isTableSummaryDefaultExpand = props.isTableSummaryDefaultExpand, resetProps = __rest(props, ["className", "bordered", "pagination", "isFlex", "tablePreferences", "dynamicKey", "dynamicVersion", "customDynamicListHandle", "isRemeberFilter", "isOrderUpdateData", "hiddenDynamicIcon", "columns", "dataSource", "onTableChange", "isEdit", "isMove", "isAdd", "hiddenAddBtnHandle", "isTheadTitleAdd", "addMode", "addCallback", "isDel", "delPopTitle", "hiddenDelBtnHandle", "isDelAll", "isAddAndDelAuto", "summaryConfig", "summaryFixed", "isInnerPagination", "innerPaginationPageSize", "innerPaginationPosition", "innerPaginationPageSizeOptions", "innerPaginationConfig", "tableRefHandle", "tableName", "serviceOrder", "differences", "virtualKey", "isResizableColumn", "isResizableTitleEllipsis", "isRealTimeValidate", "isMarginTop", "isMarginBottom", "scroll", "addAndDelProps", "autoScrollYMarginBottom", "isAutoScrollY", "tableId", "onRow", "fixedRowsCount", "fixedRowsConfig", "headerAlign", "isDimensionDynamic", "dimensionCustomSumKeys", "isAutoMerge", "mode", "rowSelection", "isContextMenu", "isFullscreenHandle", "isExportSummary", "isAutoMergeAddAndDel", "isDynamicColumnText", "isTableSummaryCollapse", "isTableSummaryDefaultExpand"]);
-    var _s = useBaseContext(), enableDynamicColumnText = _s.enableDynamicColumnText, enableTableSummaryCollapse = _s.enableTableSummaryCollapse, enableTableSummaryDefaultExpand = _s.enableTableSummaryDefaultExpand;
+    var className = props.className, _b = props.bordered, bordered = _b === void 0 ? true : _b, _c = props.pagination, pagination = _c === void 0 ? false : _c, isFlex = props.isFlex; props.tablePreferences; var dynamicKey = props.dynamicKey, dynamicVersion = props.dynamicVersion, customDynamicListHandle = props.customDynamicListHandle, isRemeberFilter = props.isRemeberFilter, _d = props.isOrderUpdateData, isOrderUpdateData = _d === void 0 ? true : _d, hiddenDynamicIcon = props.hiddenDynamicIcon, _columns = props.columns, dataSource = props.dataSource, onTableChange = props.onTableChange, isEdit = props.isEdit, isMove = props.isMove, isAdd = props.isAdd, hiddenAddBtnHandle = props.hiddenAddBtnHandle, _e = props.isTheadTitleAdd, isTheadTitleAdd = _e === void 0 ? true : _e, addMode = props.addMode, addCallback = props.addCallback, isDel = props.isDel, delPopTitle = props.delPopTitle, hiddenDelBtnHandle = props.hiddenDelBtnHandle, _f = props.isDelAll, isDelAll = _f === void 0 ? true : _f, isAddAndDelAuto = props.isAddAndDelAuto, summaryConfig = props.summaryConfig, _g = props.summaryFixed, summaryFixed = _g === void 0 ? true : _g, isInnerPagination = props.isInnerPagination, _h = props.innerPaginationPageSize, innerPaginationPageSize = _h === void 0 ? 30 : _h, _j = props.innerPaginationPosition, innerPaginationPosition = _j === void 0 ? INNER_TABLE_PAGINATION_POSITION : _j, _k = props.innerPaginationPageSizeOptions, innerPaginationPageSizeOptions = _k === void 0 ? INNER_TABLE_PAGINATION_PAGESIZEOPTIONS : _k, innerPaginationConfig = props.innerPaginationConfig, tableRefHandle = props.tableRefHandle, tableName = props.tableName, serviceOrder = props.serviceOrder, differences = props.differences, virtualKey = props.virtualKey, _l = props.isResizableColumn, isResizableColumn = _l === void 0 ? true : _l, _m = props.isResizableTitleEllipsis, isResizableTitleEllipsis = _m === void 0 ? true : _m, _o = props.isRealTimeValidate, isRealTimeValidate = _o === void 0 ? true : _o, isMarginTop = props.isMarginTop, isMarginBottom = props.isMarginBottom, scroll = props.scroll, addAndDelProps = props.addAndDelProps, _p = props.autoScrollYMarginBottom, autoScrollYMarginBottom = _p === void 0 ? 65 : _p, _q = props.isAutoScrollY, isAutoScrollY = _q === void 0 ? false : _q, tableId = props.tableId, extraOnRow = props.onRow, fixedRowsCount = props.fixedRowsCount, fixedRowsConfig = props.fixedRowsConfig, headerAlign = props.headerAlign, isDimensionDynamic = props.isDimensionDynamic, _r = props.isDimensionMergeChildren, isDimensionMergeChildren = _r === void 0 ? true : _r, dimensionCustomSumKeys = props.dimensionCustomSumKeys, isAutoMerge = props.isAutoMerge, mode = props.mode, rowSelection = props.rowSelection, isContextMenu = props.isContextMenu, isFullscreenHandle = props.isFullscreenHandle, _s = props.isExportSummary, isExportSummary = _s === void 0 ? true : _s, isAutoMergeAddAndDel = props.isAutoMergeAddAndDel, isDynamicColumnText = props.isDynamicColumnText, isTableSummaryCollapse = props.isTableSummaryCollapse, isTableSummaryDefaultExpand = props.isTableSummaryDefaultExpand, resetProps = __rest(props, ["className", "bordered", "pagination", "isFlex", "tablePreferences", "dynamicKey", "dynamicVersion", "customDynamicListHandle", "isRemeberFilter", "isOrderUpdateData", "hiddenDynamicIcon", "columns", "dataSource", "onTableChange", "isEdit", "isMove", "isAdd", "hiddenAddBtnHandle", "isTheadTitleAdd", "addMode", "addCallback", "isDel", "delPopTitle", "hiddenDelBtnHandle", "isDelAll", "isAddAndDelAuto", "summaryConfig", "summaryFixed", "isInnerPagination", "innerPaginationPageSize", "innerPaginationPosition", "innerPaginationPageSizeOptions", "innerPaginationConfig", "tableRefHandle", "tableName", "serviceOrder", "differences", "virtualKey", "isResizableColumn", "isResizableTitleEllipsis", "isRealTimeValidate", "isMarginTop", "isMarginBottom", "scroll", "addAndDelProps", "autoScrollYMarginBottom", "isAutoScrollY", "tableId", "onRow", "fixedRowsCount", "fixedRowsConfig", "headerAlign", "isDimensionDynamic", "isDimensionMergeChildren", "dimensionCustomSumKeys", "isAutoMerge", "mode", "rowSelection", "isContextMenu", "isFullscreenHandle", "isExportSummary", "isAutoMergeAddAndDel", "isDynamicColumnText", "isTableSummaryCollapse", "isTableSummaryDefaultExpand"]);
+    var _t = useBaseContext(), enableDynamicColumnText = _t.enableDynamicColumnText, enableTableSummaryCollapse = _t.enableTableSummaryCollapse, enableTableSummaryDefaultExpand = _t.enableTableSummaryDefaultExpand;
     // 表格动态列配置是否显示文字
     var isDynamicColumnTextEnable = getFinalValue(enableDynamicColumnText, isDynamicColumnText);
     // 表格合计是否可以展开收起
@@ -67,25 +67,25 @@ var Table = function (props) {
         id: menuId,
     }).show;
     // 针对SCU和增减行 做特殊处理
-    var _t = useScuRfresh(), refreshScuCell = _t.refreshScuCell, getRefreshScuCell = _t.getRefreshScuCell;
+    var _u = useScuRfresh(), refreshScuCell = _u.refreshScuCell, getRefreshScuCell = _u.getRefreshScuCell;
     // 做一些前置处理
     // 比如过滤某些列 不做展示
     var columns = useParseColumns(_columns);
     // 得到动态列配置信息
-    var _u = useDynamicListByColumns(columns, {
+    var _v = useDynamicListByColumns(columns, {
         dynamicKey: dynamicKey,
         dynamicVersion: dynamicVersion,
         customDynamicListHandle: customDynamicListHandle,
-    }), defaultDynamicList = _u.defaultDynamicList, onCurrentListChange = _u.onCurrentListChange, currentDynamicList = _u.currentDynamicList, dynamicSettingRef = _u.dynamicSettingRef;
+    }), defaultDynamicList = _v.defaultDynamicList, onCurrentListChange = _v.onCurrentListChange, currentDynamicList = _v.currentDynamicList, dynamicSettingRef = _v.dynamicSettingRef;
     // 因为内部分页需要知晓当前页面的数据展示，要不然数据排序就跟内部分页没关系了
     // 自定义排序方法
-    var _v = useCustomSort(dataSource, onTableChange, {
+    var _w = useCustomSort(dataSource, onTableChange, {
         refreshScuCell: refreshScuCell,
         rowKey: props === null || props === void 0 ? void 0 : props.rowKey,
         serviceOrder: serviceOrder,
         isOrderUpdateData: isOrderUpdateData,
         isAutoMerge: isAutoMerge,
-    }), order = _v.order, setOrder = _v.setOrder, customSortHandle = _v.customSortHandle, sortDataSource = _v.sortDataSource;
+    }), order = _w.order, setOrder = _w.setOrder, customSortHandle = _w.customSortHandle, sortDataSource = _w.sortDataSource;
     // 当前表格展示的数据
     // 如果开启了前端排序的话，排序后的数据，可能会影响到很多地方。
     // 所以后续操作的数据 应该用
@@ -112,12 +112,12 @@ var Table = function (props) {
         return scroll || {};
     }, [scroll, currentTableDataSource, virtualKey, scrolly, isAutoScrollY]);
     // 内部分页相关配置
-    var _w = useInnerPagination(isInnerPagination, innerPaginationPageSize, {
+    var _x = useInnerPagination(isInnerPagination, innerPaginationPageSize, {
         innerPaginationPosition: innerPaginationPosition,
         innerPaginationPageSizeOptions: innerPaginationPageSizeOptions,
         innerPaginationConfig: innerPaginationConfig,
         dataSource: currentTableDataSource,
-    }), paginationConfig = _w.paginationConfig, currentPage = _w.currentPage, setCurrent = _w.setCurrent, pageSize = _w.pageSize;
+    }), paginationConfig = _x.paginationConfig, currentPage = _x.currentPage, setCurrent = _x.setCurrent, pageSize = _x.pageSize;
     // 内部表格编辑事件
     var onEditableSave = useEditChange(dataSourceRef, onTableChange);
     // 记录表头过滤的一些配置（通过ref记录，key => filter） 复制整列、过滤后修改数据，需要先走过滤
@@ -145,9 +145,9 @@ var Table = function (props) {
         filterConfigRef: filterConfigRef,
     });
     // 表格内部自定义处理过滤，不走antd内部
-    var _x = useCustomFilter(currentTableDataSource, columns), filterDataSource = _x[0], handleFilterConfigChange = _x[1];
+    var _y = useCustomFilter(currentTableDataSource, columns), filterDataSource = _y[0], handleFilterConfigChange = _y[1];
     // 处理列配置信息 得到新的列配置信息
-    var _y = useColumns(columns, {
+    var _z = useColumns(columns, {
         // 动态列配置相关信息
         dynamicKey: dynamicKey,
         isRemeberFilter: isRemeberFilter,
@@ -191,18 +191,19 @@ var Table = function (props) {
         handleFilterConfigChange: handleFilterConfigChange,
         isAutoMergeAddAndDel: isAutoMergeAddAndDel,
         isDynamicColumnTextEnable: isDynamicColumnTextEnable,
-    }), _newColumns = _y.newColumns, newRowSelection = _y.rowSelection;
+    }), _newColumns = _z.newColumns, newRowSelection = _z.rowSelection;
     // 处理表格合并和维度
-    var _z = useAutoMerge(filterDataSource, _newColumns, {
+    var _0 = useAutoMerge(filterDataSource, _newColumns, {
         isAutoMerge: isAutoMerge,
         isDimensionDynamic: isDimensionDynamic,
+        isDimensionMergeChildren: isDimensionMergeChildren,
         order: order,
         dimensionCustomSumKeys: dimensionCustomSumKeys,
-    }), newDataSource = _z[0], newColumns = _z[1];
+    }), newDataSource = _0[0], newColumns = _0[1];
     // 表格验证
-    var _0 = useTableValidate(), tableRef = _0.tableRef, getCurrentTable = _0.getCurrentTable, clearErrorClass = _0.clearErrorClass;
+    var _1 = useTableValidate(), tableRef = _1.tableRef, getCurrentTable = _1.getCurrentTable, clearErrorClass = _1.clearErrorClass;
     // 内部表格总结栏
-    var _1 = useTableSummaryCollapse(tableRef, isTableSummaryDefaultExpandEnable, isTableSummaryCollapseEnable), showSummary = _1.showSummary, renderTableSummaryCollapse = _1.renderTableSummaryCollapse;
+    var _2 = useTableSummaryCollapse(tableRef, isTableSummaryDefaultExpandEnable, isTableSummaryCollapseEnable), showSummary = _2.showSummary, renderTableSummaryCollapse = _2.renderTableSummaryCollapse;
     var getSummaryHandle = useSummary(summaryConfig, newColumns, {
         summaryFixed: summaryFixed,
         rowSelection: props.rowSelection,
@@ -423,7 +424,7 @@ var Table = function (props) {
         };
     });
     // 全屏的一些方法
-    var _2 = useState(false), isFull = _2[0], setIsFull = _2[1];
+    var _3 = useState(false), isFull = _3[0], setIsFull = _3[1];
     var fullscreenHandle = useMemoizedFn(function (isFull) {
         isFullscreenHandle === null || isFullscreenHandle === void 0 ? void 0 : isFullscreenHandle(isFull);
         setIsFull(isFull);

package/dist/es/table/utils.js

@@ -448,9 +448,14 @@ function startColumnInsertTableData(options) {
  * @param dimensionSummaryKeys 维度合计字段
  * @param summaryKeys 合计字段
  * @param isDimensionDynamic 维度合并
+ * @param order 排序配置
+ * @param dimensionCustomSumKeys 自定义合计字段
+ * @param columns 列配置
+ * @param isDimensionMergeChildren 是否合并子数据，默认为true
  */
-function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summaryKeys, isDimensionDynamic, order, dimensionCustomSumKeys, columns) {
+function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summaryKeys, isDimensionDynamic, order, dimensionCustomSumKeys, columns, isDimensionMergeChildren) {
     var _a;
+    if (isDimensionMergeChildren === void 0) { isDimensionMergeChildren = true; }
     if (!records ||
         records.length === 0 ||
         !mergeKeys ||
@@ -468,7 +473,7 @@ function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summa
         result = __spreadArray([], records, true);
     }
     // 1. 如果开启了维度合并，按所有 mergeKeys 的组合来计算合计值
-    if (isDimensionDynamic && mergeKeys.length > 0) {
+    if (isDimensionDynamic && isDimensionMergeChildren && mergeKeys.length > 0) {
         var groupedResult = groupByLastMergeKey(result, mergeKeys, summaryKeys, dimensionCustomSumKeys);
         result = groupedResult;
     }
@@ -941,6 +946,7 @@ function hasParentGroupChanged(records, currentIndex, mergeKeys, currentKeyIndex
 /**
  * 按所有合并键的组合进行分组并计算合计值
  * 确保相同维度组合的记录被正确分组
+ * @param isDimensionMergeChildren 是否合并子数据，默认为true。为false时返回所有原始记录
  */
 function groupByLastMergeKey(records, mergeKeys, // 改为传入所有合并键
 summaryKeys, dimensionCustomSumKeys) {

package/package.json

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