@leankylin-sheet/react 3.1.7 → 3.1.9

package/dist/index.esm.js

@@ -1,4 +1,4 @@
-import { defaultContext, defaultSettings, getSheetIndex, colLocationByIndex, fixPositionOnFrozenCells, colLocation, getFlowdata, isAllowEdit, handleColumnHeaderMouseDown, handleColSizeHandleMouseDown, handleColFreezeHandleMouseDown, handleContextMenu, selectTitlesMap, selectTitlesRange, fixColumnStyleOverflowInFreeze, rowLocationByIndex, rowLocation, handleRowHeaderMouseDown, handleRowSizeHandleMouseDown, handleRowFreezeHandleMouseDown, fixRowStyleOverflowInFreeze, functionHTMLGenerate, locale, getStyleByCell, getCellValue, createRangeHightlight, isInlineStringCell, getInlineStringHTML, valueShowEs, escapeHTMLTag, escapeScriptTag, moveToEnd, isShowHidenCR, cancelNormalSelected, moveHighlightCell, updateCell, israngeseleciton, handleFormulaInput, onSearchDialogMoveStart, replaceAll, replace, searchAll, searchNext, normalizeSelection, scrollToHighlightCell, isLinkValid, getRangetxt, goToLink, replaceHtml, removeHyperlink, onRangeSelectionModalMoveStart, saveHyperlink, createFilterOptions, onImageMoveStart, onImageResizeStart, showComments, setEditingComment, onCommentBoxMoveStart, onCommentBoxResizeStart, confirmMessage, getRangeByTxt, getDropdownList, setCellValue, setConditionRules, mergeBorder, setDropcownValue, handleCellAreaMouseDown, handleCellAreaMouseMove, handleCellAreaDoubleClick, selectAll, showLinkCard, getCellRowColumn, getCellHyperlink, handleOverlayMouseMove, handleOverlayMouseUp, handleKeydownForZoom, handleOverlayTouchStart, handleOverlayTouchMove, handleOverlayTouchEnd, drawArrow, onCellsMoveStart, createDropCellRange, updateContextWithSheetData, updateContextWithCanvas, initFreeze, Canvas, handleGlobalWheel, setCaretPosition, getDataArr, updateMoreCell, getRegStr, getOptionValue, getSelectRange, applyLocation, updateItem, update, normalizedCellAttr, updateFormat, handleTextSize, handleHorizontalAlign, handleVerticalAlign, handleScreenShot, showImgChooser, insertImage, editComment, deleteComment, showHideComment, showHideAllComments, newComment, handleSum, autoSelectionFormula, handleMerge, handleBorder, handleFreeze, handleSort, createFilter, clearFilter, toolbarItemSelectedFunc, toolbarItemClickHandler, handleTextColor, handleTextBackground, getDataBySelectionNoCopy, getInlineStringNoStyle, rangeHightlightselected, editSheetName, cancelActiveImgItem, MAX_ZOOM_RATIO, MIN_ZOOM_RATIO, addSheet, indexToColumnChar, sortSelection, handleCopy, insertRowCol, deleteRowCol, hideSelected, showSelected, api, removeActiveImage, deleteSelectedCellText, jfrefreshgrid, handleLink, deleteSheet, opToPatch, orderbydatafiler, getFilterColumnValues, getFilterColumnColors, saveFilter, patchToOp, filterPatch, inverseRowColOptions, ensureSheetIndex, initSheetIndex, handleGlobalKeyDown, handlePasteByLeanklin, groupValuesRefresh } from '@leankylin-sheet/core';
+import { defaultContext, defaultSettings, getSheetIndex, colLocationByIndex, fixPositionOnFrozenCells, colLocation, getFlowdata, isAllowEdit, handleColumnHeaderMouseDown, handleColSizeHandleMouseDown, handleColFreezeHandleMouseDown, handleContextMenu, selectTitlesMap, selectTitlesRange, fixColumnStyleOverflowInFreeze, rowLocationByIndex, rowLocation, handleRowHeaderMouseDown, handleRowSizeHandleMouseDown, handleRowFreezeHandleMouseDown, fixRowStyleOverflowInFreeze, functionHTMLGenerate, locale, getStyleByCell, getCellValue, createRangeHightlight, isInlineStringCell, getInlineStringHTML, valueShowEs, escapeHTMLTag, escapeScriptTag, moveToEnd, isShowHidenCR, cancelNormalSelected, moveHighlightCell, updateCell, israngeseleciton, handleFormulaInput, onSearchDialogMoveStart, replaceAll, replace, searchAll, searchNext, normalizeSelection, scrollToHighlightCell, isLinkValid, getRangetxt, goToLink, replaceHtml, removeHyperlink, onRangeSelectionModalMoveStart, saveHyperlink, createFilterOptions, onImageMoveStart, onImageResizeStart, showComments, setEditingComment, onCommentBoxMoveStart, onCommentBoxResizeStart, confirmMessage, getRangeByTxt, getDropdownList, setCellValue, setConditionRules, mergeBorder, setDropcownValue, handleCellAreaMouseDown, handleCellAreaMouseMove, handleCellAreaDragOver, handleCellDrop, handleCellAreaDoubleClick, selectAll, showLinkCard, getCellRowColumn, getCellHyperlink, handleOverlayMouseMove, handleOverlayMouseUp, handleKeydownForZoom, handleOverlayTouchStart, handleOverlayTouchMove, handleOverlayTouchEnd, drawArrow, onCellsMoveStart, createDropCellRange, updateContextWithSheetData, updateContextWithCanvas, initFreeze, Canvas, handleGlobalWheel, setCaretPosition, getDataArr, updateMoreCell, getRegStr, getOptionValue, getSelectRange, applyLocation, updateItem, update, normalizedCellAttr, updateFormat, handleTextSize, handleHorizontalAlign, handleVerticalAlign, handleScreenShot, showImgChooser, insertImage, editComment, deleteComment, showHideComment, showHideAllComments, newComment, handleSum, autoSelectionFormula, handleMerge, handleBorder, handleFreeze, handleSort, createFilter, clearFilter, toolbarItemSelectedFunc, toolbarItemClickHandler, handleTextColor, handleTextBackground, getDataBySelectionNoCopy, getInlineStringNoStyle, rangeHightlightselected, editSheetName, cancelActiveImgItem, MAX_ZOOM_RATIO, MIN_ZOOM_RATIO, addSheet, indexToColumnChar, sortSelection, handleCopy, insertRowCol, deleteRowCol, hideSelected, showSelected, api, removeActiveImage, deleteSelectedCellText, jfrefreshgrid, handleLink, deleteSheet, opToPatch, orderbydatafiler, getFilterColumnValues, getFilterColumnColors, saveFilter, patchToOp, filterPatch, inverseRowColOptions, ensureSheetIndex, initSheetIndex, handleGlobalKeyDown, handlePasteByLeanklin, groupValuesRefresh } from '@leankylin-sheet/core';
 import React, { useContext, useRef, useState, useMemo, useCallback, useEffect, useLayoutEffect, useImperativeHandle } from 'react';
 import produce, { applyPatches, enablePatches, produceWithPatches } from 'immer';
 import _ from 'lodash';
