zmdms-webui 2.3.8 → 2.3.9

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

@@ -90,28 +90,38 @@ var useCopyToClipboard = function (params) {
         }
         return rows.join("\n");
     });
-    // 处理复制事件
-    var handleCopy = useMemoizedFn(function (e) {
-        var _a;
-        if (!cellSelection)
-            return;
-        var text = getSelectedCellsText();
-        if (text) {
-            e.preventDefault();
-            (_a = e.clipboardData) === null || _a === void 0 ? void 0 : _a.setData("text/plain", text);
+    // 兼容的复制到剪贴板函数（支持HTTP环境）
+    var copyToClipboard = useMemoizedFn(function (text) {
+        // 优先使用现代 clipboard API（仅在HTTPS/localhost下可用）
+        if (navigator.clipboard && window.isSecureContext) {
+            navigator.clipboard.writeText(text).catch(function (err) {
+                console.error("Failed to copy with clipboard API:", err);
+            });
+            return true;
+        }
+        // 降级方案：使用 execCommand（支持HTTP环境）
+        try {
+            var textarea = document.createElement("textarea");
+            textarea.value = text;
+            textarea.style.position = "fixed";
+            textarea.style.opacity = "0";
+            textarea.style.pointerEvents = "none";
+            document.body.appendChild(textarea);
+            textarea.select();
+            textarea.setSelectionRange(0, textarea.value.length);
+            var success = document.execCommand("copy");
+            document.body.removeChild(textarea);
+            if (!success) {
+                console.error("Failed to copy using execCommand");
+            }
+            return success;
+        }
+        catch (err) {
+            console.error("Failed to copy:", err);
+            return false;
         }
     });
-    // 监听复制事件
-    useEffect(function () {
-        var container = containerRef.current;
-        if (!container)
-            return;
-        container.addEventListener("copy", handleCopy);
-        return function () {
-            container.removeEventListener("copy", handleCopy);
-        };
-    }, [handleCopy, containerRef]);
-    // 监听键盘事件（Ctrl+C / Cmd+C）- 只在表格容器内部处理
+    // 监听键盘事件（Ctrl+C / Cmd+C）处理复制
     useEffect(function () {
         var container = containerRef.current;
         if (!container)
@@ -125,25 +135,21 @@ var useCopyToClipboard = function (params) {
                 if (isInContainer) {
                     e.preventDefault(); // 阻止默认复制行为
                     var text = getSelectedCellsText();
-                    if (text && navigator.clipboard) {
-                        navigator.clipboard.writeText(text).catch(function (err) {
-                            console.error("Failed to copy:", err);
-                        });
+                    if (text) {
+                        copyToClipboard(text);
                     }
                 }
             }
         };
-        // 监听容器的keydown事件，而不是全局window事件
-        container.addEventListener("keydown", handleKeyDown);
         // 同时也监听全局事件，但会检查焦点位置
         document.addEventListener("keydown", handleKeyDown);
         return function () {
-            container.removeEventListener("keydown", handleKeyDown);
             document.removeEventListener("keydown", handleKeyDown);
         };
-    }, [cellSelection, getSelectedCellsText, containerRef]);
+    }, [cellSelection, getSelectedCellsText, copyToClipboard, containerRef]);
     return {
         getSelectedCellsText: getSelectedCellsText,
+        copyToClipboard: copyToClipboard,
     };
 };
 

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

@@ -706,10 +706,11 @@ var useTableInteraction = function (params) {
         // 清理状态
         setState(function (prev) {
             var updates = {};
+            // 注释：不再在鼠标离开时停止框选，只在鼠标松开时停止
             // 结束框选
-            if (prev.isSelecting) {
-                updates.isSelecting = false;
-            }
+            // if (prev.isSelecting) {
+            //   updates.isSelecting = false;
+            // }
             // 清理 hover
             if (prev.hoverRowIndex !== null) {
                 updates.hoverRowIndex = null;
@@ -738,14 +739,16 @@ var useTableInteraction = function (params) {
         // 显示右键菜单
         menuShow({ event: e });
     });
-    // 在document上监听拖拽事件，以支持鼠标移出canvas后继续拖拽
+    // 在document上监听拖拽事件和框选事件，以支持鼠标移出canvas后继续操作
     useEffect(function () {
         var isDragging = scrollState.isDraggingVertical ||
             scrollState.isDraggingHorizontal ||
             (resizeState === null || resizeState === void 0 ? void 0 : resizeState.isResizing);
-        if (!isDragging)
+        var isSelecting = state.isSelecting;
+        if (!isDragging && !isSelecting)
             return;
         var handleDocumentMouseMove = function (e) {
+            var _a;
             // 获取当前实例的canvas
             var canvas = canvasRef.current;
             if (!canvas)
@@ -766,6 +769,18 @@ var useTableInteraction = function (params) {
             // 处理水平滚动条拖拽
             if (scrollState.isDraggingHorizontal) {
                 handleHorizontalScrollDrag(x - scrollState.dragStartX);
+                return;
+            }
+            // 处理框选（在canvas外也能继续框选）
+            if (state.isSelecting) {
+                var cell = getCellFromPosition(x, y);
+                if (cell) {
+                    // 检查是否在选择框列，如果是，则不更新框选
+                    var isSelectionColumn = ((_a = columnRenderInfos[cell.col]) === null || _a === void 0 ? void 0 : _a.column.key) === "__selection__";
+                    if (!isSelectionColumn) {
+                        updateSelection(cell);
+                    }
+                }
             }
         };
         var handleDocumentMouseUp = function () {
@@ -773,6 +788,10 @@ var useTableInteraction = function (params) {
             if ((resizeState === null || resizeState === void 0 ? void 0 : resizeState.isResizing) && endResize) {
                 endResize();
             }
+            // 结束框选
+            if (state.isSelecting) {
+                setState(function (prev) { return (__assign(__assign({}, prev), { isSelecting: false })); });
+            }
             setScrollState(function (prev) { return (__assign(__assign({}, prev), { isDraggingVertical: false, isDraggingHorizontal: false })); });
         };
         document.addEventListener("mousemove", handleDocumentMouseMove);
@@ -786,10 +805,15 @@ var useTableInteraction = function (params) {
         scrollState.isDraggingVertical,
         scrollState.isDraggingHorizontal,
         resizeState === null || resizeState === void 0 ? void 0 : resizeState.isResizing,
+        state.isSelecting,
         updateResize,
         endResize,
         handleVerticalScrollDrag,
         handleHorizontalScrollDrag,
+        updateSelection,
+        setState,
+        getCellFromPosition,
+        columnRenderInfos,
         canvasRef,
     ]);
     return {

package/package.json

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