zmdms-webui 2.6.2 → 2.6.4

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

@@ -228,6 +228,52 @@ interface ICanvasRowSelection<RecordType = any> {
      */
     fixed?: boolean;
 }
+interface IExpandable<RecordType = any> {
+    /**
+     * 展开的keys集合
+     */
+    expandedRowKeys?: React__default.Key[];
+    /**
+     * 默认展开的keys集合
+     */
+    defaultExpandedRowKeys?: React__default.Key[];
+    /**
+     * 展开状态改变时的回调
+     */
+    onExpandedRowsChange?: (expandedKeys: React__default.Key[], row: RecordType, action: 'expand' | 'collapse') => void;
+    /**
+     * 是否默认展开所有行
+     */
+    defaultExpandAllRows?: boolean;
+    /**
+     * 展开图标的列索引（默认0，第一列）
+     */
+    expandIconColumnIndex?: number;
+    /**
+     * 自定义展开图标
+     */
+    expandIcon?: (params: {
+        expanded: boolean;
+        record: RecordType;
+        onExpand: (record: RecordType, expanded: boolean) => void;
+    }) => React__default.ReactNode;
+    /**
+     * 展开行的自定义渲染
+     */
+    expandedRowRender?: (params: {
+        record: RecordType;
+        index: number;
+        expanded: boolean;
+    }) => React__default.ReactNode;
+    /**
+     * 展开行的类名
+     */
+    expandedRowClassName?: (record: RecordType, index: number) => string;
+    /**
+     * 子节点数据的字段名（默认为'children'）
+     */
+    childrenColumnName?: string;
+}
 interface ICanvasTableProps<RecordType = any> {
     /**
      * 数据源
@@ -273,6 +319,10 @@ interface ICanvasTableProps<RecordType = any> {
      * 勾选配置
      */
     rowSelection?: ICanvasRowSelection<RecordType>;
+    /**
+     * 树形展开配置
+     */
+    expandable?: IExpandable<RecordType>;
     /**
      * 排序改变回调
      */
@@ -473,6 +523,26 @@ interface ICanvasTableRefHandle {
      * 设置选中的行keys
      */
     setSelectedRowKeys: (keys: React__default.Key[]) => void;
+    /**
+     * 获取展开的keys
+     */
+    getExpandedRowKeys: () => React__default.Key[];
+    /**
+     * 设置展开的keys
+     */
+    setExpandedRowKeys: (keys: React__default.Key[]) => void;
+    /**
+     * 展开指定行
+     */
+    expandRow: (key: React__default.Key) => void;
+    /**
+     * 收起指定行
+     */
+    collapseRow: (key: React__default.Key) => void;
+    /**
+     * 切换指定行展开状态
+     */
+    toggleExpandRow: (key: React__default.Key) => void;
     /**
      * 滚动到指定位置
      */
@@ -511,4 +581,4 @@ interface ICanvasTableRefHandle {
     clearFilter: () => void;
 }
 
-export { ColumnDataType, FilterConfig, IBadgeProps, ICanvasColumnType, ICanvasColumnsType, ICanvasRowSelection, ICanvasTableProps, ICanvasTableRefHandle, SortOrder };
+export { ColumnDataType, FilterConfig, IBadgeProps, ICanvasColumnType, ICanvasColumnsType, ICanvasRowSelection, ICanvasTableProps, ICanvasTableRefHandle, IExpandable, SortOrder };

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

@@ -0,0 +1,118 @@
+import { TEXT_PADDING, COLORS } from './constants.js';
+
+/**
+ * 渲染辅助工具函数
+ * 提供通用的渲染计算和绘制功能
+ */
+/**
+ * 计算文本X坐标（根据对齐方式）
+ */
+var calculateTextX = function (drawX, actualWidth, align, padding) {
+    if (align === void 0) { align = "left"; }
+    if (padding === void 0) { padding = TEXT_PADDING; }
+    if (align === "center") {
+        return drawX + actualWidth / 2;
+    }
+    else if (align === "right") {
+        return drawX + actualWidth - padding;
+    }
+    return drawX + padding;
+};
+/**
+ * 设置Canvas文本对齐方式
+ */
+var setTextAlign = function (ctx, align) {
+    if (align === void 0) { align = "left"; }
+    ctx.textAlign = align;
+};
+/**
+ * 计算固定列的右边界
+ */
+var calculateFixedColumnsRightEdge = function (columnRenderInfos, getColumnWidth) {
+    var rightEdge = 0;
+    columnRenderInfos.forEach(function (info, index) {
+        if (info.fixed) {
+            var actualWidth = getColumnWidth ? getColumnWidth(index) : info.width;
+            rightEdge = Math.max(rightEdge, info.fixedLeft + actualWidth);
+        }
+    });
+    return rightEdge;
+};
+/**
+ * 判断是否应该在Canvas中渲染
+ * 检查render函数的返回值类型
+ */
+var shouldRenderInCanvas = function (renderFn, cellValue, record, rowIndex, isSummaryRow) {
+    if (isSummaryRow === void 0) { isSummaryRow = false; }
+    // 合计行不应用 render 函数
+    if (isSummaryRow) {
+        return true;
+    }
+    // 如果没有 render 函数，在 Canvas 中渲染
+    if (!renderFn) {
+        return true;
+    }
+    var rendered = renderFn(cellValue, record, rowIndex);
+    // 如果返回的是字符串或数字，在 Canvas 中渲染
+    if (typeof rendered === "string" ||
+        typeof rendered === "number" ||
+        rendered === null ||
+        rendered === undefined) {
+        return true;
+    }
+    // 否则是自定义组件，应该在覆盖层渲染
+    return false;
+};
+var setupCellClip = function (params) {
+    var ctx = params.ctx, drawX = params.drawX, y = params.y, width = params.width, cellHeight = params.cellHeight, headerHeight = params.headerHeight, effectiveHeight = params.effectiveHeight, _a = params.fixedColumnsRightEdge, fixedColumnsRightEdge = _a === void 0 ? 0 : _a, isFixed = params.isFixed;
+    // 裁剪区域：确保不覆盖表头，从 headerHeight 开始
+    var clipY = Math.max(y, headerHeight);
+    // 计算单元格实际底部位置，并限制在可视区域内
+    var cellBottom = Math.min(y + cellHeight, effectiveHeight);
+    // 裁剪高度 = 单元格可见底部 - 裁剪起始位置
+    var clipHeight = Math.max(0, cellBottom - clipY);
+    // 对于非fixed列，还需要裁剪掉被fixed列遮挡的部分
+    var clipX = drawX;
+    var clipWidth = width;
+    if (!isFixed && fixedColumnsRightEdge > 0 && drawX < fixedColumnsRightEdge) {
+        // 调整裁剪区域，去掉被fixed列遮挡的部分
+        var overlap = fixedColumnsRightEdge - drawX;
+        if (overlap < width) {
+            clipX = fixedColumnsRightEdge;
+            clipWidth = width - overlap;
+        }
+    }
+    ctx.beginPath();
+    ctx.rect(clipX, clipY, clipWidth, clipHeight);
+    ctx.clip();
+    return { clipX: clipX, clipY: clipY, clipWidth: clipWidth, clipHeight: clipHeight };
+};
+var drawCellBackground = function (params) {
+    var ctx = params.ctx, clipX = params.clipX, clipY = params.clipY, clipWidth = params.clipWidth, clipHeight = params.clipHeight, isSelected = params.isSelected, isHover = params.isHover, isSummaryRow = params.isSummaryRow, isStriped = params.isStriped, rowIndex = params.rowIndex, customBgColor = params.customBgColor;
+    if (clipHeight > 0 && clipWidth > 0) {
+        var bgColor = void 0;
+        if (customBgColor) {
+            bgColor = customBgColor;
+        }
+        else if (isSelected) {
+            bgColor = COLORS.selectedBg;
+        }
+        else if (isSummaryRow) {
+            // 合计行使用表头背景色
+            bgColor = COLORS.headerBg;
+        }
+        else if (isHover) {
+            bgColor = COLORS.hoverBg;
+        }
+        else if (isStriped && rowIndex % 2 === 1) {
+            bgColor = COLORS.stripedBg;
+        }
+        else {
+            bgColor = COLORS.white;
+        }
+        ctx.fillStyle = bgColor;
+        ctx.fillRect(clipX, clipY, clipWidth, clipHeight);
+    }
+};
+
+export { calculateFixedColumnsRightEdge, calculateTextX, drawCellBackground, setTextAlign, setupCellClip, shouldRenderInCanvas };

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,7 +602,7 @@ function applyExcelStyles(worksheet, data, numKeys, dateKeys, columns, headerRow
                 var cellValue = rowData[dateKey.dataIndex];
                 if (cellValue) {
                     try {
-                        var date = dayjs(cellValue).toDate();
+                        var date = dayjs(String(cellValue)).toDate();
                         cell.value = date;
                         cell.numFmt = columns[colIndex].dateFormat;
                     }
@@ -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.2",
+  "version": "2.6.4",
   "private": false,
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",
@@ -41,7 +41,8 @@
     "test": "craco test",
     "eject": "craco eject",
     "storybook": "storybook dev -p 6006",
-    "build-storybook": "storybook build"
+    "build-storybook": "storybook build",
+    "publish:npm": "node publish.cjs"
   },
   "eslintConfig": {
     "extends": [