@@ -3280,10 +3280,30 @@ var SheetOverlay = function SheetOverlay() {
       handleCellAreaMouseMove(draftCtx, refs.globalCache, nativeEvent, refs.cellArea.current);
     });
   });
-  var _useThrottleFn = useThrottleFn(debounceMouseMove, {
+  var debounceDragOver = useMemoizedFn(function (e) {
+    var nativeEvent = e.nativeEvent;
+    setContext(function (draftCtx) {
+      handleCellAreaDragOver(draftCtx, refs.globalCache, nativeEvent, refs.cellArea.current);
+    });
+  });
+  var debounceCellDrop = useMemoizedFn(function (e) {
+    var nativeEvent = e.nativeEvent;
+    setContext(function (draftCtx) {
+      handleCellDrop(draftCtx, refs.globalCache, nativeEvent, refs.cellArea.current);
+    });
+  });
+  var _useThrottleFn = useThrottleFn(debounceDragOver, {
       wait: 100
     }),
-    cellAreaMouseMove = _useThrottleFn.run;
+    cellAreaDragOver = _useThrottleFn.run;
+  var _useThrottleFn2 = useThrottleFn(debounceCellDrop, {
+      wait: 100
+    }),
+    cellDrop = _useThrottleFn2.run;
+  var _useThrottleFn3 = useThrottleFn(debounceMouseMove, {
+      wait: 100
+    }),
+    cellAreaMouseMove = _useThrottleFn3.run;
   var cellAreaMouseLeave = useCallback(function () {
     setTimeout(function () {
       var _context$hooks$afterC, _context$hooks;
@@ -3442,6 +3462,14 @@ var SheetOverlay = function SheetOverlay() {
     onMouseDown: cellAreaMouseDown,
     onMouseMove: cellAreaMouseMove,
     onMouseLeave: cellAreaMouseLeave,
+    onDragOver: function onDragOver(e) {
+      e.preventDefault();
+      cellAreaDragOver(e);
+    },
+    onDrop: function onDrop(e) {
+      e.preventDefault();
+      cellDrop(e);
+    },
     onDoubleClick: cellAreaDoubleClick,
     onContextMenu: cellAreaContextMenu,
     style: {
@@ -3464,7 +3492,16 @@ var SheetOverlay = function SheetOverlay() {
     className: "leankylin-selection-copy-left leankylin-copy"
   }), /*#__PURE__*/React.createElement("div", {
     className: "leankylin-selection-copy-hc"
-  }))), context.formulaRangeHighlight.map(function (v) {
+  }))), context.dragRangeSelect && ( /*#__PURE__*/React.createElement("div", {
+    style: {
+      position: "absolute",
+      background: "rgba(0, 255, 0, 0.2)",
+      left: context.dragRangeSelect.left,
+      top: context.dragRangeSelect.top,
+      width: context.dragRangeSelect.width,
+      height: context.dragRangeSelect.height
+    }
+  })), context.formulaRangeHighlight.map(function (v) {
     var rangeIndex = v.rangeIndex,
       backgroundColor = v.backgroundColor;
     return /*#__PURE__*/React.createElement("div", {
@@ -7317,6 +7354,39 @@ var ContextMenu = function ContextMenu() {
         key: "divider-".concat(i)
       });
     }
+    if (name === "insert-comment") {
+      var _flowdata$row_index, _flowdata$row_index$c;
+      var flowdata = getFlowdata(context);
+      var row_index = selection === null || selection === void 0 ? void 0 : selection.row[0];
+      var col_index = selection === null || selection === void 0 ? void 0 : selection.column[0];
+      var hasPs = (flowdata === null || flowdata === void 0 ? void 0 : (_flowdata$row_index = flowdata[row_index]) === null || _flowdata$row_index === void 0 ? void 0 : (_flowdata$row_index$c = _flowdata$row_index[col_index]) === null || _flowdata$row_index$c === void 0 ? void 0 : _flowdata$row_index$c.ps) != null;
+      var itemData = hasPs ? [{
+        text: "编辑批注",
+        onClick: editComment
+      }, {
+        text: "删除批注",
+        onClick: deleteComment
+      }, {
+        text: "显示/隐藏批注",
+        onClick: showHideComment
+      }] : [{
+        text: "新建批注",
+        onClick: newComment
+      }];
+      return itemData.map(function (item) {
+        return /*#__PURE__*/React.createElement(Menu, {
+          key: item.text,
+          onClick: function onClick() {
+            if (row_index && col_index) {
+              setContext(function (draftCtx) {
+                item.onClick(draftCtx, refs.globalCache, row_index, col_index);
+                draftCtx.contextMenu = {};
+              });
+            }
+          }
+        }, item.text);
+      });
+    }
     if (name === "copy") {
       return /*#__PURE__*/React.createElement(Menu, {
         key: name,
@@ -7575,7 +7645,7 @@ var ContextMenu = function ContextMenu() {
             return colhidden[key] === 0;
           });
           var hiddenInCol = keys === null || keys === void 0 ? void 0 : keys.some(function (c) {
-            return Number(c) > start || Number(c) > end;
+            return Number(c) >= start && Number(c) <= end;
           });
           if (hiddenInCol) {
             mArr.push("showHide");

package/dist/index.js

@@ -3290,10 +3290,30 @@ var SheetOverlay = function SheetOverlay() {
       core.handleCellAreaMouseMove(draftCtx, refs.globalCache, nativeEvent, refs.cellArea.current);
     });
   });
-  var _useThrottleFn = ahooks.useThrottleFn(debounceMouseMove, {
+  var debounceDragOver = ahooks.useMemoizedFn(function (e) {
+    var nativeEvent = e.nativeEvent;
+    setContext(function (draftCtx) {
+      core.handleCellAreaDragOver(draftCtx, refs.globalCache, nativeEvent, refs.cellArea.current);
+    });
+  });
+  var debounceCellDrop = ahooks.useMemoizedFn(function (e) {
+    var nativeEvent = e.nativeEvent;
+    setContext(function (draftCtx) {
+      core.handleCellDrop(draftCtx, refs.globalCache, nativeEvent, refs.cellArea.current);
+    });
+  });
+  var _useThrottleFn = ahooks.useThrottleFn(debounceDragOver, {
       wait: 100
     }),
-    cellAreaMouseMove = _useThrottleFn.run;
+    cellAreaDragOver = _useThrottleFn.run;
+  var _useThrottleFn2 = ahooks.useThrottleFn(debounceCellDrop, {
+      wait: 100
+    }),
+    cellDrop = _useThrottleFn2.run;
+  var _useThrottleFn3 = ahooks.useThrottleFn(debounceMouseMove, {
+      wait: 100
+    }),
+    cellAreaMouseMove = _useThrottleFn3.run;
   var cellAreaMouseLeave = React.useCallback(function () {
     setTimeout(function () {
       var _context$hooks$afterC, _context$hooks;
@@ -3452,6 +3472,14 @@ var SheetOverlay = function SheetOverlay() {
     onMouseDown: cellAreaMouseDown,
     onMouseMove: cellAreaMouseMove,
     onMouseLeave: cellAreaMouseLeave,
+    onDragOver: function onDragOver(e) {
+      e.preventDefault();
+      cellAreaDragOver(e);
+    },
+    onDrop: function onDrop(e) {
+      e.preventDefault();
+      cellDrop(e);
+    },
     onDoubleClick: cellAreaDoubleClick,
     onContextMenu: cellAreaContextMenu,
     style: {
@@ -3474,7 +3502,16 @@ var SheetOverlay = function SheetOverlay() {
     className: "leankylin-selection-copy-left leankylin-copy"
   }), /*#__PURE__*/React__default['default'].createElement("div", {
     className: "leankylin-selection-copy-hc"
-  }))), context.formulaRangeHighlight.map(function (v) {
+  }))), context.dragRangeSelect && ( /*#__PURE__*/React__default['default'].createElement("div", {
+    style: {
+      position: "absolute",
+      background: "rgba(0, 255, 0, 0.2)",
+      left: context.dragRangeSelect.left,
+      top: context.dragRangeSelect.top,
+      width: context.dragRangeSelect.width,
+      height: context.dragRangeSelect.height
+    }
+  })), context.formulaRangeHighlight.map(function (v) {
     var rangeIndex = v.rangeIndex,
       backgroundColor = v.backgroundColor;
     return /*#__PURE__*/React__default['default'].createElement("div", {
@@ -7327,6 +7364,39 @@ var ContextMenu = function ContextMenu() {
         key: "divider-".concat(i)
       });
     }
+    if (name === "insert-comment") {
+      var _flowdata$row_index, _flowdata$row_index$c;
+      var flowdata = core.getFlowdata(context);
+      var row_index = selection === null || selection === void 0 ? void 0 : selection.row[0];
+      var col_index = selection === null || selection === void 0 ? void 0 : selection.column[0];
+      var hasPs = (flowdata === null || flowdata === void 0 ? void 0 : (_flowdata$row_index = flowdata[row_index]) === null || _flowdata$row_index === void 0 ? void 0 : (_flowdata$row_index$c = _flowdata$row_index[col_index]) === null || _flowdata$row_index$c === void 0 ? void 0 : _flowdata$row_index$c.ps) != null;
+      var itemData = hasPs ? [{
+        text: "编辑批注",
+        onClick: core.editComment
+      }, {
+        text: "删除批注",
+        onClick: core.deleteComment
+      }, {
+        text: "显示/隐藏批注",
+        onClick: core.showHideComment
+      }] : [{
+        text: "新建批注",
+        onClick: core.newComment
+      }];
+      return itemData.map(function (item) {
+        return /*#__PURE__*/React__default['default'].createElement(Menu, {
+          key: item.text,
+          onClick: function onClick() {
+            if (row_index && col_index) {
+              setContext(function (draftCtx) {
+                item.onClick(draftCtx, refs.globalCache, row_index, col_index);
+                draftCtx.contextMenu = {};
+              });
+            }
+          }
+        }, item.text);
+      });
+    }
     if (name === "copy") {
       return /*#__PURE__*/React__default['default'].createElement(Menu, {
         key: name,
@@ -7585,7 +7655,7 @@ var ContextMenu = function ContextMenu() {
             return colhidden[key] === 0;
           });
           var hiddenInCol = keys === null || keys === void 0 ? void 0 : keys.some(function (c) {
-            return Number(c) > start || Number(c) > end;
+            return Number(c) >= start && Number(c) <= end;
           });
           if (hiddenInCol) {
             mArr.push("showHide");