zmdms-webui 2.4.2 → 2.4.4

package/dist/es/canvastable/canvasTable.js

@@ -249,21 +249,19 @@ function CanvasTable(props) {
         onColumnResize: handleColumnResize,
     }), resizeState = _3.resizeState, checkResizeHandle = _3.checkResizeHandle, startResize = _3.startResize, updateResize = _3.updateResize, endResize = _3.endResize, setHoverResizeColumn = _3.setHoverResizeColumn, getColumnWidth = _3.getColumnWidth, RESIZE_HANDLE_WIDTH = _3.RESIZE_HANDLE_WIDTH;
     // 复制到剪贴板
-    var getSelectedCellsText = useCopyToClipboard({
+    var _4 = useCopyToClipboard({
         cellSelection: state.cellSelection,
         processedDataSource: finalDataSource,
         columns: processedColumns,
         containerRef: containerRef,
-    }).getSelectedCellsText;
+    }), getSelectedCellsText = _4.getSelectedCellsText, copyToClipboard = _4.copyToClipboard;
     // 处理右键菜单的复制操作
     var handleCopy = useCallback(function () {
         var text = getSelectedCellsText();
-        if (text && navigator.clipboard) {
-            navigator.clipboard.writeText(text).catch(function (err) {
-                console.error("Failed to copy:", err);
-            });
+        if (text) {
+            copyToClipboard(text);
         }
-    }, [getSelectedCellsText]);
+    }, [getSelectedCellsText, copyToClipboard]);
     // 过滤勾选框和index行给导出用
     var exportColumns = useMemo(function () {
         return processedColumns.filter(function (item) { return !item.key.includes("__"); });
@@ -272,10 +270,10 @@ function CanvasTable(props) {
     var exportExcel = useExcelExport(newDataSource, {
         columns: exportColumns,
         isAutoMerge: isAutoMerge,
-        summaryConfig: [],
+        summaryConfig: (exportExcelConfig === null || exportExcelConfig === void 0 ? void 0 : exportExcelConfig.isExportNoSummary) ? undefined : [],
     });
     // 交互事件处理（使用baseScrollbarMetrics的maxScrollTop/maxScrollLeft以保持稳定）
-    var _4 = useTableInteraction({
+    var _5 = useTableInteraction({
         state: state,
         setState: setState,
         scrollState: scrollState,
@@ -322,7 +320,7 @@ function CanvasTable(props) {
         fixedRowsCount: fixedRowsCount,
         fixedRowsConfig: fixedRowsConfig,
         summaryFixed: summaryFixed,
-    }), handleCanvasMouseDown = _4.handleCanvasMouseDown, handleCanvasMouseMove = _4.handleCanvasMouseMove, handleCanvasMouseUp = _4.handleCanvasMouseUp, handleCanvasMouseLeave = _4.handleCanvasMouseLeave, handleCanvasContextMenu = _4.handleCanvasContextMenu;
+    }), handleCanvasMouseDown = _5.handleCanvasMouseDown, handleCanvasMouseMove = _5.handleCanvasMouseMove, handleCanvasMouseUp = _5.handleCanvasMouseUp, handleCanvasMouseLeave = _5.handleCanvasMouseLeave, handleCanvasContextMenu = _5.handleCanvasContextMenu;
     // 渲染表格
     useTableRender(__assign(__assign({ canvasRef: canvasRef, processedDataSource: finalDataSource, columnRenderInfos: columnRenderInfos, columns: processedColumns, // 传递原始columns用于渲染多级表头
         state: state, scrollState: scrollState, rowSelection: rowSelection, containerWidth: containerWidth, containerHeight: containerHeight, headerHeight: calculatedHeaderHeight, baseHeaderHeight: headerHeight, // 传入原始基础高度用于计算每层高度
@@ -421,6 +419,13 @@ function CanvasTable(props) {
         scrollTo: function (params) {
             setScrollState(function (prev) { return (__assign(__assign({}, prev), { scrollLeft: params.x !== undefined ? params.x : prev.scrollLeft, scrollTop: params.y !== undefined ? params.y : prev.scrollTop })); });
         },
+        /** 获取滚动条位置信息 */
+        getScrollPosition: function () {
+            return {
+                x: scrollState.scrollLeft,
+                y: scrollState.scrollTop,
+            };
+        },
         /** 获取当前排序状态 */
         getSortState: function () {
             return {
@@ -450,6 +455,8 @@ function CanvasTable(props) {
         state.filters,
         setState,
         setScrollState,
+        scrollState.scrollLeft,
+        scrollState.scrollTop,
     ]);
     return (jsx(Spin, __assign({ spinning: loading }, { children: jsxs("div", __assign({ ref: containerRef, id: canvasTableId, className: "canvas-table-container ".concat(className || ""), tabIndex: 0, style: __assign(__assign({}, style), { position: "relative", width: width || "100%", height: containerHeight, overflow: "hidden", touchAction: "none", outline: "none" }) }, { children: [jsx("canvas", { ref: canvasRef, onMouseDown: handleCanvasMouseDown, onMouseMove: handleCanvasMouseMove, onMouseUp: handleCanvasMouseUp, onMouseLeave: handleCanvasMouseLeave, onContextMenu: handleCanvasContextMenu, style: {
                         display: "block",

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

@@ -173,6 +173,10 @@ interface ICanvasColumnType<RecordType = any> {
      * 是否加上千分符
      */
     thousand?: boolean;
+    /**
+     * 空值时显示的文本，默认为 "—"
+     */
+    emptyText?: string;
     /**
      * 设置单元格属性（用于合并单元格等）
      * 参考 antd table 的 onCell 用法
@@ -414,6 +418,7 @@ interface ICanvasTableProps<RecordType = any> {
         time?: string;
         topDescriptionRowHeight?: number;
         fileName: string;
+        isExportNoSummary?: boolean;
     };
 }
 /**
@@ -463,6 +468,16 @@ interface ICanvasTableRefHandle {
         x?: number;
         y?: number;
     }) => void;
+    /**
+     * 获取滚动条位置信息
+     * @returns 包含 x(水平) 和 y(垂直) 滚动位置的对象
+     */
+    getScrollPosition: () => {
+        /** 水平滚动位置 */
+        x: number;
+        /** 垂直滚动位置 */
+        y: number;
+    };
     /**
      * 获取当前排序状态
      */

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

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

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

@@ -245,6 +245,10 @@ interface IColumnType<RecordType> extends Omit<ColumnType<RecordType>, "render">
     dateFormat?: string;
     precision?: number;
     thousand?: boolean;
+    /**
+     * 空值时显示的文本，默认为 "—"
+     */
+    emptyText?: string;
 }
 interface IRenderOptions {
     insertTableFromClipboard: IFuncInsertTableFromClipboard;
@@ -289,13 +293,32 @@ interface ITableRefHandel {
      */
     clearErrorClass?: () => void;
     /**
-     * 滚动
+     * 滚动到指定位置
+     * 虚拟滚动时：使用 virtuallist-antd 的 scrollTo 方法，需要传 row、y、vid
+     * 普通滚动时：操作 DOM，可以传 y、x 或 index
+     * @param options.row - 虚拟滚动时滚动到第几行
+     * @param options.y - 垂直滚动的像素值
+     * @param options.x - 水平滚动的像素值
+     * @param options.vid - 虚拟滚动的唯一标识符
+     * @param options.index - 滚动到指定行索引（普通滚动）
+     */
+    scrollTo?: (options: {
+        row?: number;
+        y?: number;
+        x?: number;
+        vid?: string;
+        index?: number;
+    }) => void;
+    /**
+     * 获取滚动条位置信息
+     * @returns 包含 x(水平) 和 y(垂直) 滚动位置的对象
      */
-    scrollTo?: (obj: {
-        row: number;
+    getScrollPosition?: () => {
+        /** 水平滚动位置 */
+        x: number;
+        /** 垂直滚动位置 */
         y: number;
-        vid: string;
-    }) => void;
+    };
     /**
      * 重置
      */

package/dist/es/table/table.js

@@ -19,7 +19,7 @@ import useSummary from './useSummary.js';
 import useInnerPagination, { getInnerIndex } from './useInnerPagination.js';
 import { useScuRfresh, useCustomSort, useCalcScrollY, useEditChange, useMoveRowChange, useAddAndDelChange, useCustomFilter, useAutoMerge } from './hooks.js';
 import { HTML5Backend } from '../node_modules/react-dnd-html5-backend/dist/index.js';
-import { VList, scrollTo } from '../node_modules/virtuallist-antd/dist/index.es.js';
+import { scrollTo, VList } 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';
@@ -193,6 +193,58 @@ var Table = function (props) {
     });
     // 表格验证
     var _y = useTableValidate(), tableRef = _y.tableRef, getCurrentTable = _y.getCurrentTable, clearErrorClass = _y.clearErrorClass;
+    // 滚动条控制方法
+    var scrollToPosition = useMemoizedFn(function (options) {
+        var _a;
+        // 如果是虚拟滚动，使用 virtuallist-antd 的 scrollTo 方法
+        if (virtualKey && options.vid) {
+            scrollTo({
+                row: options.row || 0,
+                y: options.y || 0,
+                vid: options.vid || virtualKey,
+            });
+        }
+        else {
+            // 普通滚动，操作 DOM
+            var tableBody = (_a = tableRef.current) === null || _a === void 0 ? void 0 : _a.querySelector(".ant-table-body");
+            if (tableBody) {
+                // 如果指定了 y 值，直接滚动到指定位置
+                if (typeof options.y === "number") {
+                    tableBody.scrollTop = options.y;
+                }
+                // 如果指定了 x 值，直接滚动到指定位置
+                if (typeof options.x === "number") {
+                    tableBody.scrollLeft = options.x;
+                }
+                // 如果指定了 index，滚动到指定行
+                if (typeof options.index === "number") {
+                    var rows = tableBody.querySelectorAll(".ant-table-row");
+                    var targetRow = rows[options.index];
+                    if (targetRow) {
+                        targetRow.scrollIntoView({
+                            behavior: "smooth",
+                            block: "center",
+                        });
+                    }
+                }
+            }
+        }
+    });
+    // 获取滚动条位置
+    var getScrollPosition = useMemoizedFn(function () {
+        var _a;
+        var tableBody = (_a = tableRef.current) === null || _a === void 0 ? void 0 : _a.querySelector(".ant-table-body");
+        if (tableBody) {
+            return {
+                x: tableBody.scrollLeft,
+                y: tableBody.scrollTop,
+            };
+        }
+        return {
+            x: 0,
+            y: 0,
+        };
+    });
     // 虚拟滚动选项
     var vComponents = useMemo(function () {
         if (virtualKey) {
@@ -307,9 +359,20 @@ var Table = function (props) {
             }); },
             /** 清除错误样式 */
             clearErrorClass: clearErrorClass,
-            /** 虚拟滚动 滚动到顶部方法 */
-            scrollTo: function (obj) {
-                scrollTo(obj);
+            /**
+             * 滚动到指定位置
+             * 虚拟滚动时使用 virtuallist-antd 的 scrollTo 方法
+             * 普通滚动时操作 DOM
+             */
+            scrollTo: function (options) {
+                scrollToPosition(options);
+            },
+            /**
+             * 获取滚动条位置信息
+             * @returns 包含滚动位置和容器尺寸的对象
+             */
+            getScrollPosition: function () {
+                return getScrollPosition();
             },
             /** 动态列配置重置 */
             onResetDynamicList: function () {

package/dist/es/table/useColumns.js

@@ -324,8 +324,10 @@ function useColumns(columns, options) {
             if (typeof text === "object") {
                 return PLACEHOLDER_NULL;
             }
-            if (text == null || text === "")
-                return PLACEHOLDER_NULL;
+            // 空值处理：null、undefined、空字符串
+            if (text == null || text === "") {
+                return _column.emptyText !== undefined ? _column.emptyText : "—";
+            }
             if (_column.dateFormat)
                 return dayjs(text).format(_column.dateFormat);
             if (_column.precision)

package/package.json

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