zmdms-webui 2.4.8 → 2.4.9

package/dist/es/canvastable/hooks/useTableInteraction.js

@@ -35,6 +35,7 @@ var useTableInteraction = function (params) {
             displayHeight: containerHeight,
             needHorizontalScrollbar: needHorizontalScrollbar,
             scrollbarSize: scrollbarSize,
+            mergeCellMap: mergeCellMap,
         });
     });
     // 处理选择框列的全选点击

package/dist/es/canvastable/hooks/useTableRender.js

@@ -621,7 +621,7 @@ var useTableRender = function (params) {
                     // 合计行选择框列显示文本（比如"合计"）
                     var dataIndex = column.dataIndex || column.key;
                     var cellValue = record[dataIndex];
-                    var cellText = formatCellValue(cellValue, column);
+                    var cellText = formatCellValue(cellValue, column, true);
                     if (cellText) {
                         ctx.fillStyle = COLORS.text;
                         ctx.font = "bold ".concat(FONT_SIZE, "px ").concat(FONT_FAMILY);
@@ -656,7 +656,7 @@ var useTableRender = function (params) {
                     // 应用格式化（日期、精度、千分符）
                     var cellText = void 0;
                     // 对于合计行，直接使用格式化函数，不应用render
-                    if (isSummaryRow) {
+                    if (isSummaryRow && column.key !== "__index__") {
                         cellText = formatCellValue(cellValue, column);
                     }
                     else {
@@ -800,8 +800,24 @@ var useTableRender = function (params) {
             ctx.stroke();
             ctx.lineWidth = 1; // 恢复为1px
         }
-        // 计算实际数据区域的底部位置
-        var dataBottomY = Math.min(headerHeight + dataRowCount * rowHeight - scrollState.scrollTop, displayHeight);
+        // 计算固定行占用的高度
+        var fixedTopRowsCount = fixedRowsCount || (fixedRowsConfig === null || fixedRowsConfig === void 0 ? void 0 : fixedRowsConfig.topCount) || 0;
+        var fixedBottomRowsCount = (fixedRowsConfig === null || fixedRowsConfig === void 0 ? void 0 : fixedRowsConfig.bottomCount) || 0;
+        var fixedSummaryHeight = summaryFixed && hasSummaryRow ? rowHeight : 0;
+        var fixedBottomHeight = fixedBottomRowsCount * rowHeight;
+        // 计算可滚动数据行的数量（排除固定行和合计行）
+        var scrollableDataRowCount = dataRowCount -
+            fixedTopRowsCount -
+            fixedBottomRowsCount -
+            (summaryFixed && hasSummaryRow ? 1 : 0);
+        // 计算实际数据区域的底部位置（考虑固定底部行和固定合计行）
+        var dataBottomY = Math.min(headerHeight +
+            fixedTopRowsCount * rowHeight +
+            scrollableDataRowCount * rowHeight -
+            scrollState.scrollTop, displayHeight -
+            (needHorizontalScrollbar ? SCROLLBAR_SIZE : 0) -
+            fixedBottomHeight -
+            fixedSummaryHeight);
         // 绘制垂直边框（只绘制body部分，从headerHeight开始，表头边框在drawHeaderCell中绘制）
         columnRenderInfos.forEach(function (info, colIndex) {
             var x = info.x, width = info.width, fixed = info.fixed, fixedLeft = info.fixedLeft;
@@ -823,9 +839,17 @@ var useTableRender = function (params) {
                 ctx.stroke();
             }
         });
+        // 绘制水平边框（只绘制实际数据行的边框）
+        var maxRow = Math.min(endRow, dataRowCount, fixedTopRowsCount + scrollableDataRowCount);
         var _loop_1 = function (i) {
-            var y = headerHeight + i * rowHeight - scrollState.scrollTop;
-            if (y >= headerHeight && y <= displayHeight) {
+            // 计算Y坐标时需要考虑固定顶部行
+            var y = headerHeight +
+                fixedTopRowsCount * rowHeight +
+                (i - fixedTopRowsCount) * rowHeight -
+                scrollState.scrollTop;
+            // 只绘制在可滚动数据区域内的边框
+            if (y >= headerHeight + fixedTopRowsCount * rowHeight &&
+                y <= dataBottomY) {
                 // 分段绘制，只绘制当前范围（fixed或非fixed）的边框
                 columnRenderInfos.forEach(function (info, colIndex) {
                     // 根据 onlyFixed 参数过滤
@@ -856,8 +880,7 @@ var useTableRender = function (params) {
                 });
             }
         };
-        // 绘制水平边框（只绘制实际数据行的边框）
-        for (var i = startRow; i <= endRow && i <= dataRowCount; i++) {
+        for (var i = startRow; i <= maxRow; i++) {
             _loop_1(i);
         }
         // 为合并单元格绘制底部边框
@@ -865,8 +888,8 @@ var useTableRender = function (params) {
             mergeCellMap.forEach(function (mergeInfo, key) {
                 if (!mergeInfo.skip && mergeInfo.rowSpan > 1) {
                     var rowIndex = mergeInfo.rowIndex, colIndex = mergeInfo.colIndex, rowSpan = mergeInfo.rowSpan;
-                    // 只绘制在可视范围内的
-                    if (rowIndex >= startRow && rowIndex <= endRow) {
+                    // 只绘制在可视范围内的且在数据区域内的
+                    if (rowIndex >= startRow && rowIndex <= maxRow) {
                         var columnInfo = columnRenderInfos[colIndex];
                         if (!columnInfo)
                             return;
@@ -880,11 +903,14 @@ var useTableRender = function (params) {
                             ? getColumnWidth(colIndex)
                             : width;
                         var drawX = fixed ? fixedLeft : x - scrollState.scrollLeft;
-                        // 绘制合并单元格的底边框
+                        // 绘制合并单元格的底边框，考虑固定顶部行
                         var bottomY = headerHeight +
-                            (rowIndex + rowSpan) * rowHeight -
+                            fixedTopRowsCount * rowHeight +
+                            (rowIndex + rowSpan - fixedTopRowsCount) * rowHeight -
                             scrollState.scrollTop;
-                        if (bottomY >= headerHeight && bottomY <= displayHeight) {
+                        // 只在数据区域内绘制
+                        if (bottomY >= headerHeight + fixedTopRowsCount * rowHeight &&
+                            bottomY <= dataBottomY) {
                             ctx.beginPath();
                             ctx.moveTo(drawX, bottomY);
                             ctx.lineTo(drawX + actualWidth, bottomY);

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

@@ -5,7 +5,7 @@
  * 获取鼠标位置对应的单元格
  */
 var getCellFromMousePosition = function (params) {
-    var x = params.x, y = params.y, headerHeight = params.headerHeight, rowHeight = params.rowHeight, scrollTop = params.scrollTop, scrollLeft = params.scrollLeft, columnRenderInfos = params.columnRenderInfos, dataLength = params.dataLength, _a = params.fixedTopRowsCount, fixedTopRowsCount = _a === void 0 ? 0 : _a, _b = params.fixedBottomRowsCount, fixedBottomRowsCount = _b === void 0 ? 0 : _b, _c = params.hasSummaryRow, hasSummaryRow = _c === void 0 ? false : _c, _d = params.summaryFixed, summaryFixed = _d === void 0 ? false : _d, _e = params.displayHeight, displayHeight = _e === void 0 ? 0 : _e, _f = params.needHorizontalScrollbar, needHorizontalScrollbar = _f === void 0 ? false : _f, _g = params.scrollbarSize, scrollbarSize = _g === void 0 ? 12 : _g;
+    var x = params.x, y = params.y, headerHeight = params.headerHeight, rowHeight = params.rowHeight, scrollTop = params.scrollTop, scrollLeft = params.scrollLeft, columnRenderInfos = params.columnRenderInfos, dataLength = params.dataLength, _a = params.fixedTopRowsCount, fixedTopRowsCount = _a === void 0 ? 0 : _a, _b = params.fixedBottomRowsCount, fixedBottomRowsCount = _b === void 0 ? 0 : _b, _c = params.hasSummaryRow, hasSummaryRow = _c === void 0 ? false : _c, _d = params.summaryFixed, summaryFixed = _d === void 0 ? false : _d, _e = params.displayHeight, displayHeight = _e === void 0 ? 0 : _e, _f = params.needHorizontalScrollbar, needHorizontalScrollbar = _f === void 0 ? false : _f, _g = params.scrollbarSize, scrollbarSize = _g === void 0 ? 12 : _g, mergeCellMap = params.mergeCellMap;
     // 判断是否在表头区域（row=-1表示表头）
     var rowIndex;
     if (y < headerHeight) {
@@ -20,7 +20,7 @@ var getCellFromMousePosition = function (params) {
             rowIndex = Math.floor(relativeY / rowHeight);
             if (rowIndex < 0 || rowIndex >= fixedTopRowsCount)
                 return null;
-            return findColumn(x, scrollLeft, columnRenderInfos, rowIndex);
+            return findColumn(x, scrollLeft, columnRenderInfos, rowIndex, mergeCellMap);
         }
         // 检查是否在固定合计行区域
         if (summaryFixed && hasSummaryRow && displayHeight > 0) {
@@ -30,7 +30,7 @@ var getCellFromMousePosition = function (params) {
             if (y >= summaryRowY) {
                 // 在固定合计行区域
                 rowIndex = dataLength - 1; // 合计行是最后一行
-                return findColumn(x, scrollLeft, columnRenderInfos, rowIndex);
+                return findColumn(x, scrollLeft, columnRenderInfos, rowIndex, mergeCellMap);
             }
         }
         // 检查是否在固定底部行区域
@@ -54,7 +54,7 @@ var getCellFromMousePosition = function (params) {
                 rowIndex = bottomRowsStartIndex + relativeIndex;
                 if (rowIndex < 0 || rowIndex >= dataLength)
                     return null;
-                return findColumn(x, scrollLeft, columnRenderInfos, rowIndex);
+                return findColumn(x, scrollLeft, columnRenderInfos, rowIndex, mergeCellMap);
             }
         }
         // 在可滚动区域
@@ -71,12 +71,13 @@ var getCellFromMousePosition = function (params) {
             return null;
         }
     }
-    return findColumn(x, scrollLeft, columnRenderInfos, rowIndex);
+    return findColumn(x, scrollLeft, columnRenderInfos, rowIndex, mergeCellMap);
 };
 /**
  * 根据x坐标查找列索引
  */
-function findColumn(x, scrollLeft, columnRenderInfos, rowIndex) {
+function findColumn(x, scrollLeft, columnRenderInfos, rowIndex, mergeCellMap) {
+    var foundCell = null;
     // 优先查找fixed列（因为fixed列在上层，会遮挡下层的非fixed列）
     for (var i = 0; i < columnRenderInfos.length; i++) {
         var info = columnRenderInfos[i];
@@ -84,22 +85,58 @@ function findColumn(x, scrollLeft, columnRenderInfos, rowIndex) {
             var fixedLeft = info.fixedLeft, width = info.width;
             var drawX = fixedLeft;
             if (x >= drawX && x < drawX + width) {
-                return { row: rowIndex, col: i };
+                foundCell = { row: rowIndex, col: i };
+                break;
             }
         }
     }
     // 如果不在fixed列上，再查找非fixed列
-    for (var i = 0; i < columnRenderInfos.length; i++) {
-        var info = columnRenderInfos[i];
-        if (!info.fixed) {
-            var width = info.width;
-            var drawX = info.x - scrollLeft;
-            if (x >= drawX && x < drawX + width) {
-                return { row: rowIndex, col: i };
+    if (!foundCell) {
+        for (var i = 0; i < columnRenderInfos.length; i++) {
+            var info = columnRenderInfos[i];
+            if (!info.fixed) {
+                var width = info.width;
+                var drawX = info.x - scrollLeft;
+                if (x >= drawX && x < drawX + width) {
+                    foundCell = { row: rowIndex, col: i };
+                    break;
+                }
+            }
+        }
+    }
+    // 如果找到了单元格，检查它是否是被合并的单元格
+    if (foundCell && mergeCellMap) {
+        var mergeCellKey = "".concat(foundCell.row, "-").concat(foundCell.col);
+        var mergeInfo = mergeCellMap.get(mergeCellKey);
+        // 如果是被合并的单元格（skip=true），需要找到主单元格
+        if (mergeInfo && mergeInfo.skip) {
+            // 遍历所有可能的主单元格位置（从左上角开始，到当前位置）
+            // 找到覆盖当前位置的主单元格
+            for (var checkRow = 0; checkRow <= foundCell.row; checkRow++) {
+                for (var checkCol = 0; checkCol <= foundCell.col; checkCol++) {
+                    var mainCellKey = "".concat(checkRow, "-").concat(checkCol);
+                    var mainMergeInfo = mergeCellMap.get(mainCellKey);
+                    // 找到主单元格（skip=false且有合并）
+                    if (mainMergeInfo &&
+                        !mainMergeInfo.skip &&
+                        (mainMergeInfo.rowSpan > 1 || mainMergeInfo.colSpan > 1)) {
+                        // 计算主单元格覆盖的范围
+                        var mainCellEndRow = checkRow + mainMergeInfo.rowSpan - 1;
+                        var mainCellEndCol = checkCol + mainMergeInfo.colSpan - 1;
+                        // 检查当前位置是否在主单元格的覆盖范围内
+                        if (foundCell.row >= checkRow &&
+                            foundCell.row <= mainCellEndRow &&
+                            foundCell.col >= checkCol &&
+                            foundCell.col <= mainCellEndCol) {
+                            // 返回主单元格的坐标
+                            return { row: checkRow, col: checkCol };
+                        }
+                    }
+                }
             }
         }
     }
-    return null;
+    return foundCell;
 }
 /**
  * 提取单元格文本（处理 render 函数）

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

@@ -17,9 +17,11 @@ var formatDate = function (value, format) {
 /**
  * 格式化单元格值
  */
-var formatCellValue = function (value, column) {
+var formatCellValue = function (value, column, noEmptyText) {
     // 空值处理：null、undefined、空字符串
     if (value === null || value === undefined || value === "") {
+        if (noEmptyText)
+            return "";
         return column.emptyText !== undefined ? column.emptyText : "— —";
     }
     var formattedValue = value;

package/package.json

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