zmdms-webui 2.6.3 → 2.6.5

package/dist/es/canvastable/canvasTable.js

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

@@ -1,4 +1,4 @@
-import { __spreadArray, __assign, __awaiter, __generator } from '../_virtual/_tslib.js';
+import { __spreadArray, __assign, __awaiter, __generator, __rest } from '../_virtual/_tslib.js';
 import ExcelJS from '../node_modules/exceljs/dist/exceljs.min.js';
 import { useMergeKeys, useNumKeys, useDateKeys } from './hooks.js';
 import { useMemoizedFn } from 'ahooks';
@@ -6,19 +6,61 @@ import { IS_SUMMARY, MERGE_ROW_SPANS } from './constant.js';
 import { exactRound } from 'zmdms-utils';
 import dayjs from 'dayjs';
 
+// 内部常量，用于标记父数据
+var IS_PARENT = "__is_parent__";
+var PARENT_LEVEL = "__parent_level__";
+/**
+ * 扁平化树形数据
+ * @param records 原始数据数组
+ * @param childrenColumnName 子节点字段名，默认为 'children'
+ * @returns 扁平化后的数据数组
+ */
+function flattenTreeData(records, childrenColumnName) {
+    if (childrenColumnName === void 0) { childrenColumnName = "children"; }
+    if (!Array.isArray(records) || records.length === 0) {
+        return records;
+    }
+    var result = [];
+    var flatten = function (items, level) {
+        if (level === void 0) { level = 0; }
+        items.forEach(function (item) {
+            var _a, _b;
+            var hasChildren = item[childrenColumnName] &&
+                Array.isArray(item[childrenColumnName]) &&
+                item[childrenColumnName].length > 0;
+            // 创建当前项的副本（不包含 children）
+            var _c = item, _d = childrenColumnName, children = _c[_d], itemWithoutChildren = __rest(_c, [typeof _d === "symbol" ? _d : _d + ""]);
+            if (hasChildren) {
+                // 这是父数据，添加标记
+                result.push(__assign(__assign({}, itemWithoutChildren), (_a = {}, _a[IS_PARENT] = true, _a[PARENT_LEVEL] = level, _a)));
+                // 递归处理子数据
+                flatten(children, level + 1);
+            }
+            else {
+                // 这是叶子节点或没有子节点的数据
+                result.push(__assign(__assign({}, itemWithoutChildren), (_b = {}, _b[IS_PARENT] = false, _b[PARENT_LEVEL] = level, _b)));
+            }
+        });
+    };
+    flatten(records, 0);
+    return result;
+}
 /**
  * 使用 ExcelJS + 后处理添加批注
  * 导出Excel，支持维度合并和小计，以及批注功能
  */
