zmdms-webui 2.9.1 → 2.9.3

package/dist/es/container/container.js

@@ -26,7 +26,7 @@ var Container = function (props) {
     var titleContainerClasses = classNames("ztxk-container__content--main", {
         "ztxk-container__content--main--flex": isFlex,
     });
-    return (jsxs("div", __assign({ className: "ztxk-container", ref: containerRef, style: style }, { children: [!leftContentOut && leftContent ? (jsxs(LeftContentMemo.Wrap, __assign({ containerRef: leftContentContainerRef }, { children: [leftContent && (jsx(LeftContentMemo, __assign({ containerRef: leftContentContainerRef, defaultLeftOpen: defaultLeftOpen, width: defaultLeftWidth, isShow: true, showIcon: true }, leftContentProps, { children: leftContent }))), jsx(ContainerLoading, { loading: loading }), jsx("div", __assign({ className: classes }, { children: title ? (jsxs(Fragment, { children: [jsx(TitleCom, __assign({ title: title, bordered: true, whiteBg: true }, { children: titleChildren })), jsx("div", __assign({ className: titleContainerClasses }, { children: children }))] })) : (children) }))] }))) : (jsxs(Fragment, { children: [leftContent && (jsx(LeftContentMemo, __assign({ containerRef: containerRef, defaultLeftOpen: defaultLeftOpen, width: defaultLeftWidth, isShow: true, showIcon: true }, leftContentProps, { children: leftContent }))), jsx(ContainerLoading, { loading: loading }), jsx("div", __assign({ className: classes }, { children: title ? (jsxs(Fragment, { children: [jsx(TitleCom, __assign({ title: title, bordered: true, whiteBg: true }, { children: titleChildren })), jsx("div", __assign({ className: titleContainerClasses }, { children: children }))] })) : (children) }))] })), jsx(Footer, { footerDom: footerDom })] })));
+    return (jsxs("div", __assign({ className: "ztxk-container", ref: containerRef, style: style }, { children: [!leftContentOut && leftContent ? (jsxs(LeftContentMemo.Wrap, __assign({ containerRef: leftContentContainerRef }, { children: [leftContent && (jsx(LeftContentMemo, __assign({ containerRef: leftContentContainerRef, defaultLeftOpen: defaultLeftOpen, width: defaultLeftWidth, isShow: true, showIcon: true }, leftContentProps, { children: leftContent }))), jsx(ContainerLoading, { loading: loading }), jsx("div", __assign({ className: classes }, { children: title ? (jsxs(Fragment, { children: [jsx(TitleCom, __assign({ title: title, bordered: true, whiteBg: true }, { children: titleChildren })), jsx("div", __assign({ className: titleContainerClasses }, { children: children }))] })) : (children) }))] }))) : (jsxs(Fragment, { children: [leftContent && (jsx(LeftContentMemo, __assign({ containerRef: containerRef, defaultLeftOpen: defaultLeftOpen, width: defaultLeftWidth, isShow: true, showIcon: true }, leftContentProps, { children: leftContent }))), jsx(ContainerLoading, { loading: loading }), jsx("div", __assign({ className: classes }, { children: title ? (jsxs(Fragment, { children: [jsx(TitleCom, __assign({ title: title, bordered: true, whiteBg: true }, { children: titleChildren })), jsx("div", __assign({ className: titleContainerClasses }, { children: children }))] })) : (children) }))] })), footerDom ? (jsx(Footer, { footerDom: footerDom })) : null] })));
 };
 var ContainerButtonWrap = memo(function (_a) {
     var children = _a.children, isMarginTop = _a.isMarginTop, className = _a.className, isFlex = _a.isFlex, flexDirection = _a.flexDirection, flexJustify = _a.flexJustify, style = _a.style;

package/dist/es/table/excel.js

@@ -410,8 +410,15 @@ function createWorksheetWithMerge(workbook, excelData, mergeKeys, sheetName) {
     if (mergeKeys && mergeKeys.length > 0) {
         var _loop_1 = function (colIndex) {
             var mergeKey = mergeKeys[colIndex];
-            var excelColIndex = leafColumns.findIndex(function (item) { return item.dataIndex === mergeKey; });
-            if (excelColIndex === -1)
+            // 找到所有使用这个 mergeKey 的列（column.mergeKey === mergeKey 或 column.dataIndex/key === mergeKey）
+            var matchedColIndexes = leafColumns
+                .map(function (item, index) { return ({
+                index: index,
+                itemMergeKey: item.mergeKey || item.dataIndex || item.key,
+            }); })
+                .filter(function (item) { return item.itemMergeKey === mergeKey; })
+                .map(function (item) { return item.index; });
+            if (matchedColIndexes.length === 0)
                 return "continue";
             for (var rowIndex = 0; rowIndex < data.length; rowIndex++) {
                 var rowData = data[rowIndex];
@@ -422,8 +429,12 @@ function createWorksheetWithMerge(workbook, excelData, mergeKeys, sheetName) {
                 if (spanCount && spanCount > 1) {
                     var startRow = headerRowCount + rowIndex + 1;
                     var endRow = headerRowCount + rowIndex + spanCount;
-                    var col = excelColIndex + 1;
-                    worksheet.mergeCells(startRow, col, endRow, col);
+                    // 对所有匹配的列都执行合并
+                    for (var _b = 0, matchedColIndexes_1 = matchedColIndexes; _b < matchedColIndexes_1.length; _b++) {
+                        var excelColIndex = matchedColIndexes_1[_b];
+                        var col = excelColIndex + 1;
+                        worksheet.mergeCells(startRow, col, endRow, col);
+                    }
                 }
             }
         };

package/package.json

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