ztxkui 4.2.23-552 → 4.2.23-553

package/dist/components/Table/hooks/useCtrl.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+export default function useCtrl(): {
+    ctrlKeyPressedRef: import("react").MutableRefObject<boolean>;
+    getCtrlKeyPressed: (e: KeyboardEvent) => boolean;
+};

package/dist/components/Table/hooks/useCtrl.js

@@ -0,0 +1,31 @@
+// 监听是否摁下ctrl键
+import { useRef, useEffect, useCallback } from 'react';
+export default function useCtrl() {
+    var ctrlKeyPressedRef = useRef(false);
+    var getCtrlKeyPressed = useCallback(function (e) {
+        return e.ctrlKey || e.metaKey;
+    }, []);
+    // 监听 Ctrl 键状态
+    useEffect(function () {
+        var handleKeyDown = function (e) {
+            if (getCtrlKeyPressed(e)) {
+                ctrlKeyPressedRef.current = true;
+            }
+        };
+        var handleKeyUp = function (e) {
+            if (!getCtrlKeyPressed(e)) {
+                ctrlKeyPressedRef.current = false;
+            }
+        };
+        document.addEventListener('keydown', handleKeyDown);
+        document.addEventListener('keyup', handleKeyUp);
+        return function () {
+            document.removeEventListener('keydown', handleKeyDown);
+            document.removeEventListener('keyup', handleKeyUp);
+        };
+    }, []);
+    return {
+        ctrlKeyPressedRef: ctrlKeyPressedRef,
+        getCtrlKeyPressed: getCtrlKeyPressed,
+    };
+}

package/dist/components/Table/hooks/useDropRef.js

@@ -2,8 +2,10 @@ import i18next from 'ztxkutils/dist/i18next';
 import { useRef } from 'react';
 import { useDrag, useDrop } from 'react-dnd';
 import { tableDragRowType } from '../constants';