-function exportToExcelWithMergeAndComments(records, columns, mergeKeys, numKeys, dateKeys, fileName, sheetName, columnHeaders, summaryConfig, topDescription, topDescriptionRowHeight) {
+function exportToExcelWithMergeAndComments(records, columns, mergeKeys, numKeys, dateKeys, fileName, sheetName, columnHeaders, summaryConfig, topDescription, topDescriptionRowHeight, childrenColumnName) {
     var _a;
     var _this = this;
     if (fileName === void 0) { fileName = "export.xlsx"; }
     if (sheetName === void 0) { sheetName = "Sheet1"; }
+    if (childrenColumnName === void 0) { childrenColumnName = "children"; }
     if (!records || records.length === 0) {
         throw new Error("没有数据可导出");
     }
-    var processedData = applyPrecisionToRecords(records, columns);
+    // 扁平化树形数据
+    var flattenedRecords = flattenTreeData(records, childrenColumnName);
+    var processedData = applyPrecisionToRecords(flattenedRecords, columns);
     // 准备Excel数据
     var excelData = prepareExcelData(processedData, columns, columnHeaders, topDescription);
     // 创建工作簿
@@ -361,6 +403,9 @@ function createWorksheetWithMerge(workbook, excelData, mergeKeys, sheetName) {
                 return "continue";
             for (var rowIndex = 0; rowIndex < data.length; rowIndex++) {
                 var rowData = data[rowIndex];
+                // 跳过父数据的合并，父数据不参与列合并
+                if (rowData[IS_PARENT])
+                    continue;
                 var spanCount = (_a = rowData[MERGE_ROW_SPANS]) === null || _a === void 0 ? void 0 : _a[mergeKey];
                 if (spanCount && spanCount > 1) {
                     var startRow = headerRowCount + rowIndex + 1;
@@ -500,9 +545,15 @@ function applyExcelStyles(worksheet, data, numKeys, dateKeys, columns, headerRow
     for (var rowIndex = 0; rowIndex < data.length; rowIndex++) {
         var rowData = data[rowIndex];
         var isSubtotal = rowData.__is_summary__;
+        var isParent = rowData[IS_PARENT];
         for (var c = 1; c <= totalCols; c++) {
             var cell = worksheet.getCell(headerRowCount + rowIndex + 1, c);
-            var base = isSubtotal ? summaryStyle : normalStyle;
+            // 优先级：小计行 > 父数据 > 普通数据
+            var base = isSubtotal
+                ? summaryStyle
+                : isParent
+                    ? summaryStyle
+                    : normalStyle;
             var columnAlign = columns && Array.isArray(columns)
                 ? (_c = columns[c - 1]) === null || _c === void 0 ? void 0 : _c.align
                 : undefined;
@@ -551,8 +602,8 @@ function applyExcelStyles(worksheet, data, numKeys, dateKeys, columns, headerRow
                 var cellValue = rowData[dateKey.dataIndex];
                 if (cellValue) {
                     try {
-                        var date = dayjs(String(cellValue)).toDate();
-                        cell.value = date;
+                        var date = cellValue;
+                        cell.value = dayjs(String(date)).format(columns[colIndex].dateFormat);
                         cell.numFmt = columns[colIndex].dateFormat;
                     }
                     catch (e) {
@@ -570,22 +621,23 @@ function applyExcelStyles(worksheet, data, numKeys, dateKeys, columns, headerRow
 /**
  * 主要的导出函数，使用改进的批注功能
  */
-function exportToExcelWithMerge(records, columns, mergeKeys, numKeys, dateKeys, fileName, sheetName, columnHeaders, summaryConfig, topDescription, topDescriptionRowHeight) {
+function exportToExcelWithMerge(records, columns, mergeKeys, numKeys, dateKeys, fileName, sheetName, columnHeaders, summaryConfig, topDescription, topDescriptionRowHeight, childrenColumnName) {
     if (fileName === void 0) { fileName = "export.xlsx"; }
     if (sheetName === void 0) { sheetName = "Sheet1"; }
-    return exportToExcelWithMergeAndComments(records, columns, mergeKeys, numKeys, dateKeys, fileName, sheetName, columnHeaders, summaryConfig, topDescription, topDescriptionRowHeight);
+    if (childrenColumnName === void 0) { childrenColumnName = "children"; }
+    return exportToExcelWithMergeAndComments(records, columns, mergeKeys, numKeys, dateKeys, fileName, sheetName, columnHeaders, summaryConfig, topDescription, topDescriptionRowHeight, childrenColumnName);
 }
 /**
  * 简化版本的导出函数
  */
 function exportToExcelSimple(records, config) {
-    return exportToExcelWithMerge(records, config.columns || [], config.mergeKeys, config.numKeys || [], config.dateKeys, config.fileName || "export.xlsx", config.sheetName || "Sheet1", config.columnHeaders, config.summaryConfig, config.topDescription, config.topDescriptionRowHeight);
+    return exportToExcelWithMerge(records, config.columns || [], config.mergeKeys, config.numKeys || [], config.dateKeys, config.fileName || "export.xlsx", config.sheetName || "Sheet1", config.columnHeaders, config.summaryConfig, config.topDescription, config.topDescriptionRowHeight, config.childrenColumnName || "children");
 }
 /**
  * Hook 版本，支持选择导出方式
  */
 function useExcelExport(records, config) {
-    var columns = config.columns, isAutoMerge = config.isAutoMerge, columnHeaders = config.columnHeaders, summaryConfig = config.summaryConfig;
+    var columns = config.columns, isAutoMerge = config.isAutoMerge, columnHeaders = config.columnHeaders, summaryConfig = config.summaryConfig, childrenColumnName = config.childrenColumnName;
     var mergeKeys = useMergeKeys(columns, isAutoMerge);
     var numKeys = useNumKeys(columns);
     var dateKeys = useDateKeys(columns);
@@ -607,6 +659,7 @@ function useExcelExport(records, config) {
             summaryConfig: summaryConfig,
             topDescription: topDescription,
             topDescriptionRowHeight: topDescriptionRowHeight,
+            childrenColumnName: childrenColumnName,
         });
     });
     return exportFunction;

package/dist/es/table/table.js

@@ -40,8 +40,9 @@ import { DndProvider } from '../node_modules/react-dnd/dist/core/DndProvider.js'
 // completed: 过滤功能
 // completed: 实现从execl复制到表格中的功能
 var Table = function (props) {
+    var _a;
     // console.log("表格渲染");
-    var className = props.className, _a = props.bordered, bordered = _a === void 0 ? true : _a, _b = props.pagination, pagination = _b === void 0 ? false : _b, isFlex = props.isFlex; props.tablePreferences; var dynamicKey = props.dynamicKey, dynamicVersion = props.dynamicVersion, customDynamicListHandle = props.customDynamicListHandle, isRemeberFilter = props.isRemeberFilter, _c = props.isOrderUpdateData, isOrderUpdateData = _c === void 0 ? true : _c, hiddenDynamicIcon = props.hiddenDynamicIcon, _columns = props.columns, dataSource = props.dataSource, onTableChange = props.onTableChange, isEdit = props.isEdit, isMove = props.isMove, isAdd = props.isAdd, hiddenAddBtnHandle = props.hiddenAddBtnHandle, _d = props.isTheadTitleAdd, isTheadTitleAdd = _d === void 0 ? true : _d, addMode = props.addMode, addCallback = props.addCallback, isDel = props.isDel, delPopTitle = props.delPopTitle, hiddenDelBtnHandle = props.hiddenDelBtnHandle, _e = props.isDelAll, isDelAll = _e === void 0 ? true : _e, isAddAndDelAuto = props.isAddAndDelAuto, summaryConfig = props.summaryConfig, _f = props.summaryFixed, summaryFixed = _f === void 0 ? true : _f, isInnerPagination = props.isInnerPagination, _g = props.innerPaginationPageSize, innerPaginationPageSize = _g === void 0 ? 30 : _g, _h = props.innerPaginationPosition, innerPaginationPosition = _h === void 0 ? INNER_TABLE_PAGINATION_POSITION : _h, _j = props.innerPaginationPageSizeOptions, innerPaginationPageSizeOptions = _j === void 0 ? INNER_TABLE_PAGINATION_PAGESIZEOPTIONS : _j, innerPaginationConfig = props.innerPaginationConfig, tableRefHandle = props.tableRefHandle, tableName = props.tableName, serviceOrder = props.serviceOrder, differences = props.differences, virtualKey = props.virtualKey, _k = props.isResizableColumn, isResizableColumn = _k === void 0 ? true : _k, _l = props.isResizableTitleEllipsis, isResizableTitleEllipsis = _l === void 0 ? true : _l, _m = props.isRealTimeValidate, isRealTimeValidate = _m === void 0 ? true : _m, isMarginTop = props.isMarginTop, isMarginBottom = props.isMarginBottom, scroll = props.scroll, addAndDelProps = props.addAndDelProps, _o = props.autoScrollYMarginBottom, autoScrollYMarginBottom = _o === void 0 ? 65 : _o, _p = props.isAutoScrollY, isAutoScrollY = _p === void 0 ? false : _p, 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, _q = props.isExportSummary, isExportSummary = _q === void 0 ? true : _q, isAutoMergeAddAndDel = props.isAutoMergeAddAndDel, 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"]);
+    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, 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"]);
     var classes = classNames("ztxk-table", className, {
         "ztxk-table--flex": isFlex,
     });
@@ -53,25 +54,25 @@ var Table = function (props) {
         id: menuId,
     }).show;
     // 针对SCU和增减行 做特殊处理
-    var _r = useScuRfresh(), refreshScuCell = _r.refreshScuCell, getRefreshScuCell = _r.getRefreshScuCell;
+    var _s = useScuRfresh(), refreshScuCell = _s.refreshScuCell, getRefreshScuCell = _s.getRefreshScuCell;
     // 做一些前置处理
     // 比如过滤某些列 不做展示
     var columns = useParseColumns(_columns);
     // 得到动态列配置信息
-    var _s = useDynamicListByColumns(columns, {
+    var _t = useDynamicListByColumns(columns, {
         dynamicKey: dynamicKey,
         dynamicVersion: dynamicVersion,
         customDynamicListHandle: customDynamicListHandle,
-    }), defaultDynamicList = _s.defaultDynamicList, onCurrentListChange = _s.onCurrentListChange, currentDynamicList = _s.currentDynamicList, dynamicSettingRef = _s.dynamicSettingRef;
+    }), defaultDynamicList = _t.defaultDynamicList, onCurrentListChange = _t.onCurrentListChange, currentDynamicList = _t.currentDynamicList, dynamicSettingRef = _t.dynamicSettingRef;
     // 因为内部分页需要知晓当前页面的数据展示，要不然数据排序就跟内部分页没关系了
     // 自定义排序方法
-    var _t = useCustomSort(dataSource, onTableChange, {
+    var _u = useCustomSort(dataSource, onTableChange, {
         refreshScuCell: refreshScuCell,
         rowKey: props === null || props === void 0 ? void 0 : props.rowKey,
         serviceOrder: serviceOrder,
         isOrderUpdateData: isOrderUpdateData,
         isAutoMerge: isAutoMerge,
-    }), order = _t.order, setOrder = _t.setOrder, customSortHandle = _t.customSortHandle, sortDataSource = _t.sortDataSource;
+    }), order = _u.order, setOrder = _u.setOrder, customSortHandle = _u.customSortHandle, sortDataSource = _u.sortDataSource;
     // 当前表格展示的数据
     // 如果开启了前端排序的话，排序后的数据，可能会影响到很多地方。
     // 所以后续操作的数据 应该用
@@ -98,12 +99,12 @@ var Table = function (props) {
         return scroll || {};
     }, [scroll, currentTableDataSource, virtualKey, scrolly, isAutoScrollY]);
     // 内部分页相关配置
-    var _u = useInnerPagination(isInnerPagination, innerPaginationPageSize, {
+    var _v = useInnerPagination(isInnerPagination, innerPaginationPageSize, {
         innerPaginationPosition: innerPaginationPosition,
         innerPaginationPageSizeOptions: innerPaginationPageSizeOptions,
         innerPaginationConfig: innerPaginationConfig,
         dataSource: currentTableDataSource,
-    }), paginationConfig = _u.paginationConfig, currentPage = _u.currentPage, setCurrent = _u.setCurrent, pageSize = _u.pageSize;
+    }), paginationConfig = _v.paginationConfig, currentPage = _v.currentPage, setCurrent = _v.setCurrent, pageSize = _v.pageSize;
     // 内部表格编辑事件
     var onEditableSave = useEditChange(dataSourceRef, onTableChange);
     // 记录表头过滤的一些配置（通过ref记录，key => filter） 复制整列、过滤后修改数据，需要先走过滤
@@ -131,9 +132,9 @@ var Table = function (props) {
         filterConfigRef: filterConfigRef,
     });
     // 表格内部自定义处理过滤，不走antd内部
-    var _v = useCustomFilter(currentTableDataSource), filterDataSource = _v[0], handleFilterConfigChange = _v[1];
+    var _w = useCustomFilter(currentTableDataSource), filterDataSource = _w[0], handleFilterConfigChange = _w[1];
     // 处理列配置信息 得到新的列配置信息
-    var _w = useColumns(columns, {
+    var _x = useColumns(columns, {
         // 动态列配置相关信息
         dynamicKey: dynamicKey,
         isRemeberFilter: isRemeberFilter,
@@ -176,14 +177,14 @@ var Table = function (props) {
         isAutoMerge: isAutoMerge,
         handleFilterConfigChange: handleFilterConfigChange,
         isAutoMergeAddAndDel: isAutoMergeAddAndDel,
-    }), _newColumns = _w.newColumns, newRowSelection = _w.rowSelection;
+    }), _newColumns = _x.newColumns, newRowSelection = _x.rowSelection;
     // 处理表格合并和维度
-    var _x = useAutoMerge(filterDataSource, _newColumns, {
+    var _y = useAutoMerge(filterDataSource, _newColumns, {
         isAutoMerge: isAutoMerge,
         isDimensionDynamic: isDimensionDynamic,
         order: order,
         dimensionCustomSumKeys: dimensionCustomSumKeys,
-    }), newDataSource = _x[0], newColumns = _x[1];
+    }), newDataSource = _y[0], newColumns = _y[1];
     // 内部表格总结栏
     var getSummaryHandle = useSummary(summaryConfig, newColumns, {
         summaryFixed: summaryFixed,
@@ -193,7 +194,7 @@ var Table = function (props) {
         isDel: isDel,
     });
     // 表格验证
-    var _y = useTableValidate(), tableRef = _y.tableRef, getCurrentTable = _y.getCurrentTable, clearErrorClass = _y.clearErrorClass;
+    var _z = useTableValidate(), tableRef = _z.tableRef, getCurrentTable = _z.getCurrentTable, clearErrorClass = _z.clearErrorClass;
     // 使用 ref 缓存最新的滚动位置，确保在组件卸载过程中仍能访问
     var scrollPositionRef = useRef({ x: 0, y: 0 });
     // 滚动条控制方法
@@ -326,6 +327,7 @@ var Table = function (props) {
         columns: newColumns,
         isAutoMerge: isAutoMerge,
         summaryConfig: isExportSummary ? summaryConfig : undefined,
+        childrenColumnName: (_a = props.expandable) === null || _a === void 0 ? void 0 : _a.childrenColumnName,
     });
     // 暴露给外部一些方法
     useImperativeHandle(tableRefHandle, function () {
@@ -398,7 +400,7 @@ var Table = function (props) {
         };
     });
     // 全屏的一些方法
-    var _z = useState(false), isFull = _z[0], setIsFull = _z[1];
+    var _0 = useState(false), isFull = _0[0], setIsFull = _0[1];
     var fullscreenHandle = useMemoizedFn(function (isFull) {
         isFullscreenHandle === null || isFullscreenHandle === void 0 ? void 0 : isFullscreenHandle(isFull);
         setIsFull(isFull);

package/package.json

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