zmdms-webui 1.8.2 → 1.8.4

package/dist/es/table/excel.js

@@ -0,0 +1,273 @@
+import { __spreadArray, __assign } from '../_virtual/_tslib.js';
+import { x as xlsx_minExports } from '../node_modules/xlsx-js-style/dist/xlsx.min.js';
+import { useMergeKeys } from './hooks.js';
+import { useMemo } from 'react';
+import { useMemoizedFn } from 'ahooks';
+import { MERGE_ROW_SPANS } from './constant.js';
+
+/**
+ * 导出Excel，支持维度合并和小计
+ */
+function exportToExcelWithMerge(records, columns, mergeKeys, summaryKeys, fileName, sheetName, columnHeaders) {
+    if (fileName === void 0) { fileName = "export.xlsx"; }
+    if (sheetName === void 0) { sheetName = "Sheet1"; }
+    if (!records || records.length === 0) {
+        throw new Error("没有数据可导出");
+    }
+    var processedData = records;
+    // 2. 准备Excel数据
+    var excelData = prepareExcelData(processedData, columns, columnHeaders);
+    // 3. 创建工作簿
+    var workbook = xlsx_minExports.utils.book_new();
+    // 4. 创建工作表
+    var worksheet = createWorksheetWithMerge(excelData, mergeKeys);
+    // 5. 添加样式（合计行高亮）
+    applyExcelStyles(worksheet, excelData.data, mergeKeys, summaryKeys, excelData.columns);
+    // 6. 添加工作表到工作簿
+    xlsx_minExports.utils.book_append_sheet(workbook, worksheet, sheetName);
+    // 7. 导出文件
+    xlsx_minExports.writeFile(workbook, fileName, { bookType: "xlsx" });
+    return {
+        totalRows: excelData.data.length,
+        summaryRows: excelData.data.filter(function (row) { return row.__is_summary__; }).length,
+        fileName: fileName,
+    };
+}
+/**
+ * 准备Excel数据
+ */
+function prepareExcelData(processedData, columns, columnHeaders) {
+    // 过滤有效的列配置
+    var validColumns = columns.filter(function (item) {
+        return typeof item.dataIndex === "string" &&
+            typeof (item.dynamicTitle || item.title) === "string";
+    });
+    // 准备表头
+    var headers = validColumns.map(function (item) {
+        if (typeof item.dataIndex === "string") {
+            if (columnHeaders === null || columnHeaders === void 0 ? void 0 : columnHeaders[item.dataIndex]) {
+                return columnHeaders[item.dataIndex];
+            }
+        }
+        return (item.dynamicTitle || item.title);
+    });
+    return {
+        headers: headers,
+        data: processedData,
+        columns: validColumns,
+    };
+}
+/**
+ * 创建带合并单元格的工作表
+ */
+function createWorksheetWithMerge(excelData, mergeKeys) {
+    var _a;
+    var headers = excelData.headers, data = excelData.data, columns = excelData.columns;
+    // 创建工作表数据（包含表头）
+    var worksheetData = __spreadArray([
+        headers
+    ], data.map(function (row) {
+        return columns.map(function (item) {
+            var value = row[item.dataIndex];
+            // 处理数值类型
+            if (typeof value === "number") {
+                return value;
+            }
+            // 处理字符串类型，避免空值
+            return value != null ? String(value) : "";
+        });
+    }), true);
+    // 创建工作表
+    var worksheet = xlsx_minExports.utils.aoa_to_sheet(worksheetData);
+    // 设置列宽
+    var columnWidths = columns.map(function (col) {
+        var _a;
+        return ({
+            wch: Math.max(15, ((_a = ((col.dynamicTitle || col.title))) === null || _a === void 0 ? void 0 : _a.length) * 2),
+        });
+    });
+    worksheet["!cols"] = columnWidths;
+    // 添加合并单元格
+    var merges = [];
+    if (mergeKeys && mergeKeys.length > 0) {
+        var _loop_1 = function (colIndex) {
+            var mergeKey = mergeKeys[colIndex];
+            var excelColIndex = columns.findIndex(function (item) { return item.dataIndex === mergeKey; });
+            if (excelColIndex === -1) {
+                return "continue";
+            }
+            for (var rowIndex = 0; rowIndex < data.length; rowIndex++) {
+                var rowData = data[rowIndex];
+                var spanCount = (_a = rowData[MERGE_ROW_SPANS]) === null || _a === void 0 ? void 0 : _a[mergeKey];
+                // 如果合并数量大于1，添加合并单元格
+                if (spanCount && spanCount > 1) {
+                    var mergeRange = {
+                        s: { r: rowIndex + 1, c: excelColIndex },
+                        e: { r: rowIndex + spanCount, c: excelColIndex }, // 修复合并范围
+                    };
+                    merges.push(mergeRange);
+                }
+            }
+        };
+        // 处理每个合并字段
+        for (var colIndex = 0; colIndex < mergeKeys.length; colIndex++) {
+            _loop_1(colIndex);
+        }
+    }
+    worksheet["!merges"] = merges;
+    return worksheet;
+}
+/**
+ * 应用Excel样式 - 修复版本
+ */
+function applyExcelStyles(worksheet, data, mergeKeys, summaryKeys, columns) {
+    var _a;
+    // 修复1：定义样式对象，确保格式正确
+    var headerStyle = {
+        font: { bold: true, color: { rgb: "FFFFFF" } },
+        fill: { patternType: "solid", fgColor: { rgb: "4F81BD" } },
+        alignment: { horizontal: "center", vertical: "center" },
+        border: {
+            top: { style: "thin", color: { rgb: "000000" } },
+            bottom: { style: "thin", color: { rgb: "000000" } },
+            left: { style: "thin", color: { rgb: "000000" } },
+            right: { style: "thin", color: { rgb: "000000" } },
+        },
+    };
+    var summaryStyle = {
+        font: { bold: true, color: { rgb: "000000" } },
+        fill: { patternType: "solid", fgColor: { rgb: "E6F3FF" } },
+        alignment: { horizontal: "center", vertical: "center" },
+        border: {
+            top: { style: "thin", color: { rgb: "000000" } },
+            bottom: { style: "thin", color: { rgb: "000000" } },
+            left: { style: "thin", color: { rgb: "000000" } },
+            right: { style: "thin", color: { rgb: "000000" } },
+        },
+    };
+    var normalStyle = {
+        alignment: { horizontal: "center", vertical: "center" },
+        border: {
+            top: { style: "thin", color: { rgb: "000000" } },
+            bottom: { style: "thin", color: { rgb: "000000" } },
+            left: { style: "thin", color: { rgb: "000000" } },
+            right: { style: "thin", color: { rgb: "000000" } },
+        },
+    };
+    // 修复2：获取工作表范围，添加默认范围处理
+    var range;
+    try {
+        range = xlsx_minExports.utils.decode_range(worksheet["!ref"] || "A1");
+    }
+    catch (e) {
+        // 如果没有!ref，手动计算范围
+        var maxCol = columns ? columns.length - 1 : 0;
+        var maxRow = data.length; // +1 for header, but 0-indexed
+        range = { s: { r: 0, c: 0 }, e: { r: maxRow, c: maxCol } };
+    }
+    // 修复3：应用表头样式，确保单元格存在
+    for (var col = range.s.c; col <= range.e.c; col++) {
+        var cellAddress = xlsx_minExports.utils.encode_cell({ r: 0, c: col });
+        // 确保单元格存在
+        if (!worksheet[cellAddress]) {
+            worksheet[cellAddress] = { v: "", t: "s" };
+        }
+        // 应用样式
+        worksheet[cellAddress].s = headerStyle;
+    }
+    // 修复4：应用数据行样式
+    for (var rowIndex = 0; rowIndex < data.length; rowIndex++) {
+        var rowData = data[rowIndex];
+        var isSubtotal = rowData.__is_summary__;
+        for (var col = range.s.c; col <= range.e.c; col++) {
+            var cellAddress = xlsx_minExports.utils.encode_cell({ r: rowIndex + 1, c: col });
+            // 确保单元格存在
+            if (!worksheet[cellAddress]) {
+                worksheet[cellAddress] = { v: "", t: "s" };
+            }
+            // 应用对应的样式，并根据列配置的对齐方式覆盖水平对齐
+            var baseStyle = isSubtotal ? summaryStyle : normalStyle;
+            var columnAlign = columns && Array.isArray(columns)
+                ? (_a = columns[col]) === null || _a === void 0 ? void 0 : _a.align
+                : undefined;
+            if (columnAlign === "left" ||
+                columnAlign === "right" ||
+                columnAlign === "center") {
+                worksheet[cellAddress].s = __assign(__assign({}, baseStyle), { alignment: __assign(__assign({}, baseStyle.alignment), { horizontal: columnAlign }) });
+            }
+            else {
+                worksheet[cellAddress].s = baseStyle;
+            }
+        }
+    }
+    // 修复5：设置数值列的格式，确保数值类型正确处理
+    if (summaryKeys && summaryKeys.length > 0 && columns) {
+        for (var rowIndex = 0; rowIndex < data.length; rowIndex++) {
+            var rowData = data[rowIndex];
+            var _loop_2 = function (summaryKey) {
+                var colIndex = columns.findIndex(function (col) { return col.dataIndex === summaryKey; });
+                if (colIndex === -1)
+                    return "continue";
+                var cellAddress = xlsx_minExports.utils.encode_cell({
+                    r: rowIndex + 1,
+                    c: colIndex,
+                });
+                var cellValue = rowData[summaryKey];
+                // 确保单元格存在并且值是数字
+                if (worksheet[cellAddress] &&
+                    (typeof cellValue === "number" || !isNaN(Number(cellValue)))) {
+                    // 确保单元格值是数字类型
+                    worksheet[cellAddress].v = Number(cellValue);
+                    worksheet[cellAddress].t = "n"; // 明确设置为数字类型
+                    // 应用数字格式
+                    worksheet[cellAddress].z = "#,##0.00"; // 千分位分隔符，保留两位小数
+                }
+            };
+            for (var _i = 0, summaryKeys_1 = summaryKeys; _i < summaryKeys_1.length; _i++) {
+                var summaryKey = summaryKeys_1[_i];
+                _loop_2(summaryKey);
+            }
+        }
+    }
+    // 修复6：确保工作表引用正确
+    if (!worksheet["!ref"]) {
+        var lastCol = Math.max(0, ((columns === null || columns === void 0 ? void 0 : columns.length) || 1) - 1);
+        var lastRow = data.length; // header + data rows
+        worksheet["!ref"] = xlsx_minExports.utils.encode_range({
+            s: { r: 0, c: 0 },
+            e: { r: lastRow, c: lastCol },
+        });
+    }
+}
+/**
+ * 导出Excel的简化版本（只提供必要参数）
+ */
+function exportToExcelSimple(records, config) {
+    return exportToExcelWithMerge(records, config.columns || [], config.mergeKeys, config.summaryKeys || [], config.fileName || "export.xlsx", config.sheetName || "Sheet1", config.columnHeaders);
+}
+/**
+ * excel导出
+ */
+function useExcelExport(records, config) {
+    var columns = config.columns, fileName = config.fileName, isAutoMerge = config.isAutoMerge, columnHeaders = config.columnHeaders;
+    // 计算需要合并的字段key集合
+    var mergeKeys = useMergeKeys(columns, isAutoMerge);
+    // 需要合计的字段
+    var summaryKeys = useMemo(function () {
+        return columns
+            .filter(function (item) { return item.isSummary; })
+            .map(function (item) { return item.dataIndex; });
+    }, [columns]);
+    var exportFunction = useMemoizedFn(function () {
+        exportToExcelSimple(records, {
+            columns: columns,
+            mergeKeys: mergeKeys,
+            summaryKeys: summaryKeys,
+            fileName: fileName,
+            columnHeaders: columnHeaders,
+        });
+    });
+    return exportFunction;
+}
+
+export { exportToExcelSimple, exportToExcelWithMerge, useExcelExport };