+import useCtrl from './useCtrl';
 function useDropRef(index, moverow) {
     var ref = useRef(null);
+    var ctrlKeyPressedRef = useCtrl().ctrlKeyPressedRef;
     /**
      * @description 定义拖拽项
      */
@@ -13,7 +15,14 @@ function useDropRef(index, moverow) {
         collect: function (monitor) { return ({
             isDragging: monitor.isDragging(),
         }); },
-        canDrag: function (monitor) { var _a; return !((_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.tagName.toLowerCase().match(/input|textarea/)); },
+        canDrag: function () {
+            var _a;
+            // 如果摁下了ctrl键 不可以拖拽行
+            if (ctrlKeyPressedRef.current) {
+                return false;
+            }
+            return !((_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.tagName.toLowerCase().match(/input|textarea/));
+        },
     }); }, [index]), drag = _a[1];
     /**
      * @description 定义可放置项

package/dist/components/Table/hooks/useSelectSubtotal.js

@@ -3,10 +3,12 @@ import { useRef, useEffect, useCallback } from 'react';
 import { domFind, domParentsUntil } from '../utils/dom';
 import { plus } from 'number-precision';
 import { copyValueHandle } from '../../utils/index';
+import useCtrl from './useCtrl';
 export default function useSelectSubtotal(tableRef, props) {
     var onMoveRow = props.onMoveRow, onEditableSave = props.onEditableSave;
     var tipRef = useRef();
     var rowResultRef = useRef();
+    var getCtrlKeyPressed = useCtrl().getCtrlKeyPressed;
     // 找到每个单元格实际对应的坐标
     var cellPosition = useCallback(function (container) {
         console.time(i18next.t('开始计算耗时'));
@@ -88,9 +90,9 @@ export default function useSelectSubtotal(tableRef, props) {
     //   // eslint-disable-next-line react-hooks/exhaustive-deps
     // }, [dataSource, cellPosition]);
     useEffect(function () {
-        if (onMoveRow || onEditableSave) {
-            return;
-        }
+        // if (onMoveRow || onEditableSave) {
+        //   return;
+        // }
         var tableContent = domFind(tableRef.current, '.ant-table-content');
         if (!tableContent) {
             tableContent = domFind(tableRef.current, '.ant-table-container');
@@ -108,13 +110,18 @@ export default function useSelectSubtotal(tableRef, props) {
         }
         var mousedownHandler = function (e) {
             var _a;
+            // 当编辑模式时，需要摁下ctrl键才可以复制。
+            if ((onMoveRow || onEditableSave) && !getCtrlKeyPressed(e)) {
+                clearSelections(); // 清除之前的选择
+                return;
+            }
             // 这里要判断如果最上层是TD也行
             var target = ((_a = e.target) === null || _a === void 0 ? void 0 : _a.tagName) === 'TD' ? e.target : domParentsUntil(e.target, 'td');
             if ((target === null || target === void 0 ? void 0 : target.tagName) === 'TD') {
                 isDragging = true;
                 startCell = target;
                 // 是否按下ctrl键  可以选取多段内容
-                if (!e.ctrlKey) {
+                if (!getCtrlKeyPressed(e)) {
                     clearSelections();
                 }
             }
@@ -153,7 +160,7 @@ export default function useSelectSubtotal(tableRef, props) {
                 }
             }
             // 是否按下ctrl键
-            if (!e.ctrlKey) {
+            if (!getCtrlKeyPressed(e)) {
                 container.classList.remove('table-select-none');
             }
         };
@@ -164,7 +171,7 @@ export default function useSelectSubtotal(tableRef, props) {
                     lastEndCell = e.target;
                     if (startCell !== lastEndCell) {
                         container.classList.add('table-select-none');
-                        var isCtrl = e.ctrlKey;
+                        var isCtrl = getCtrlKeyPressed(e);
                         selectCells(startCell, e.target, isCtrl); // 仅在必要时更新选择
                     }
                 }
@@ -172,7 +179,7 @@ export default function useSelectSubtotal(tableRef, props) {
         };
         container.addEventListener('mousemove', mousemoveHandler);
         var selectCells = function (start, end, isCtrl) {
-            var _a, _b, _c, _d, _e, _f, _g;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
             if (!isCtrl) {
                 clearSelections(); // 清除之前的选择
             }
@@ -206,25 +213,31 @@ export default function useSelectSubtotal(tableRef, props) {
             var lenRow = Math.max(startRow, endRow);
             var initCell = Math.min(startCol, endCol);
             var lenCell = Math.max(startCol, endCol);
+            // 标记当前选择区域的单元格为选中状态
             for (var i = initRow; i <= lenRow; i++) {
-                var positionArr = [];
                 for (var j = initCell; j <= lenCell; j++) {
-                    // const $td = container.rows[i]?.cells[j];
                     var $td = (_f = (_e = rowResult[i - 1]) === null || _e === void 0 ? void 0 : _e[j]) === null || _f === void 0 ? void 0 : _f.td;
-                    if ($td && !$td.classList.contains('move-selected')) {
-                        var innerText = $td === null || $td === void 0 ? void 0 : $td.innerText;
-                        try {
-                            // 去除\n复制文字
-                            innerText = innerText === null || innerText === void 0 ? void 0 : innerText.replace(/\s+复制/g, '');
-                        }
-                        catch (err) { }
+                    (_g = $td === null || $td === void 0 ? void 0 : $td.classList) === null || _g === void 0 ? void 0 : _g.add('move-selected');
+                }
+            }
+            // 重新构建 textArr 和 textPositionArr（基于所有已选中的单元格）
+            textArr = [];
+            textPositionArr = [];
+            // 遍历所有单元格，按行组织已选中的单元格
+            var rowsCount = rowResult.length;
+            var colsCount = ((_h = rowResult[0]) === null || _h === void 0 ? void 0 : _h.length) || 0;
+            for (var i = 0; i < rowsCount; i++) {
+                var rowPositionArr = [];
+                for (var j = 0; j < colsCount; j++) {
+                    var $td = (_k = (_j = rowResult[i]) === null || _j === void 0 ? void 0 : _j[j]) === null || _k === void 0 ? void 0 : _k.td;
+                    if ($td && $td.classList.contains('move-selected')) {
+                        var innerText = getCellValue($td);
                         textArr.push(innerText);
-                        positionArr.push(innerText);
+                        rowPositionArr.push(innerText);
                     }
-                    (_g = $td === null || $td === void 0 ? void 0 : $td.classList) === null || _g === void 0 ? void 0 : _g.add('move-selected');
                 }
-                if (positionArr.length > 0) {
-                    textPositionArr.push(positionArr);
+                if (rowPositionArr.length > 0) {
+                    textPositionArr.push(rowPositionArr);
                 }
             }
         };
@@ -244,6 +257,7 @@ export default function useSelectSubtotal(tableRef, props) {
             var isCtrlPressed = event.ctrlKey || event.metaKey;
             // 如果同时按下了Ctrl/Cmd键和C键，则执行你的复制操作
             if (isCtrlPressed && isCKey && textPositionArr.length > 0) {
+                console.log('复制文本textPositionArr', textPositionArr);
                 // 执行你的复制操作，例如将文本添加到剪贴板
                 var textToCopy = textPositionArr
                     .map(function (row) { return row.join('\t'); })
@@ -304,3 +318,52 @@ function sumArrayValues(arr) {
     }
     return sum;
 }
+/**
+ * 判断传入的dom元素中的值
+ * 一种情况就是直接通过innerText获取
+ * 另外一种就是通过输入框获取
+ * @param td 表格单元格元素
+ * @returns 单元格中的文本值
+ */
+function getCellValue(td) {
+    var _a, _b, _c, _d;
+    if (!td) {
+        return '';
+    }
+    try {
+        // 查找 antd Select 显示的值
+        var antdSelect = td.querySelector('.ant-select-selection-item');
+        if (antdSelect) {
+            return (_a = antdSelect.textContent) !== null && _a !== void 0 ? _a : '';
+        }
+        // 优先查找输入框元素的值
+        var inputElement = td.querySelector('input, textarea');
+        if (inputElement) {
+            return (_b = inputElement.value) !== null && _b !== void 0 ? _b : '';
+        }
+        // 查找带 contenteditable 属性的元素
+        var editableElement = td.querySelector('[contenteditable="true"]');
+        if (editableElement && editableElement.innerText !== undefined) {
+            return editableElement.innerText;
+        }
+        // 查找 antd 相关组件的输入值
+        var antdInput = td.querySelector('.ant-input, .ant-input-number-input');
+        if (antdInput) {
+            if ('value' in antdInput) {
+                return (_c = antdInput.value) !== null && _c !== void 0 ? _c : '';
+            }
+            return (_d = antdInput.textContent) !== null && _d !== void 0 ? _d : '';
+        }
+        // 默认通过 innerText 获取
+        var innerText = td.innerText;
+        if (innerText !== undefined && innerText !== null) {
+            // 去除 "复制" 等后缀文字
+            return innerText.replace(/\s+复制/g, '').trim();
+        }
+        return '';
+    }
+    catch (error) {
+        console.error(i18next.t('获取单元格值失败'), error);
+        return '';
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "4.2.23-552",
+  "version": "4.2.23-553",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",