@leankylin-sheet/react 4.0.9 → 4.0.10

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, handleCellAreaDragOver, handleCellDrop, handleCellAreaDoubleClick, selectAll, showLinkCard, getCellRowColumn, getCellHyperlink, handleOverlayMouseMove, handleOverlayMouseUp, handleKeydownForZoom, handleOverlayTouchStart, handleOverlayTouchMove, handleOverlayTouchEnd, 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, 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, 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';
@@ -1166,11 +1166,6 @@ var InputBox = function InputBox() {
   var col_index = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.column_focus;
   var preText = useRef("");
   var inputBoxStyle = useMemo(function () {
-    if (firstSelection && context.luckysheetCellUpdate.length > 0) {
-      var flowdata = getFlowdata(context);
-      if (!flowdata) return {};
-      return getStyleByCell(context, flowdata, firstSelection.row_focus, firstSelection.column_focus);
-    }
     return {};
   }, [context.luckysheetfile, context.currentSheetId, context.luckysheetCellUpdate, firstSelection]);
   useLayoutEffect(function () {
@@ -1296,6 +1291,9 @@ var InputBox = function InputBox() {
     },
     onMouseUp: function onMouseUp(e) {
       return e.stopPropagation();
+    },
+    onContextMenu: function onContextMenu(e) {
+      return e.stopPropagation();
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: "luckysheet-input-box-inner",
@@ -3820,7 +3818,8 @@ var SheetOverlay = function SheetOverlay() {
     onClick: onLeftTopClick,
     style: {
       width: context.rowHeaderWidth - 1.5,
-      height: context.columnHeaderHeight - 1.5
+      height: context.columnHeaderHeight - 1.5,
+      background: context.headerBgColor
     }
   }), /*#__PURE__*/React.createElement(ColumnHeader, null)), (context.showSearch || context.showReplace) && /*#__PURE__*/React.createElement(SearchReplace, null), /*#__PURE__*/React.createElement("div", {
     className: "leankylin-row-body"
@@ -3875,36 +3874,29 @@ var SheetOverlay = function SheetOverlay() {
     }
   })), context.formulaRangeHighlight.map(function (v) {
     var rangeIndex = v.rangeIndex,
-      backgroundColor = v.backgroundColor;
+      backgroundColor = v.backgroundColor,
+      height = v.height,
+      left = v.left,
+      top = v.top,
+      width = v.width;
     return /*#__PURE__*/React.createElement("div", {
       key: rangeIndex,
       id: "leankylin-formula-functionrange-highlight",
       className: "leankylin-selection-highlight leankylin-formula-functionrange-highlight",
-      style: _.omit(v, "backgroundColor")
-    }, ["top", "right", "bottom", "left"].map(function (d) {
-      return /*#__PURE__*/React.createElement("div", {
-        key: d,
-        "data-type": d,
-        className: "leankylin-selection-copy-".concat(d, " leankylin-copy"),
-        style: {
-          backgroundColor: backgroundColor
-        }
-      });
-    }), /*#__PURE__*/React.createElement("div", {
-      className: "leankylin-selection-copy-hc",
-      style: {
-        backgroundColor: backgroundColor
+      style: _.isEmpty(context.luckysheetCellUpdate) ? {
+        height: height - 2,
+        left: left,
+        top: top,
+        width: width - 2,
+        border: "1px dashed ".concat(backgroundColor)
+      } : {
+        height: height - 4,
+        left: left,
+        top: top,
+        width: width - 4,
+        border: "2px solid ".concat(backgroundColor)
       }
-    }), ["lt", "rt", "lb", "rb"].map(function (d) {
-      return /*#__PURE__*/React.createElement("div", {
-        key: d,
-        "data-type": d,
-        className: "leankylin-selection-highlight-".concat(d, " luckysheet-highlight"),
-        style: {
-          backgroundColor: backgroundColor
-        }
-      });
-    }));
+    });
   }), /*#__PURE__*/React.createElement("div", {
     className: "luckysheet-row-count-show luckysheet-count-show",
     id: "luckysheet-row-count-show"
@@ -11379,6 +11371,7 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       } else {
         draftCtx.addDefaultRows = mergedSettings.addRows;
       }
+      draftCtx.headerBgColor = mergedSettings.headerBgColor || "#fff";
       if (!_.isNil(sheet.defaultColWidth)) {
         draftCtx.defaultcollen = Number(sheet.defaultColWidth);
       } else {

package/dist/index.js

@@ -1176,11 +1176,6 @@ var InputBox = function InputBox() {
   var col_index = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.column_focus;
   var preText = React.useRef("");
   var inputBoxStyle = React.useMemo(function () {
-    if (firstSelection && context.luckysheetCellUpdate.length > 0) {
-      var flowdata = core.getFlowdata(context);
-      if (!flowdata) return {};
-      return core.getStyleByCell(context, flowdata, firstSelection.row_focus, firstSelection.column_focus);
-    }
     return {};
   }, [context.luckysheetfile, context.currentSheetId, context.luckysheetCellUpdate, firstSelection]);
   React.useLayoutEffect(function () {
@@ -1306,6 +1301,9 @@ var InputBox = function InputBox() {
     },
     onMouseUp: function onMouseUp(e) {
       return e.stopPropagation();
+    },
+    onContextMenu: function onContextMenu(e) {
+      return e.stopPropagation();
     }
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: "luckysheet-input-box-inner",
@@ -3830,7 +3828,8 @@ var SheetOverlay = function SheetOverlay() {
     onClick: onLeftTopClick,
     style: {
       width: context.rowHeaderWidth - 1.5,
-      height: context.columnHeaderHeight - 1.5
+      height: context.columnHeaderHeight - 1.5,
+      background: context.headerBgColor
     }
   }), /*#__PURE__*/React__default['default'].createElement(ColumnHeader, null)), (context.showSearch || context.showReplace) && /*#__PURE__*/React__default['default'].createElement(SearchReplace, null), /*#__PURE__*/React__default['default'].createElement("div", {
     className: "leankylin-row-body"
@@ -3885,36 +3884,29 @@ var SheetOverlay = function SheetOverlay() {
     }
   })), context.formulaRangeHighlight.map(function (v) {
     var rangeIndex = v.rangeIndex,
-      backgroundColor = v.backgroundColor;
+      backgroundColor = v.backgroundColor,
+      height = v.height,
+      left = v.left,
+      top = v.top,
+      width = v.width;
     return /*#__PURE__*/React__default['default'].createElement("div", {
       key: rangeIndex,
       id: "leankylin-formula-functionrange-highlight",
       className: "leankylin-selection-highlight leankylin-formula-functionrange-highlight",
-      style: ___default['default'].omit(v, "backgroundColor")
-    }, ["top", "right", "bottom", "left"].map(function (d) {
-      return /*#__PURE__*/React__default['default'].createElement("div", {
-        key: d,
-        "data-type": d,
-        className: "leankylin-selection-copy-".concat(d, " leankylin-copy"),
-        style: {
-          backgroundColor: backgroundColor
-        }
-      });
-    }), /*#__PURE__*/React__default['default'].createElement("div", {
-      className: "leankylin-selection-copy-hc",
-      style: {
-        backgroundColor: backgroundColor
+      style: ___default['default'].isEmpty(context.luckysheetCellUpdate) ? {
+        height: height - 2,
+        left: left,
+        top: top,
+        width: width - 2,
+        border: "1px dashed ".concat(backgroundColor)
+      } : {
+        height: height - 4,
+        left: left,
+        top: top,
+        width: width - 4,
+        border: "2px solid ".concat(backgroundColor)
       }
-    }), ["lt", "rt", "lb", "rb"].map(function (d) {
-      return /*#__PURE__*/React__default['default'].createElement("div", {
-        key: d,
-        "data-type": d,
-        className: "leankylin-selection-highlight-".concat(d, " luckysheet-highlight"),
-        style: {
-          backgroundColor: backgroundColor
-        }
-      });
-    }));
+    });
   }), /*#__PURE__*/React__default['default'].createElement("div", {
     className: "luckysheet-row-count-show luckysheet-count-show",
     id: "luckysheet-row-count-show"
@@ -11389,6 +11381,7 @@ var Workbook = /*#__PURE__*/React__default['default'].forwardRef(function (_ref,
       } else {
         draftCtx.addDefaultRows = mergedSettings.addRows;
       }
+      draftCtx.headerBgColor = mergedSettings.headerBgColor || "#fff";
       if (!___default['default'].isNil(sheet.defaultColWidth)) {
         draftCtx.defaultcollen = Number(sheet.defaultColWidth);
       } else {

package/dist/index.umd.js

@@ -94514,11 +94514,6 @@
     var col_index = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.column_focus;
     var preText = React.useRef("");
     var inputBoxStyle = React.useMemo(function () {
-      if (firstSelection && context.luckysheetCellUpdate.length > 0) {
-        var flowdata = getFlowdata(context);
-        if (!flowdata) return {};
-        return getStyleByCell(context, flowdata, firstSelection.row_focus, firstSelection.column_focus);
-      }
       return {};
     }, [context.luckysheetfile, context.currentSheetId, context.luckysheetCellUpdate, firstSelection]);
     React.useLayoutEffect(function () {
@@ -94644,6 +94639,9 @@
       },
       onMouseUp: function onMouseUp(e) {
         return e.stopPropagation();
+      },
+      onContextMenu: function onContextMenu(e) {
+        return e.stopPropagation();
       }
     }, /*#__PURE__*/React__default['default'].createElement("div", {
       className: "luckysheet-input-box-inner",
@@ -97168,7 +97166,8 @@
       onClick: onLeftTopClick,
       style: {
         width: context.rowHeaderWidth - 1.5,
-        height: context.columnHeaderHeight - 1.5
+        height: context.columnHeaderHeight - 1.5,
+        background: context.headerBgColor
       }
     }), /*#__PURE__*/React__default['default'].createElement(ColumnHeader, null)), (context.showSearch || context.showReplace) && /*#__PURE__*/React__default['default'].createElement(SearchReplace, null), /*#__PURE__*/React__default['default'].createElement("div", {
       className: "leankylin-row-body"
@@ -97223,36 +97222,29 @@
       }
     })), context.formulaRangeHighlight.map(function (v) {
       var rangeIndex = v.rangeIndex,
-        backgroundColor = v.backgroundColor;
+        backgroundColor = v.backgroundColor,
+        height = v.height,
+        left = v.left,
+        top = v.top,
+        width = v.width;
       return /*#__PURE__*/React__default['default'].createElement("div", {
         key: rangeIndex,
         id: "leankylin-formula-functionrange-highlight",
         className: "leankylin-selection-highlight leankylin-formula-functionrange-highlight",
-        style: lodash.omit(v, "backgroundColor")
-      }, ["top", "right", "bottom", "left"].map(function (d) {
-        return /*#__PURE__*/React__default['default'].createElement("div", {
-          key: d,
-          "data-type": d,
-          className: "leankylin-selection-copy-".concat(d, " leankylin-copy"),
-          style: {
-            backgroundColor: backgroundColor
-          }
-        });
-      }), /*#__PURE__*/React__default['default'].createElement("div", {
-        className: "leankylin-selection-copy-hc",
-        style: {
-          backgroundColor: backgroundColor
+        style: lodash.isEmpty(context.luckysheetCellUpdate) ? {
+          height: height - 2,
+          left: left,
+          top: top,
+          width: width - 2,
+          border: "1px dashed ".concat(backgroundColor)
+        } : {
+          height: height - 4,
+          left: left,
+          top: top,
+          width: width - 4,
+          border: "2px solid ".concat(backgroundColor)
         }
-      }), ["lt", "rt", "lb", "rb"].map(function (d) {
-        return /*#__PURE__*/React__default['default'].createElement("div", {
-          key: d,
-          "data-type": d,
-          className: "leankylin-selection-highlight-".concat(d, " luckysheet-highlight"),
-          style: {
-            backgroundColor: backgroundColor
-          }
-        });
-      }));
+      });
     }), /*#__PURE__*/React__default['default'].createElement("div", {
       className: "luckysheet-row-count-show luckysheet-count-show",
       id: "luckysheet-row-count-show"
@@ -104727,6 +104719,7 @@
         } else {
           draftCtx.addDefaultRows = mergedSettings.addRows;
         }
+        draftCtx.headerBgColor = mergedSettings.headerBgColor || "#fff";
         if (!lodash.isNil(sheet.defaultColWidth)) {
           draftCtx.defaultcollen = Number(sheet.defaultColWidth);
         } else {