@fileverse-dev/fortune-react 1.3.12 → 1.3.13-create-1

package/lib/components/SheetOverlay/drag_and_drop/column-helpers.js

@@ -18,14 +18,33 @@ var __spreadArray = void 0 && (void 0).__spreadArray || function (to, from, pack
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-function numberToColumnName(num) {
-  var columnName = "";
-  while (num >= 0) {
-    var remainder = num % 26;
-    columnName = String.fromCharCode(65 + remainder) + columnName;
-    num = Math.floor(num / 26) - 1;
+var REF_TOKEN_REGEX = /((?:'(?:[^']|'')+'|[A-Za-z_][A-Za-z0-9_.]*)!)?(\$?)([A-Za-z]+)(\$?)(\d+)(?::(\$?)([A-Za-z]+)(\$?)(\d+))?/g;
+function normalizeSheetName(raw) {
+  if (!raw) return "";
+  var noBang = raw.endsWith("!") ? raw.slice(0, -1) : raw;
+  if (noBang.startsWith("'") && noBang.endsWith("'")) {
+    return noBang.slice(1, -1).replace(/''/g, "'");
   }
-  return columnName;
+  return noBang;
+}
+function remapFormulaCols(formula, formulaSheetName, movedSheetName, colMap) {
+  return formula.replace(REF_TOKEN_REGEX, function (token, sheetPrefix, colAbs0, col0, rowAbs0, row0, colAbs1, col1, rowAbs1, row1) {
+    var refSheet = normalizeSheetName(sheetPrefix) || formulaSheetName;
+    if (refSheet !== movedSheetName) return token;
+    var colIdx0 = (0, _fortuneCore.columnCharToIndex)(col0);
+    var mapped0 = colMap[colIdx0];
+    var nextCol0 = mapped0 == null ? col0 : (0, _fortuneCore.indexToColumnChar)(mapped0);
+    if (!col1) {
+      return "".concat(sheetPrefix || "").concat(colAbs0).concat(nextCol0).concat(rowAbs0).concat(row0);
+    }
+    var colIdx1 = (0, _fortuneCore.columnCharToIndex)(col1);
+    var mapped1 = colMap[colIdx1];
+    var nextCol1 = mapped1 == null ? col1 : (0, _fortuneCore.indexToColumnChar)(mapped1);
+    return "".concat(sheetPrefix || "").concat(colAbs0).concat(nextCol0).concat(rowAbs0).concat(row0, ":").concat(colAbs1).concat(nextCol1).concat(rowAbs1).concat(row1);
+  });
+}
+function numberToColumnName(num) {
+  return (0, _fortuneCore.indexToColumnChar)(num);
 }
 var useColumnDragAndDrop = exports.useColumnDragAndDrop = function useColumnDragAndDrop(containerRef, selectedLocationRef) {
   var DOUBLE_CLICK_MS = 300;
@@ -266,62 +285,29 @@ var useColumnDragAndDrop = exports.useColumnDragAndDrop = function useColumnDrag
           d === null || d === void 0 ? void 0 : d.forEach(function (row) {
             row.forEach(function (cell) {
               if (cell) {
-                var otherAffectedCols_1 = [];
+                var colMap_1 = {};
                 if (sourceIndex_1 < targetIndex) {
                   var start = selectedSourceCol === null || selectedSourceCol === void 0 ? void 0 : selectedSourceCol[selectedSourceCol.length - 1];
                   var last = selectedTargetCol === null || selectedTargetCol === void 0 ? void 0 : selectedTargetCol[selectedTargetCol.length - 1];
                   for (var c = start + 1; c <= last; c += 1) {
-                    otherAffectedCols_1.push({
-                      source: numberToColumnName(c),
-                      target: numberToColumnName(c - selectedSourceCol.length)
-                    });
+                    colMap_1[c] = c - selectedSourceCol.length;
                   }
                   selectedSourceCol.forEach(function (c, index) {
-                    otherAffectedCols_1.push({
-                      source: numberToColumnName(c),
-                      target: numberToColumnName(selectedTargetCol[index])
-                    });
+                    colMap_1[c] = selectedTargetCol[index];
                   });
                 } else if (sourceIndex_1 > targetIndex) {
                   var start = selectedTargetCol === null || selectedTargetCol === void 0 ? void 0 : selectedTargetCol[0];
                   var last = selectedSourceCol === null || selectedSourceCol === void 0 ? void 0 : selectedSourceCol[0];
                   for (var c = start; c < last; c += 1) {
-                    otherAffectedCols_1.push({
-                      source: numberToColumnName(c),
-                      target: numberToColumnName(c + selectedSourceCol.length)
-                    });
+                    colMap_1[c] = c + selectedSourceCol.length;
                   }
                   selectedSourceCol.forEach(function (c, index) {
-                    otherAffectedCols_1.push({
-                      source: numberToColumnName(c),
-                      target: numberToColumnName(selectedTargetCol[index])
-                    });
+                    colMap_1[c] = selectedTargetCol[index];
                   });
                 }
                 if (cell.f) {
-                  var formula_1 = cell.f;
-                  var replacements_1 = [];
-                  otherAffectedCols_1.forEach(function (col) {
-                    var regex = new RegExp("\\b".concat(col.source, "(\\d+)\\b"), "g");
-                    var match;
-                    while ((match = regex.exec(formula_1)) !== null) {
-                      if (/^\d+$/.test(match[1])) {
-                        replacements_1.push({
-                          start: match.index,
-                          end: match.index + match[0].length,
-                          original: match[0],
-                          replacement: "".concat(col.target).concat(match[1])
-                        });
-                      }
-                    }
-                  });
-                  replacements_1 === null || replacements_1 === void 0 ? void 0 : replacements_1.sort(function (a, b) {
-                    return b.start - a.start;
-                  });
-                  replacements_1 === null || replacements_1 === void 0 ? void 0 : replacements_1.forEach(function (rep) {
-                    formula_1 = formula_1.substring(0, rep.start) + rep.replacement + formula_1.substring(rep.end);
-                  });
-                  cell.f = formula_1;
+                  var sheetName = _sheet.name || "";
+                  cell.f = remapFormulaCols(cell.f, sheetName, sheetName, colMap_1);
                 }
               }
             });

package/lib/components/SheetOverlay/drag_and_drop/row-helpers.js

@@ -17,6 +17,29 @@ var __spreadArray = void 0 && (void 0).__spreadArray || function (to, from, pack
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
+var REF_TOKEN_REGEX = /((?:'(?:[^']|'')+'|[A-Za-z_][A-Za-z0-9_.]*)!)?(\$?)([A-Za-z]+)(\$?)(\d+)(?::(\$?)([A-Za-z]+)(\$?)(\d+))?/g;
+function normalizeSheetName(raw) {
+  if (!raw) return "";
+  var noBang = raw.endsWith("!") ? raw.slice(0, -1) : raw;
+  if (noBang.startsWith("'") && noBang.endsWith("'")) {
+    return noBang.slice(1, -1).replace(/''/g, "'");
+  }
+  return noBang;
+}
+function remapFormulaRows(formula, formulaSheetName, movedSheetName, rowMap) {
+  return formula.replace(REF_TOKEN_REGEX, function (token, sheetPrefix, colAbs0, col0, rowAbs0, row0, colAbs1, col1, rowAbs1, row1) {
+    var refSheet = normalizeSheetName(sheetPrefix) || formulaSheetName;
+    if (refSheet !== movedSheetName) return token;
+    var mapped0 = rowMap[parseInt(row0, 10) - 1];
+    var nextRow0 = mapped0 == null ? parseInt(row0, 10) : mapped0 + 1;
+    if (!row1) {
+      return "".concat(sheetPrefix || "").concat(colAbs0).concat(col0).concat(rowAbs0).concat(nextRow0);
+    }
+    var mapped1 = rowMap[parseInt(row1, 10) - 1];
+    var nextRow1 = mapped1 == null ? parseInt(row1, 10) : mapped1 + 1;
+    return "".concat(sheetPrefix || "").concat(colAbs0).concat(col0).concat(rowAbs0).concat(nextRow0, ":").concat(colAbs1).concat(col1).concat(rowAbs1).concat(nextRow1);
+  });
+}
 var useRowDragAndDrop = exports.useRowDragAndDrop = function useRowDragAndDrop(containerRef, selectedLocationRef) {
   var DOUBLE_MS = 300;
   var START_DRAG_THRESHOLD_PX = 6;
@@ -255,62 +278,29 @@ var useRowDragAndDrop = exports.useRowDragAndDrop = function useRowDragAndDrop(c
           d === null || d === void 0 ? void 0 : d.forEach(function (row) {
             row.forEach(function (cell) {
               if (cell) {
-                var otherAffectedRows_1 = [];
+                var rowMap_1 = {};
                 if (sourceIndex_1 < targetIndex) {
                   var start = selectedSourceRow === null || selectedSourceRow === void 0 ? void 0 : selectedSourceRow[selectedSourceRow.length - 1];
                   var last = selectedTargetRow === null || selectedTargetRow === void 0 ? void 0 : selectedTargetRow[selectedTargetRow.length - 1];
                   for (var c = start + 1; c < last; c += 1) {
-                    otherAffectedRows_1.push({
-                      source: c,
-                      target: c - selectedSourceRow.length
-                    });
+                    rowMap_1[c] = c - selectedSourceRow.length;
                   }
                   selectedSourceRow.forEach(function (c, index) {
-                    otherAffectedRows_1.push({
-                      source: c,
-                      target: selectedTargetRow[index]
-                    });
+                    rowMap_1[c] = selectedTargetRow[index];
                   });
                 } else {
                   var start = selectedTargetRow === null || selectedTargetRow === void 0 ? void 0 : selectedTargetRow[0];
                   var last = selectedSourceRow === null || selectedSourceRow === void 0 ? void 0 : selectedSourceRow[0];
                   for (var c = start; c < last; c += 1) {
-                    otherAffectedRows_1.push({
-                      source: c,
-                      target: c + +selectedSourceRow.length
-                    });
+                    rowMap_1[c] = c + selectedSourceRow.length;
                   }
                   selectedSourceRow.forEach(function (c, index) {
-                    otherAffectedRows_1.push({
-                      source: c,
-                      target: selectedTargetRow[index]
-                    });
+                    rowMap_1[c] = selectedTargetRow[index];
                   });
                 }
                 if (cell.f) {
-                  var formula_1 = cell.f;
-                  var replacements_1 = [];
-                  otherAffectedRows_1.forEach(function (_a) {
-                    var source = _a.source,
-                      target = _a.target;
-                    var regex = new RegExp("\\b([A-Z]+)".concat(source, "\\b"), "g");
-                    var match;
-                    while ((match = regex.exec(formula_1)) !== null) {
-                      replacements_1.push({
-                        start: match.index,
-                        end: match.index + match[0].length,
-                        original: match[0],
-                        replacement: "".concat(match[1]).concat(target)
-                      });
-                    }
-                  });
-                  replacements_1.sort(function (a, b) {
-                    return b.start - a.start;
-                  });
-                  replacements_1.forEach(function (rep) {
-                    formula_1 = formula_1.substring(0, rep.start) + rep.replacement + formula_1.substring(rep.end);
-                  });
-                  cell.f = formula_1;
+                  var sheetName = _sheet.name || "";
+                  cell.f = remapFormulaRows(cell.f, sheetName, sheetName, rowMap_1);
                 }
               }
             });
@@ -362,7 +352,7 @@ var useRowDragAndDrop = exports.useRowDragAndDrop = function useRowDragAndDrop(c
           }
           (_d = _sheet.calcChain) === null || _d === void 0 ? void 0 : _d.forEach(function (item) {
             if (selectedSourceRow.includes(item.r)) {
-              var index = selectedSourceRow.indexOf(item.c);
+              var index = selectedSourceRow.indexOf(item.r);
               item.r = selectedTargetRow[index];
             } else if (item.r > sourceIndex_1 && item.r < targetIndex) {
               item.r -= selectedSourceRow.length;

package/lib/components/SheetOverlay/formula-segment-boundary.d.ts

@@ -0,0 +1 @@
+export declare function isFormulaSegmentBoundaryKey(key: string): boolean;

package/lib/components/SheetOverlay/formula-segment-boundary.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isFormulaSegmentBoundaryKey = isFormulaSegmentBoundaryKey;
+var FORMULA_SEGMENT_BOUNDARY_KEYS = new Set([",", "+", "-", "*", "/", "%", "^", "&"]);
+function isFormulaSegmentBoundaryKey(key) {
+  return FORMULA_SEGMENT_BOUNDARY_KEYS.has(key);
+}

package/lib/components/SheetOverlay/helper.d.ts

@@ -1,6 +1,13 @@
 export declare function moveCursorToEnd(editableDiv: HTMLDivElement): void;
 export declare function getCursorPosition(editableDiv: HTMLDivElement): number;
+export declare function setCursorPosition(editableDiv: HTMLDivElement, targetOffset: number): void;
+export declare function buildFormulaSuggestionText(editableDiv: HTMLDivElement, formulaName: string): {
+    text: string;
+    caretOffset: number;
+};
 export declare function isLetterNumberPattern(str: string): boolean;
+export declare function shouldShowFormulaFunctionList(editor: HTMLDivElement | null): boolean;
+export declare function getFunctionNameFromFormulaCaretSpans(editor: HTMLDivElement | null): string | null;
 export declare function removeLastSpan(htmlString: string): string;
 export declare function numberToColumn(colNumber: number): string;
 export declare function incrementColumn(cell: string): string;

package/lib/components/SheetOverlay/helper.js

@@ -3,16 +3,20 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.buildFormulaSuggestionText = buildFormulaSuggestionText;
 exports.countCommasBeforeCursor = countCommasBeforeCursor;
 exports.decrementColumn = decrementColumn;
 exports.decrementRow = decrementRow;
 exports.getCursorPosition = getCursorPosition;
+exports.getFunctionNameFromFormulaCaretSpans = getFunctionNameFromFormulaCaretSpans;
 exports.incrementColumn = incrementColumn;
 exports.incrementRow = incrementRow;
 exports.isLetterNumberPattern = isLetterNumberPattern;
 exports.moveCursorToEnd = moveCursorToEnd;
 exports.numberToColumn = numberToColumn;
 exports.removeLastSpan = removeLastSpan;
+exports.setCursorPosition = setCursorPosition;
+exports.shouldShowFormulaFunctionList = shouldShowFormulaFunctionList;
 function moveCursorToEnd(editableDiv) {
   editableDiv.focus();
   var range = document.createRange();
@@ -33,10 +37,105 @@ function getCursorPosition(editableDiv) {
   preRange.setEnd(range.endContainer, range.endOffset);
   return preRange.toString().length;
 }
+function setCursorPosition(editableDiv, targetOffset) {
+  var _a, _b;
+  editableDiv.focus();
+  var selection = window.getSelection();
+  if (!selection) return;
+  var range = document.createRange();
+  var walker = document.createTreeWalker(editableDiv, NodeFilter.SHOW_TEXT);
+  var remaining = Math.max(0, targetOffset);
+  var node = walker.nextNode();
+  while (node) {
+    var textLength = (_b = (_a = node.textContent) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0;
+    if (remaining <= textLength) {
+      range.setStart(node, remaining);
+      range.collapse(true);
+      selection.removeAllRanges();
+      selection.addRange(range);
+      return;
+    }
+    remaining -= textLength;
+    node = walker.nextNode();
+  }
+  range.selectNodeContents(editableDiv);
+  range.collapse(false);
+  selection.removeAllRanges();
+  selection.addRange(range);
+}
+function buildFormulaSuggestionText(editableDiv, formulaName) {
+  var fullText = editableDiv.innerText || "";
+  var selection = window.getSelection();
+  var selectionInEditor = !!(selection === null || selection === void 0 ? void 0 : selection.rangeCount) && editableDiv.contains(selection.getRangeAt(0).startContainer);
+  var caretOffset = selectionInEditor ? getCursorPosition(editableDiv) : fullText.length;
+  var safeCaretOffset = Math.max(0, Math.min(caretOffset, fullText.length));
+  var beforeCaret = fullText.slice(0, safeCaretOffset);
+  var afterCaret = fullText.slice(safeCaretOffset);
+  var replaceStart = safeCaretOffset;
+  var tokenMatch = beforeCaret.match(/[A-Za-z_][A-Za-z0-9_]*$/);
+  if (tokenMatch) {
+    var token = tokenMatch[0];
+    var tokenStart = safeCaretOffset - token.length;
+    var charBeforeToken = tokenStart > 0 ? beforeCaret[tokenStart - 1] : "";
+    if (tokenStart === 0 || /[\s=(,+\-*/&^<>]$/.test(charBeforeToken)) {
+      replaceStart = tokenStart;
+    }
+  }
+  var shouldAddOpeningParen = !afterCaret.startsWith("(");
+  var insertedText = "".concat(formulaName).concat(shouldAddOpeningParen ? "(" : "");
+  var nextText = fullText.slice(0, replaceStart) + insertedText + afterCaret;
+  return {
+    text: nextText,
+    caretOffset: replaceStart + insertedText.length
+  };
+}
 function isLetterNumberPattern(str) {
   var regex = /^[a-zA-Z]+\d+$/;
   return regex.test(str);
 }
+function shouldShowFormulaFunctionList(editor) {
+  var _a, _b;
+  if (!editor) return false;
+  if (!((_a = editor.innerText) === null || _a === void 0 ? void 0 : _a.includes("="))) return false;
+  var parser = new DOMParser();
+  var doc = parser.parseFromString("<div>".concat(editor.innerHTML, "</div>"), "text/html");
+  var spans = doc.querySelectorAll("span");
+  var lastSpan = spans[spans.length - 1];
+  var lastText = (_b = lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText) !== null && _b !== void 0 ? _b : "";
+  return /^=?[A-Za-z]*$/.test(lastText);
+}
+var FORMULA_FUNC_CLASS = "luckysheet-formula-text-func";
+var FORMULA_LPAR_CLASS = "luckysheet-formula-text-lpar";
+function getFunctionNameFromFormulaCaretSpans(editor) {
+  var _a, _b;
+  if (!editor) return null;
+  var sel = window.getSelection();
+  if (!(sel === null || sel === void 0 ? void 0 : sel.rangeCount)) return null;
+  var range = sel.getRangeAt(0);
+  if (!editor.contains(range.startContainer)) return null;
+  var n = range.startContainer;
+  while (n && n !== editor) {
+    if (n.nodeType === Node.ELEMENT_NODE) {
+      var elem = n;
+      if (elem.classList.contains(FORMULA_FUNC_CLASS)) {
+        var next = elem.nextElementSibling;
+        if (next === null || next === void 0 ? void 0 : next.classList.contains(FORMULA_LPAR_CLASS)) {
+          var name_1 = (_a = elem.textContent) === null || _a === void 0 ? void 0 : _a.trim();
+          return name_1 ? name_1.toUpperCase() : null;
+        }
+      }
+      if (elem.classList.contains(FORMULA_LPAR_CLASS)) {
+        var prev = elem.previousElementSibling;
+        if (prev === null || prev === void 0 ? void 0 : prev.classList.contains(FORMULA_FUNC_CLASS)) {
+          var name_2 = (_b = prev.textContent) === null || _b === void 0 ? void 0 : _b.trim();
+          return name_2 ? name_2.toUpperCase() : null;
+        }
+      }
+    }
+    n = n.parentNode;
+  }
+  return null;
+}
 function removeLastSpan(htmlString) {
   var container = document.createElement("div");
   container.innerHTML = htmlString;

package/lib/components/SheetOverlay/index.css

@@ -336,9 +336,9 @@
   overflow: hidden;
   white-space: pre-wrap;
   outline: none;
-  -webkit-box-shadow: 0 2px 5px rgb(0 0 0 / 40%);
-  -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.4);
-  box-shadow: 0 2px 5px rgb(0 0 0 / 40%);
+  /* -webkit-box-shadow: 0 2px 5px rgb(0 0 0 / 40%);
+  -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.4); */
+  /* box-shadow: 0 2px 5px rgb(0 0 0 / 40%); */
   word-wrap: break-word;
   background-color: rgb(255, 255, 255);
   font-size: 13px;
@@ -356,7 +356,7 @@
 }
 
 .luckysheet-formula-text-color {
-  color: black;
+  color: darkred;
 }
 
 .luckysheet-formula-text-string {
@@ -801,44 +801,11 @@
 }
 
 .fortune-formula-functionrange-highlight .fortune-selection-copy-hc {
-  border: 2px solid #5e5e5e;
-  opacity: 0.03;
+  border-width: 2px;
+  border-style: dotted;
   z-index: initial;
 }
 
-.fortune-selection-highlight-lt {
-  left: -3px;
-  top: -3px;
-  cursor: se-resize;
-}
-
-.fortune-selection-highlight-rt {
-  right: -3px;
-  top: -3px;
-  cursor: ne-resize;
-}
-
-.fortune-selection-highlight-lb {
-  left: -3px;
-  bottom: -3px;
-  cursor: ne-resize;
-}
-
-.fortune-selection-highlight-rb {
-  right: -3px;
-  bottom: -3px;
-  cursor: se-resize;
-}
-
-.fortune-formula-functionrange-highlight .luckysheet-highlight {
-  position: absolute;
-  z-index: 19;
-  border: 1px solid #fff;
-  background: #0188fb;
-  width: 6px;
-  height: 6px;
-}
-
 .fortune-presence-username {
   position: absolute;
   padding-left: 6px;

package/lib/components/SheetOverlay/index.js

@@ -37,6 +37,22 @@ var __assign = void 0 && (void 0).__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
+function formulaRangeHighlightHcStyle(hex) {
+  var h = hex.replace("#", "");
+  if (h.length !== 6) {
+    return {
+      backgroundColor: hex,
+      borderColor: hex
+    };
+  }
+  var r = parseInt(h.slice(0, 2), 16);
+  var g = parseInt(h.slice(2, 4), 16);
+  var b = parseInt(h.slice(4, 6), 16);
+  return {
+    backgroundColor: "rgba(".concat(r, ",").concat(g, ",").concat(b, ",0.08)"),
+    borderColor: hex
+  };
+}
 var SheetOverlay = function SheetOverlay() {
   var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
   var _o = (0, _react.useContext)(_context.default),
@@ -58,6 +74,7 @@ var SheetOverlay = function SheetOverlay() {
       setContext(function (draftCtx) {
         var _a;
         (0, _fortuneCore.handleCellAreaMouseDown)(draftCtx, refs.globalCache, nativeEvent, refs.cellInput.current, refs.cellArea.current, refs.fxInput.current, refs.canvas.current.getContext("2d"));
+        var keepFormulaBarFocused = draftCtx.luckysheetCellUpdate.length > 0 && draftCtx.formulaCache.formulaEditorOwner === "fx" && (draftCtx.formulaCache.rangestart || draftCtx.formulaCache.rangedrag_column_start || draftCtx.formulaCache.rangedrag_row_start || (0, _fortuneCore.israngeseleciton)(draftCtx));
         if (!_lodash.default.isEmpty((_a = draftCtx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[0]) && refs.cellInput.current) {
           if (!(0, _fortuneCore.isAllowEdit)(draftCtx)) {
             setTimeout(function () {
@@ -69,7 +86,13 @@ var SheetOverlay = function SheetOverlay() {
           } else {
             setTimeout(function () {
               var _a;
-              (_a = refs.cellInput.current) === null || _a === void 0 ? void 0 : _a.focus();
+              if (keepFormulaBarFocused && refs.fxInput.current) {
+                refs.fxInput.current.focus({
+                  preventScroll: true
+                });
+              } else {
+                (_a = refs.cellInput.current) === null || _a === void 0 ? void 0 : _a.focus();
+              }
             });
           }
         }
@@ -299,18 +322,7 @@ var SheetOverlay = function SheetOverlay() {
       });
     }), /*#__PURE__*/_react.default.createElement("div", {
       className: "fortune-selection-copy-hc",
-      style: {
-        backgroundColor: backgroundColor
-      }
-    }), ["lt", "rt", "lb", "rb"].map(function (d) {
-      return /*#__PURE__*/_react.default.createElement("div", {
-        key: d,
-        "data-type": d,
-        className: "fortune-selection-highlight-".concat(d, " luckysheet-highlight"),
-        style: {
-          backgroundColor: backgroundColor
-        }
-      });
+      style: formulaRangeHighlightHcStyle(backgroundColor)
     }));
   }), /*#__PURE__*/_react.default.createElement("div", {
     className: "luckysheet-row-count-show luckysheet-count-show",
@@ -384,18 +396,18 @@ var SheetOverlay = function SheetOverlay() {
   }), ((_h = (_g = context.luckysheet_select_save) === null || _g === void 0 ? void 0 : _g.length) !== null && _h !== void 0 ? _h : 0) > 0 && (/*#__PURE__*/_react.default.createElement("div", {
     id: "luckysheet-cell-selected-boxs"
   }, context.luckysheet_select_save.map(function (selection, index) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     return /*#__PURE__*/_react.default.createElement("div", {
       key: index,
       id: "luckysheet-cell-selected",
-      className: "luckysheet-cell-selected",
+      className: "luckysheet-cell-selected".concat(((_b = (_a = context.luckysheetCellUpdate) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 0 ? " luckysheet-cell-selected-edit-mode" : ""),
       style: _lodash.default.assign({
         left: selection.left_move,
         top: selection.top_move,
         width: selection.width_move ? selection.width_move - 1.8 : selection.width_move,
         height: selection.height_move ? selection.height_move - 1.8 : selection.height_move,
         display: "block"
-      }, (0, _fortuneCore.fixRowStyleOverflowInFreeze)(context, selection.row[0], selection.row[1], (_a = refs.globalCache.freezen) === null || _a === void 0 ? void 0 : _a[context.currentSheetId]), (0, _fortuneCore.fixColumnStyleOverflowInFreeze)(context, selection.column[0], selection.column[1], (_b = refs.globalCache.freezen) === null || _b === void 0 ? void 0 : _b[context.currentSheetId])),
+      }, (0, _fortuneCore.fixRowStyleOverflowInFreeze)(context, selection.row[0], selection.row[1], (_c = refs.globalCache.freezen) === null || _c === void 0 ? void 0 : _c[context.currentSheetId]), (0, _fortuneCore.fixColumnStyleOverflowInFreeze)(context, selection.column[0], selection.column[1], (_d = refs.globalCache.freezen) === null || _d === void 0 ? void 0 : _d[context.currentSheetId])),
       onMouseDown: function onMouseDown(e) {
         e.stopPropagation();
         var nativeEvent = e.nativeEvent;

package/lib/components/Toolbar/index.js

@@ -658,7 +658,7 @@ var Toolbar = function Toolbar(_a) {
     }
   }, [cell, refs.globalCache]);
   var getToolbarItem = (0, _react.useCallback)(function (name, i) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f;
     var tooltip = toolbar[name];
     if (name === "|") {
       return /*#__PURE__*/_react.default.createElement(_Divider.default, {
@@ -723,10 +723,15 @@ var Toolbar = function Toolbar(_a) {
           return v.value === (curr_2 === null || curr_2 === void 0 ? void 0 : curr_2.fa);
         });
         if ((curr_2 === null || curr_2 === void 0 ? void 0 : curr_2.fa) != null) {
-          if (format != null) {
-            currentFmt_1 = format.text;
-          } else if (((_a = curr_2 === null || curr_2 === void 0 ? void 0 : curr_2.fa) === null || _a === void 0 ? void 0 : _a.includes("#,##0")) || (curr_2 === null || curr_2 === void 0 ? void 0 : curr_2.fa) === "0" || (curr_2 === null || curr_2 === void 0 ? void 0 : curr_2.fa) === "0.00") {
+          var hasTime = /[hH]:/.test(curr_2.fa);
+          if (curr_2.t === "d") {
+            currentFmt_1 = hasTime ? "Date time" : "Date";
+          } else if (curr_2.t === "n" || curr_2.fa.includes("#,##0") || curr_2.fa === "0" || curr_2.fa === "0.00") {
             currentFmt_1 = "Number";
+          } else if ((0, _fortuneCore.is_date)(curr_2.fa)) {
+            currentFmt_1 = hasTime ? "Date time" : "Date";
+          } else if (format != null) {
+            currentFmt_1 = format.text;
           } else {
             currentFmt_1 = defaultFormat[defaultFormat.length - 1].text;
           }
@@ -881,9 +886,9 @@ var Toolbar = function Toolbar(_a) {
         value: 2
       }];
       return /*#__PURE__*/_react.default.createElement(_Combo.default, {
-        iconId: ((_b = _lodash.default.find(items_1, function (item) {
+        iconId: ((_a = _lodash.default.find(items_1, function (item) {
           return "".concat(item.value) === "".concat(cell === null || cell === void 0 ? void 0 : cell.ht);
-        })) === null || _b === void 0 ? void 0 : _b.title) || "align-left",
+        })) === null || _a === void 0 ? void 0 : _a.title) || "align-left",
         key: name,
         tooltip: toolbar.horizontalAlign,
         showArrow: false
@@ -933,9 +938,9 @@ var Toolbar = function Toolbar(_a) {
         value: 2
       }];
       return /*#__PURE__*/_react.default.createElement(_Combo.default, {
-        iconId: ((_c = _lodash.default.find(items_2, function (item) {
+        iconId: ((_b = _lodash.default.find(items_2, function (item) {
           return "".concat(item.value) === "".concat(cell === null || cell === void 0 ? void 0 : cell.vt);
-        })) === null || _c === void 0 ? void 0 : _c.title) || "align-top",
+        })) === null || _b === void 0 ? void 0 : _b.title) || "align-top",
         key: name,
         tooltip: toolbar.verticalAlign,
         showArrow: false
@@ -1176,7 +1181,7 @@ var Toolbar = function Toolbar(_a) {
       });
     }
     if (name === "comment") {
-      var last = (_d = context.luckysheet_select_save) === null || _d === void 0 ? void 0 : _d[context.luckysheet_select_save.length - 1];
+      var last = (_c = context.luckysheet_select_save) === null || _c === void 0 ? void 0 : _c[context.luckysheet_select_save.length - 1];
       var row_index_1 = last === null || last === void 0 ? void 0 : last.row_focus;
       var col_index_1 = last === null || last === void 0 ? void 0 : last.column_focus;
       if (!last) {
@@ -1191,7 +1196,7 @@ var Toolbar = function Toolbar(_a) {
         }
       }
       var itemData_1;
-      if (((_f = (_e = flowdata === null || flowdata === void 0 ? void 0 : flowdata[row_index_1]) === null || _e === void 0 ? void 0 : _e[col_index_1]) === null || _f === void 0 ? void 0 : _f.ps) != null) {
+      if (((_e = (_d = flowdata === null || flowdata === void 0 ? void 0 : flowdata[row_index_1]) === null || _d === void 0 ? void 0 : _d[col_index_1]) === null || _e === void 0 ? void 0 : _e.ps) != null) {
         itemData_1 = [{
           key: "edit",
           text: comment.edit,
@@ -1704,7 +1709,7 @@ var Toolbar = function Toolbar(_a) {
       iconId: name,
       tooltip: tooltip,
       key: name,
-      selected: (_g = (0, _fortuneCore.toolbarItemSelectedFunc)(name)) === null || _g === void 0 ? void 0 : _g(cell),
+      selected: (_f = (0, _fortuneCore.toolbarItemSelectedFunc)(name)) === null || _f === void 0 ? void 0 : _f(cell),
       onClick: function onClick() {
         return setContext(function (draftCtx) {
           var _a;

package/lib/components/Workbook/api.d.ts

@@ -728,6 +728,8 @@ export declare function generateAPIs(context: Context, setContext: (recipe: (ctx
             conditionformat_equal_title: string;
             conditionformat_textContains: string;
             conditionformat_textContains_title: string;
+            conditionformat_empty: string;
+            conditionformat_empty_title: string;
             conditionformat_occurrenceDate: string;
             conditionformat_occurrenceDate_title: string;
             conditionformat_duplicateValue: string;
@@ -830,6 +832,7 @@ export declare function generateAPIs(context: Context, setContext: (recipe: (ctx
             between2: string;
             contain: string;
             textContains: string;
+            empty: string;
             duplicateValue: string;
             uniqueValue: string;
             top: string;

package/lib/components/Workbook/index.d.ts

@@ -735,6 +735,8 @@ declare const Workbook: React.ForwardRefExoticComponent<Settings & AdditionalPro
             conditionformat_equal_title: string;
             conditionformat_textContains: string;
             conditionformat_textContains_title: string;
+            conditionformat_empty: string;
+            conditionformat_empty_title: string;
             conditionformat_occurrenceDate: string;
             conditionformat_occurrenceDate_title: string;
             conditionformat_duplicateValue: string;
@@ -837,6 +839,7 @@ declare const Workbook: React.ForwardRefExoticComponent<Settings & AdditionalPro
             between2: string;
             contain: string;
             textContains: string;
+            empty: string;
             duplicateValue: string;
             uniqueValue: string;
             top: string;