zmdms-webui 1.9.2 → 1.9.3

package/dist/es/dynamicsetting/dynamicDrawer.js

@@ -97,9 +97,6 @@ var DynamicDrawer = function (props, ref) {
     // 子元素拖拽
     var onChildMoveItem = useCallback(function (pIndex, pKey) {
         return function (dragIndex, hoverIndex) {
-            if (!isDimensionPriority(dragIndex, hoverIndex)) {
-                return;
-            }
             // 由于对于固定列，不能进行拖拽排序，所以需要找出所有包含固定列的属性出来
             setTempDynamicList(function (preDynamicList) {
                 var newDynamicList = preDynamicList.map(function (item) { return (__assign({}, item)); }) || [];

package/dist/es/dynamicsetting/index.css

@@ -1 +1 @@
-.zt-sortable{cursor:move;font-size:13px;line-height:38px;overflow:hidden;text-align:left}.zt-sortable .zt-sortable--item{align-items:center;display:flex;justify-content:space-between;padding:0 16px}.zt-sortable .zt-sortable--children{display:flex}.zt-sortable .zt-sortable--children .zt-sortable{border-bottom:none;padding:0 26px}.zt-sortable.no-move{cursor:no-drop}.zt-sortable .zt-checkbox{font-size:13px}.zt-sortable:hover{background-color:#ebf3fe}.ztxk-dynamic--more{cursor:pointer;height:20px}.ant-dropdown-show-arrow.ztxk-dynamic--more--drop{padding-top:0}.ztxk-dynamic--more--drop.ant-dropdown-placement-bottomRight>.ant-dropdown-arrow{top:-5px}.dynamic-drawer .ant-drawer-header{padding:10px 12px}.dynamic-drawer .ant-drawer-header .ant-drawer-title>div{align-items:center;color:#768696;display:flex;font-size:16px}.dynamic-drawer .ant-drawer-header .ant-drawer-title>div .search-drawer--title-text{font-size:14px;margin-left:10px}.dynamic-drawer .ant-drawer-header .ant-drawer-title>div .search-drawer--title-text>span{font-size:13px}.dynamic-drawer .ant-drawer-body{padding:0}.dynamic-drawer .ant-drawer-body .ant-checkbox-group{width:100%}.dynamic-drawer .ant-drawer-footer{border-top:none;display:flex;justify-content:space-between;padding:0}.dynamic-drawer .ant-drawer-footer>button{border:none;border-radius:0;height:40px;width:33%}.dynamic-drawer-section-title{background:#f5f5f5;border-radius:6px;font-size:14px;font-weight:700;padding:4px}
+.zt-sortable-new{cursor:move;font-size:13px;line-height:1.5;overflow:hidden;padding:8px 0;text-align:left}.zt-sortable-new .zt-sortable--item{align-items:center;display:flex;justify-content:space-between;padding:0 16px}.zt-sortable-new .zt-sortable--children{display:flex}.zt-sortable-new .zt-sortable--children .zt-sortable-new{border-bottom:none;padding:8px 26px}.zt-sortable-new.no-move{cursor:no-drop}.zt-sortable-new .zt-checkbox{font-size:13px}.zt-sortable-new:hover{background-color:#ebf3fe}.ztxk-dynamic--more{cursor:pointer;height:20px}.ant-dropdown-show-arrow.ztxk-dynamic--more--drop{padding-top:0}.ztxk-dynamic--more--drop.ant-dropdown-placement-bottomRight>.ant-dropdown-arrow{top:-5px}.dynamic-drawer .ant-drawer-header{padding:10px 12px}.dynamic-drawer .ant-drawer-header .ant-drawer-title>div{align-items:center;color:#768696;display:flex;font-size:16px}.dynamic-drawer .ant-drawer-header .ant-drawer-title>div .search-drawer--title-text{font-size:14px;margin-left:10px}.dynamic-drawer .ant-drawer-header .ant-drawer-title>div .search-drawer--title-text>span{font-size:13px}.dynamic-drawer .ant-drawer-body{padding:0}.dynamic-drawer .ant-drawer-body .ant-checkbox-group{width:100%}.dynamic-drawer .ant-drawer-footer{border-top:none;display:flex;justify-content:space-between;padding:0}.dynamic-drawer .ant-drawer-footer>button{border:none;border-radius:0;height:40px;width:33%}.dynamic-drawer-section-title{background:#f5f5f5;border-radius:6px;font-size:14px;font-weight:700;padding:4px}

package/dist/es/dynamicsetting/sortable.js

@@ -8,7 +8,7 @@ import { useDrag } from '../node_modules/react-dnd/dist/hooks/useDrag/useDrag.js
 var Sortable = function (_a) {
     var type = _a.type, onMoveItem = _a.onMoveItem, index = _a.index, id = _a.id, children = _a.children, style = _a.style, className = _a.className;
     var ref = useRef(null);
-    var classes = classNames("zt-sortable", className, {});
+    var classes = classNames("zt-sortable-new", className, {});
     /**
      * @description 定义可放置对象
      */

package/dist/es/table/excel.js

@@ -3,12 +3,13 @@ import { x as xlsx_minExports } from '../node_modules/xlsx-js-style/dist/xlsx.mi
 import { useMergeKeys } from './hooks.js';
 import { useMemo } from 'react';
 import { useMemoizedFn } from 'ahooks';
-import { MERGE_ROW_SPANS } from './constant.js';
+import { IS_SUMMARY, MERGE_ROW_SPANS } from './constant.js';
 
 /**
  * 导出Excel，支持维度合并和小计
  */
 function exportToExcelWithMerge(records, columns, mergeKeys, summaryKeys, fileName, sheetName, columnHeaders, summaryConfig) {
+    var _a;
     if (fileName === void 0) { fileName = "export.xlsx"; }
     if (sheetName === void 0) { sheetName = "Sheet1"; }
     if (!records || records.length === 0) {
@@ -29,6 +30,8 @@ function exportToExcelWithMerge(records, columns, mergeKeys, summaryKeys, fileNa
             if (col.isSummary) {
                 var total = 0;
                 for (var i = 0; i < processedData.length; i++) {
+                    if (processedData[i][IS_SUMMARY])
+                        continue;
                     var v = processedData[i][key];
                     var n = typeof v === "number" ? v : Number(v);
                     if (!isNaN(n))
@@ -48,7 +51,7 @@ function exportToExcelWithMerge(records, columns, mergeKeys, summaryKeys, fileNa
             return "";
         });
         // 生成用于样式应用的数据（追加一条 __is_summary__ 行）
-        var summaryDataObj_1 = { __is_summary__: true };
+        var summaryDataObj_1 = (_a = {}, _a[IS_SUMMARY] = true, _a);
         Object.keys(sumsByKey_1).forEach(function (k) {
             summaryDataObj_1[k] = sumsByKey_1[k];
         });
@@ -56,6 +59,8 @@ function exportToExcelWithMerge(records, columns, mergeKeys, summaryKeys, fileNa
     }
     // 5. 创建工作表（带末尾合计行）
     var worksheet = createWorksheetWithMerge(__assign(__assign({}, excelData), { summaryRow: summaryRow }), mergeKeys);
+    // 5.1 根据 columns 的 fixed 与表头行数设置冻结窗格（左列 + 表头行）
+    setWorksheetFreeze(worksheet, excelData.leafColumns, excelData.headerRowCount);
     // 6. 添加样式（合计行高亮）
     applyExcelStyles(worksheet, dataForStyles, mergeKeys, summaryKeys, excelData.leafColumns, excelData.headerRowCount);
     // 7. 添加工作表到工作簿
@@ -68,6 +73,44 @@ function exportToExcelWithMerge(records, columns, mergeKeys, summaryKeys, fileNa
         fileName: fileName,
     };
 }
+function setWorksheetFreeze(worksheet, leafColumns, headerRowCount) {
+    try {
+        // 计算左侧固定列数量
+        var leftFrozenCount = leafColumns.filter(function (col) { return (col === null || col === void 0 ? void 0 : col.fixed) === "left"; }).length;
+        var ySplit = headerRowCount || 0;
+        var xSplit = leftFrozenCount || 0;
+        console.log("Freeze info:", {
+            ySplit: ySplit,
+            xSplit: xSplit,
+            headerRowCount: headerRowCount,
+            leftFrozenCount: leftFrozenCount,
+        });
+        if (ySplit > 0 || xSplit > 0) {
+            // 方法1：使用标准的 !freeze 属性（推荐）
+            // worksheet["!freeze"] = {
+            //   xSplit,
+            //   ySplit,
+            // };
+            // 方法2：如果方法1不生效，尝试使用 !panes 属性
+            worksheet["!panes"] = {
+                x: xSplit,
+                y: ySplit,
+                topLeftCell: xlsx_minExports.utils.encode_cell({ r: ySplit, c: xSplit }),
+            };
+            // 方法3：直接设置冻结信息到工作表
+            // if (!worksheet["!freeze"]) {
+            //   worksheet["!freeze"] = {};
+            // }
+            // worksheet["!freeze"].xSplit = xSplit;
+            // worksheet["!freeze"].ySplit = ySplit;
+            console.log("Freeze set:", worksheet["!freeze"]);
+        }
+    }
+    catch (e) {
+        console.error("设置冻结窗格失败:", e);
+        // 不影响导出，继续执行
+    }
+}
 /**
  * 准备Excel数据（支持分组表头，构建多行表头与合并范围）
  */

package/dist/es/table/hooks.js

@@ -353,13 +353,31 @@ function useCalcScrollY(isAutoScrollY, subHeight, id) {
     }, [isAutoScrollY, subHeight, id]);
     return tableHeight;
 }
+// 扁平化多级表头，获取叶子列
+function getLeafColumns(columns) {
+    var leafColumns = [];
+    var walk = function (nodes) {
+        var _a;
+        (_a = nodes === null || nodes === void 0 ? void 0 : nodes.forEach) === null || _a === void 0 ? void 0 : _a.call(nodes, function (n) {
+            if (Array.isArray(n === null || n === void 0 ? void 0 : n.children) && n.children.length > 0) {
+                walk(n.children);
+            }
+            else {
+                leafColumns.push(n);
+            }
+        });
+    };
+    walk(columns);
+    return leafColumns;
+}
 /**
  * 获取合并key值
  */
 var useMergeKeys = function (columns, isAutoMerge) {
     var mergeKeys = useMemo(function () {
         if (isAutoMerge) {
-            return Array.from(new Set(columns
+            var leafColumns = getLeafColumns(columns);
+            return Array.from(new Set(leafColumns
                 .filter(function (item) { return item.isMerge && item.key !== MERGE_INDEX; })
                 .map(function (item) { return (item.mergeKey || item.key); })));
         }
@@ -377,11 +395,13 @@ function useAutoMerge(dataSource, columns, _a) {
     var firstMergeKey = mergeKeys === null || mergeKeys === void 0 ? void 0 : mergeKeys[0];
     // 需要合计的字段
     var summaryKeys = useMemo(function () {
-        return columns.filter(function (item) { return item.isSummary; }).map(function (item) { return item.key; });
+        var leafColumns = getLeafColumns(columns);
+        return leafColumns.filter(function (item) { return item.isSummary; }).map(function (item) { return item.key; });
     }, [columns]);
     // 开启维度合并的维度字段
     var dimensionSummaryKeys = useMemo(function () {
-        return columns
+        var leafColumns = getLeafColumns(columns);
+        return leafColumns
             .filter(function (item) { return item.isDimensionSum; })
             .map(function (item) { return item.key; });
     }, [columns]);

package/dist/es/table/useSummary.js

@@ -144,10 +144,6 @@ function getSubtotalObj(fields, dataSource) {
                 summaryTotalObj[field] = summaryItem
                     ? plus(summaryItem, dataItem)
                     : dataItem;
-                // 合计添加千分符
-                if (summaryTotalObj[field]) {
-                    summaryTotalObj[field] = addThousedSeparator(summaryTotalObj[field]);
-                }
             }
             else {
                 var key = field.key, showKey = field.showKey, toFixedNum_1 = field.toFixedNum, value = field.value, callback = field.callback;
@@ -240,13 +236,20 @@ function getSubtotalObj(fields, dataSource) {
                 summaryTotalConfigObj[key] = {
                     align: field === null || field === void 0 ? void 0 : field.align,
                 };
-                // 合计添加千分符
-                if (summaryTotalObj[key]) {
-                    summaryTotalObj[key] = addThousedSeparator(summaryTotalObj[key]);
-                }
             }
         });
     });
+    Object.keys(summaryTotalObj).forEach(function (key) {
+        if (summaryTotalObj[key] !== undefined) {
+            var value = summaryTotalObj[key];
+            var isNumericLike = function (v) {
+                return typeof v === "number" || (typeof v === "string" && !isNaN(Number(v)));
+            };
+            if (isNumericLike(value)) {
+                summaryTotalObj[key] = addThousedSeparator(value);
+            }
+        }
+    });
     return {
         summaryTotalObj: summaryTotalObj,
         summaryTotalConfigObj: summaryTotalConfigObj,