package/dist/es/table/hooks.js

@@ -337,7 +337,7 @@ var useMergeKeys = function (columns, isAutoMerge) {
         if (isAutoMerge) {
             return Array.from(new Set(columns
                 .filter(function (item) { return item.isMerge && item.key !== MERGE_INDEX; })
-                .map(function (item) { return item.mergeKey || item.key; })));
+                .map(function (item) { return (item.mergeKey || item.key); })));
         }
         return undefined;
     }, [isAutoMerge, columns]);
@@ -469,7 +469,6 @@ function useMergeAddAndDel(_a) {
         if (isAutoMerge) {
             return __assign(__assign({}, addAndDelProps), { onCell: function (record) {
                     var _a;
-                    console.log(record, firstMergeKey, "record");
                     return {
                         rowSpan: (_a = record === null || record === void 0 ? void 0 : record[MERGE_ROW_SPANS]) === null || _a === void 0 ? void 0 : _a[firstMergeKey],
                     };
@@ -480,4 +479,4 @@ function useMergeAddAndDel(_a) {
     return [newRowSelection, newAddAndDelProps];
 }
 
-export { useAddAndDelChange, useAutoMerge, useCalcScrollY, useCustomSort, useEditChange, useMergeAddAndDel, useMoveRowChange, useScuRfresh };
+export { useAddAndDelChange, useAutoMerge, useCalcScrollY, useCustomSort, useEditChange, useMergeAddAndDel, useMergeKeys, useMoveRowChange, useScuRfresh };

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

@@ -274,6 +274,10 @@ interface ITableRefHandel {
      * 重置
      */
     onResetDynamicList?: () => void;
+    /**
+     * 导出excel
+     */
+    exportExcel?: () => void;
 }
 interface ITableProps<RecordType> extends Omit<TableProps<RecordType>, "columns"> {
     /**

package/dist/es/table/table.js

@@ -22,6 +22,7 @@ import { HTML5Backend } from '../node_modules/react-dnd-html5-backend/dist/index
 import { VList, scrollTo } from '../node_modules/virtuallist-antd/dist/index.es.js';
 import useTableValidate, { tableValidate } from './useTableValidate.js';
 import TitleDirectionColumn from './components/TitleDirectionColumn.js';
+import { useExcelExport } from './excel.js';
 import DynamicSetting from '../dynamicsetting/dynamicSetting.js';
 import { DndProvider } from '../node_modules/react-dnd/dist/core/DndProvider.js';
 
@@ -241,6 +242,12 @@ var Table = function (props) {
         }
         return undefined;
     }, [differences]);
+    // 导出excel
+    var exportExcel = useExcelExport(newDataSource, {
+        columns: newColumns,
+        isAutoMerge: isAutoMerge,
+        fileName: "导出.xlsx",
+    });
     // 暴露给外部一些方法
     useImperativeHandle(tableRefHandle, function () {
         return {
@@ -293,6 +300,7 @@ var Table = function (props) {
                 var _a, _b;
                 (_b = (_a = dynamicSettingRef.current) === null || _a === void 0 ? void 0 : _a.updateList) === null || _b === void 0 ? void 0 : _b.call(_a, list);
             },
+            exportExcel: exportExcel,
         };
     });
     // 表格

package/dist/es/table/utils.js

@@ -456,7 +456,9 @@ function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summa
         return records;
     }
     // 0. 首先根据维度字段对数据进行排序
-    var result = sortByDimensions(__spreadArray([], records, true), mergeKeys);
+    var result = (dimensionSummaryKeys === null || dimensionSummaryKeys === void 0 ? void 0 : dimensionSummaryKeys.length) > 0
+        ? sortByDimensions(__spreadArray([], records, true), mergeKeys)
+        : __spreadArray([], records, true);
     // 1. 首先插入维度合计行
     if (dimensionSummaryKeys &&
         dimensionSummaryKeys.length > 0 &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-webui",
-  "version": "1.8.2",
+  "version": "1.8.4",
   "private": false,
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",
@@ -9,6 +9,8 @@
   "type": "module",
   "license": "MIT",
   "peerDependencies": {
+    "@tanstack/react-query": ">=5",
+    "@tanstack/react-query-devtools": ">=5",
     "ahooks": ">=3.7.8",
     "antd": ">=4.24.8",
     "dayjs": ">=1.11.7",
@@ -20,9 +22,7 @@
     "react-dom": ">=16.8.0",
     "react-resizable": "^3.0.5",
     "react-router-dom": ">=6",
-    "zmdms-utils": ">=0.0.1",
-    "@tanstack/react-query": ">=5",
-    "@tanstack/react-query-devtools": ">=5"
+    "zmdms-utils": ">=0.0.1"
   },
   "sideEffects": [
     "dist/es/**/style/*",
@@ -144,6 +144,8 @@
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
     "screenfull": "^6.0.2",
-    "virtuallist-antd": "^0.8.0-beta.1"
+    "virtuallist-antd": "^0.8.0-beta.1",
+    "xlsx": "^0.18.5",
+    "xlsx-js-style": "^1.2.0"
   }
 }