zmdms-webui 2.4.6 → 2.4.8

package/dist/es/canvastable/canvasTable.js

@@ -112,7 +112,6 @@ function CanvasTable(props) {
     }), finalDataSource = _z.finalDataSource, hasSummaryRow = _z.hasSummaryRow;
     // 自动高度计算（需要在容器尺寸计算之前）
     var autoHeight = useCanvasTableAutoHeight(isAutoScrollY, autoScrollYMarginBottom, canvasTableId);
-    console.log("autoHeight", autoHeight);
     // 监听容器尺寸变化（提前计算，用于列宽自适应）
     var containerSize = useContainerSize({
         containerRef: containerRef,

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

@@ -789,6 +789,8 @@ var useTableRender = function (params) {
         if (onlyFixed === void 0) { onlyFixed = false; }
         ctx.strokeStyle = COLORS.border;
         ctx.lineWidth = 1;
+        // 计算实际数据行数（只绘制到有数据的地方）
+        var dataRowCount = processedDataSource.length;
         // 绘制表头底部边框（只在非fixed时绘制一次，使用2px更明显）
         if (!onlyFixed) {
             ctx.lineWidth = 1;
@@ -798,6 +800,8 @@ var useTableRender = function (params) {
             ctx.stroke();
             ctx.lineWidth = 1; // 恢复为1px
         }
+        // 计算实际数据区域的底部位置
+        var dataBottomY = Math.min(headerHeight + dataRowCount * rowHeight - scrollState.scrollTop, displayHeight);
         // 绘制垂直边框（只绘制body部分，从headerHeight开始，表头边框在drawHeaderCell中绘制）
         columnRenderInfos.forEach(function (info, colIndex) {
             var x = info.x, width = info.width, fixed = info.fixed, fixedLeft = info.fixedLeft;
@@ -814,7 +818,8 @@ var useTableRender = function (params) {
             if (drawX >= 0 && drawX <= displayWidth) {
                 ctx.beginPath();
                 ctx.moveTo(drawX, headerHeight);
-                ctx.lineTo(drawX, displayHeight);
+                // 只绘制到数据区域的底部，而不是整个容器高度
+                ctx.lineTo(drawX, dataBottomY);
                 ctx.stroke();
             }
         });
@@ -851,8 +856,8 @@ var useTableRender = function (params) {
                 });
             }
         };
-        // 绘制水平边框
-        for (var i = startRow; i <= endRow; i++) {
+        // 绘制水平边框（只绘制实际数据行的边框）
+        for (var i = startRow; i <= endRow && i <= dataRowCount; i++) {
             _loop_1(i);
         }
         // 为合并单元格绘制底部边框
@@ -1361,6 +1366,8 @@ var useTableRender = function (params) {
                 hoverRow: state.hoverRowIndex,
                 selection: state.cellSelection,
                 resizing: resizeState === null || resizeState === void 0 ? void 0 : resizeState.isResizing,
+                sortOrder: state.sortOrder,
+                sortField: state.sortField,
             });
             // 如果关键参数没有变化，跳过重绘
             if (lastRenderParamsRef.current === renderParamsHash) {

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

@@ -365,7 +365,7 @@ interface IElectronSignaturesProps extends IElectronSignaturesItem, IElectronSig
     /**
      * 是否需要获取公司id
      */
-    needOrganizationId?: string;
+    needOrganizationId?: boolean;
 }
 /**
  * 群杰选中数据相关类型

package/dist/es/table/hooks.js

@@ -218,7 +218,7 @@ function useScuRfresh() {
  * 如果排序改变了数据源，那么数据没法恢复到初始状态
  */
 function useCustomSort(dataSource, onTableChange, options) {
-    var refreshScuCell = options.refreshScuCell, rowKey = options.rowKey, serviceOrder = options.serviceOrder, isOrderUpdateData = options.isOrderUpdateData;
+    var refreshScuCell = options.refreshScuCell, rowKey = options.rowKey, serviceOrder = options.serviceOrder, isOrderUpdateData = options.isOrderUpdateData, isAutoMerge = options.isAutoMerge;
     // 排序的数据
     var _a = useState(undefined), order = _a[0], setOrder = _a[1];
     var isSelfChange = useRef(false);
@@ -226,6 +226,8 @@ function useCustomSort(dataSource, onTableChange, options) {
     var innerOrderDataSource = useRef();
     var _b = useState(null), sortDataSource = _b[0], setSortDataSource = _b[1];
     var customSortHandle = useCallback(function (info, options) {
+        if (isAutoMerge)
+            return;
         if (Array.isArray(dataSource) && dataSource.length > 1) {
             var field_1 = info.field, order_1 = info.order;
             var sorterHandle = (options || {}).sorterHandle;
@@ -301,6 +303,7 @@ function useCustomSort(dataSource, onTableChange, options) {
         rowKey,
         serviceOrder,
         isOrderUpdateData,
+        isAutoMerge,
     ]);
     /**
      * 表格数据更新的时候 重置下当前排序的数据 以及 排序的方式

package/dist/es/table/table.js

@@ -70,6 +70,7 @@ var Table = function (props) {
         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;
     // 当前表格展示的数据
     // 如果开启了前端排序的话，排序后的数据，可能会影响到很多地方。

package/dist/es/table/utils.js

@@ -587,7 +587,7 @@ function sortRecords(_a) {
     }
     // 否则保持原样
     else {
-        result = __spreadArray([], records, true);
+        result = records;
     }
     return result;
 }
@@ -725,17 +725,6 @@ function sortByDimensions(records, dimensionKeys, order, columns) {
         // 如果有明确的排序配置，使用它
         sortConfig = { field: order.field, order: order.order };
     }
-    else {
-        // 如果没有明确排序，检查维度字段是否有自定义sorter，优先使用第一个有sorter的字段
-        for (var _i = 0, dimensionKeys_1 = dimensionKeys; _i < dimensionKeys_1.length; _i++) {
-            var dimensionKey = dimensionKeys_1[_i];
-            var column = findColumnByKey(dimensionKey);
-            if (column && typeof column.sorter === "function") {
-                sortConfig = { field: dimensionKey, order: "ascend" };
-                break; // 找到第一个有sorter的字段就使用，按维度顺序优先
-            }
-        }
-    }
     return groupByDimensionsHierarchical(records, dimensionKeys, 0, sortConfig);
 }
 /**

package/package.json

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