@fileverse-dev/fortune-core 1.3.11-mixed → 1.3.12

package/es/modules/inline-string.js

@@ -291,6 +291,9 @@ function extendCssText(origin, cover, isLimit) {
   }
   return newCss;
 }
+function escapeHtmlAttr(s) {
+  return s.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/'/g, "&#39;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
 export function updateInlineStringFormat(ctx, attr, value, cellInput) {
   var _a, _b, _c;
   var w = window.getSelection();
@@ -298,6 +301,34 @@ export function updateInlineStringFormat(ctx, attr, value, cellInput) {
   if (w.rangeCount === 0) return;
   var range = w.getRangeAt(0);
   var $textEditor = cellInput;
+  if (range.startContainer === $textEditor && range.endContainer === $textEditor && range.collapsed === false) {
+    var start = range.startOffset;
+    var end = range.endOffset;
+    var children = Array.from($textEditor.childNodes).slice(start, end);
+    children.forEach(function (node) {
+      var _a, _b;
+      if (node.nodeType === Node.ELEMENT_NODE) {
+        var el = node;
+        if (el.tagName === "SPAN") {
+          var cssText = getCssText(el.style.cssText, attr, value);
+          el.setAttribute("style", cssText);
+        }
+      } else if (node.nodeType === Node.TEXT_NODE) {
+        var text = (_a = node.textContent) !== null && _a !== void 0 ? _a : "";
+        if (text.length === 0) return;
+        var wrapper = document.createElement("span");
+        var cssText = getCssText("", attr, value);
+        wrapper.setAttribute("style", cssText);
+        wrapper.textContent = text;
+        (_b = node.parentNode) === null || _b === void 0 ? void 0 : _b.replaceChild(wrapper, node);
+      }
+    });
+    var newRange = document.createRange();
+    newRange.selectNodeContents($textEditor);
+    w.removeAllRanges();
+    w.addRange(newRange);
+    return;
+  }
   if (range.collapsed === true) {
     return;
   }
@@ -335,7 +366,7 @@ export function updateInlineStringFormat(ctx, attr, value, cellInput) {
               cssText = extendCssText(box.style.cssText, cssText);
             }
           }
-          cont += "<span style='".concat(cssText, "'>").concat(left, "</span>");
+          cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\">").concat(left, "</span>");
         }
         if (mid !== "") {
           var cssText = getCssText(span.style.cssText, attr, value);
@@ -345,7 +376,7 @@ export function updateInlineStringFormat(ctx, attr, value, cellInput) {
               cssText = extendCssText(box.style.cssText, cssText);
             }
           }
-          cont += "<span style='".concat(cssText, "'>").concat(mid, "</span>");
+          cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\">").concat(mid, "</span>");
         }
         if (right !== "") {
           var cssText = span.style.cssText;
@@ -355,7 +386,7 @@ export function updateInlineStringFormat(ctx, attr, value, cellInput) {
               cssText = extendCssText(box.style.cssText, cssText);
             }
           }
-          cont += "<span style='".concat(cssText, "'>").concat(right, "</span>");
+          cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\">").concat(right, "</span>");
         }
         if (((_a = startContainer.parentElement) === null || _a === void 0 ? void 0 : _a.tagName) === "SPAN") {
           spanIndex = _.indexOf($textEditor.querySelectorAll("span"), span);
@@ -398,33 +429,33 @@ export function updateInlineStringFormat(ctx, attr, value, cellInput) {
         for (var i = 0; i < startSpanIndex; i += 1) {
           var span = spans[i];
           var content = span.innerHTML;
-          cont += "<span style='".concat(span.style.cssText, "'>").concat(content, "</span>");
+          cont += "<span style=\"".concat(escapeHtmlAttr(span.style.cssText), "\">").concat(content, "</span>");
         }
         if (sleft !== "") {
-          cont += "<span style='".concat(startSpan.style.cssText, "'>").concat(sleft, "</span>");
+          cont += "<span style=\"".concat(escapeHtmlAttr(startSpan.style.cssText), "\">").concat(sleft, "</span>");
         }
         if (sright !== "") {
           var cssText = getCssText(startSpan.style.cssText, attr, value);
-          cont += "<span style='".concat(cssText, "'>").concat(sright, "</span>");
+          cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\">").concat(sright, "</span>");
         }
         if (startSpanIndex < endSpanIndex) {
           for (var i = startSpanIndex + 1; i < endSpanIndex; i += 1) {
             var span = spans[i];
             var content = span.innerHTML;
-            cont += "<span style='".concat(span.style.cssText, "'>").concat(content, "</span>");
+            cont += "<span style=\"".concat(escapeHtmlAttr(span.style.cssText), "\">").concat(content, "</span>");
           }
         }
         if (eleft !== "") {
           var cssText = getCssText(endSpan.style.cssText, attr, value);
-          cont += "<span style='".concat(cssText, "'>").concat(eleft, "</span>");
+          cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\">").concat(eleft, "</span>");
         }
         if (eright !== "") {
-          cont += "<span style='".concat(endSpan.style.cssText, "'>").concat(eright, "</span>");
+          cont += "<span style=\"".concat(escapeHtmlAttr(endSpan.style.cssText), "\">").concat(eright, "</span>");
         }
         for (var i = endSpanIndex + 1; i < spans.length; i += 1) {
           var span = spans[i];
           var content = span.innerHTML;
-          cont += "<span style='".concat(span.style.cssText, "'>").concat(content, "</span>");
+          cont += "<span style=\"".concat(escapeHtmlAttr(span.style.cssText), "\">").concat(content, "</span>");
         }
         $textEditor.innerHTML = cont;
         var startSeletedNodeIndex = void 0;
@@ -442,13 +473,10 @@ export function updateInlineStringFormat(ctx, attr, value, cellInput) {
     }
   }
 }
-function escapeHtmlAttr(s) {
-  return s.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
-}
 function getLinkDataAttrs(span) {
   var _a, _b;
   if (((_a = span.dataset) === null || _a === void 0 ? void 0 : _a.linkType) && ((_b = span.dataset) === null || _b === void 0 ? void 0 : _b.linkAddress)) {
-    return " data-link-type='".concat(escapeHtmlAttr(span.dataset.linkType), "' data-link-address='").concat(escapeHtmlAttr(span.dataset.linkAddress), "'");
+    return " data-link-type=\"".concat(escapeHtmlAttr(span.dataset.linkType), "\" data-link-address=\"").concat(escapeHtmlAttr(span.dataset.linkAddress), "\"");
   }
   return "";
 }
@@ -486,7 +514,7 @@ export function applyLinkToSelection(cellInput, linkType, linkAddress) {
         var box = span.closest("#luckysheet-input-box");
         if (box != null) cssText = extendCssText(box.style.cssText, cssText);
       }
-      cont += "<span style='".concat(cssText, "'").concat(dataAttrs, ">").concat(left, "</span>");
+      cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\"").concat(dataAttrs, ">").concat(left, "</span>");
     }
     if (mid !== "") {
       var cssText = getLinkStyleCssText(span.style.cssText);
@@ -494,7 +522,7 @@ export function applyLinkToSelection(cellInput, linkType, linkAddress) {
         var box = span.closest("#luckysheet-input-box");
         if (box != null) cssText = extendCssText(box.style.cssText, cssText);
       }
-      cont += "<span style='".concat(cssText, "' data-link-type='").concat(escapeHtmlAttr(linkType), "' data-link-address='").concat(escapeHtmlAttr(linkAddress), "'>").concat(mid, "</span>");
+      cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\" data-link-type=\"").concat(escapeHtmlAttr(linkType), "\" data-link-address=\"").concat(escapeHtmlAttr(linkAddress), "\">").concat(mid, "</span>");
     }
     if (right !== "") {
       var cssText = span.style.cssText;
@@ -502,7 +530,7 @@ export function applyLinkToSelection(cellInput, linkType, linkAddress) {
         var box = span.closest("#luckysheet-input-box");
         if (box != null) cssText = extendCssText(box.style.cssText, cssText);
       }
-      cont += "<span style='".concat(cssText, "'").concat(dataAttrs, ">").concat(right, "</span>");
+      cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\"").concat(dataAttrs, ">").concat(right, "</span>");
     }
     if (((_a = startContainer.parentElement) === null || _a === void 0 ? void 0 : _a.tagName) === "SPAN") {
       span.outerHTML = cont;
@@ -532,32 +560,32 @@ export function applyLinkToSelection(cellInput, linkType, linkAddress) {
     var cont = "";
     for (var i = 0; i < startSpanIndex; i += 1) {
       var sp = spans[i];
-      cont += "<span style='".concat(sp.style.cssText, "'").concat(getLinkDataAttrs(sp), ">").concat(sp.innerHTML, "</span>");
+      cont += "<span style=\"".concat(escapeHtmlAttr(sp.style.cssText), "\"").concat(getLinkDataAttrs(sp), ">").concat(sp.innerHTML, "</span>");
     }
     if (sleft !== "") {
-      cont += "<span style='".concat(startSpan.style.cssText, "'").concat(getLinkDataAttrs(startSpan), ">").concat(sleft, "</span>");
+      cont += "<span style=\"".concat(escapeHtmlAttr(startSpan.style.cssText), "\"").concat(getLinkDataAttrs(startSpan), ">").concat(sleft, "</span>");
     }
     if (sright !== "") {
       var cssText = getLinkStyleCssText(startSpan.style.cssText);
-      cont += "<span style='".concat(cssText, "' data-link-type='").concat(escapeHtmlAttr(linkType), "' data-link-address='").concat(escapeHtmlAttr(linkAddress), "'>").concat(sright, "</span>");
+      cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\" data-link-type=\"").concat(escapeHtmlAttr(linkType), "\" data-link-address=\"").concat(escapeHtmlAttr(linkAddress), "\">").concat(sright, "</span>");
     }
     if (startSpanIndex < endSpanIndex) {
       for (var i = startSpanIndex + 1; i < endSpanIndex; i += 1) {
         var sp = spans[i];
         var cssText = getLinkStyleCssText(sp.style.cssText);
-        cont += "<span style='".concat(cssText, "' data-link-type='").concat(escapeHtmlAttr(linkType), "' data-link-address='").concat(escapeHtmlAttr(linkAddress), "'>").concat(sp.innerHTML, "</span>");
+        cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\" data-link-type=\"").concat(escapeHtmlAttr(linkType), "\" data-link-address=\"").concat(escapeHtmlAttr(linkAddress), "\">").concat(sp.innerHTML, "</span>");
       }
     }
     if (eleft !== "") {
       var cssText = getLinkStyleCssText(endSpan.style.cssText);
-      cont += "<span style='".concat(cssText, "' data-link-type='").concat(escapeHtmlAttr(linkType), "' data-link-address='").concat(escapeHtmlAttr(linkAddress), "'>").concat(eleft, "</span>");
+      cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\" data-link-type=\"").concat(escapeHtmlAttr(linkType), "\" data-link-address=\"").concat(escapeHtmlAttr(linkAddress), "\">").concat(eleft, "</span>");
     }
     if (eright !== "") {
-      cont += "<span style='".concat(endSpan.style.cssText, "'").concat(getLinkDataAttrs(endSpan), ">").concat(eright, "</span>");
+      cont += "<span style=\"".concat(escapeHtmlAttr(endSpan.style.cssText), "\"").concat(getLinkDataAttrs(endSpan), ">").concat(eright, "</span>");
     }
     for (var i = endSpanIndex + 1; i < spans.length; i += 1) {
       var sp = spans[i];
-      cont += "<span style='".concat(sp.style.cssText, "'").concat(getLinkDataAttrs(sp), ">").concat(sp.innerHTML, "</span>");
+      cont += "<span style=\"".concat(escapeHtmlAttr(sp.style.cssText), "\"").concat(getLinkDataAttrs(sp), ">").concat(sp.innerHTML, "</span>");
     }
     $textEditor.innerHTML = cont;
     spans = $textEditor.querySelectorAll("span");

package/es/modules/validation.js

@@ -66,7 +66,6 @@ var MONTH_NAME_MAP = {
 };
 var MONTH_NAMES_RE = "january|february|march|april|may|june|july|august|september|october|november|december|jan|feb|mar|apr|jun|jul|aug|sep|oct|nov|dec";
 var MONTH_ABBR_RE = "jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec";
-var MONTH_ABBR_SET = new Set(MONTH_ABBR_RE.split("|"));
 function isValidDateParts(year, month, day) {
   if (year < 1900) return false;
   if (month < 1 || month > 12) return false;
@@ -281,7 +280,6 @@ export function detectDateFormat(str) {
     var d = +m[2];
     var y = +m[3];
     if (mo && isValidDateParts(y, mo, d)) {
-      var isAbbr = MONTH_ABBR_SET.has(m[1].toLowerCase());
       return {
         year: y,
         month: mo,
@@ -289,7 +287,7 @@ export function detectDateFormat(str) {
         hours: 0,
         minutes: 0,
         seconds: 0,
-        formatType: isAbbr ? "named-mdy-abbr" : "named-mdy-full"
+        formatType: "named"
       };
     }
   }
@@ -299,7 +297,6 @@ export function detectDateFormat(str) {
     var mo = MONTH_NAME_MAP[m[2].toLowerCase()];
     var y = +m[3];
     if (mo && isValidDateParts(y, mo, d)) {
-      var isAbbr = MONTH_ABBR_SET.has(m[2].toLowerCase());
       return {
         year: y,
         month: mo,
@@ -307,7 +304,7 @@ export function detectDateFormat(str) {
         hours: 0,
         minutes: 0,
         seconds: 0,
-        formatType: isAbbr ? "named-dmy-abbr" : "named-dmy-full"
+        formatType: "named"
       };
     }
   }
@@ -324,7 +321,7 @@ export function detectDateFormat(str) {
         hours: 0,
         minutes: 0,
         seconds: 0,
-        formatType: "named-abbr-dashes"
+        formatType: "named"
       };
     }
   }

package/es/types.d.ts

@@ -328,8 +328,6 @@ export type GlobalCache = {
     verticalScrollLock?: boolean;
     horizontalScrollLock?: boolean;
     overwriteCell?: boolean;
-    overwriteCellFirstChar?: string;
-    enteredEditByTyping?: boolean;
     ignoreWriteCell?: boolean;
     doNotFocus?: boolean;
     doNotUpdateCell?: boolean;

package/lib/events/keyboard.js

@@ -179,72 +179,63 @@ function moveToEdge(sheetData, key, curr, rowDelta, colDelta, startR, endR, star
   return colDelta === 0 ? r : c;
 }
 function handleControlPlusArrowKey(ctx, e, shiftPressed) {
-  var _a, _b, _c, _d;
+  if (ctx.luckysheetCellUpdate.length > 0) return;
   var idx = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
   if (_lodash.default.isNil(idx)) return;
   var file = ctx.luckysheetfile[idx];
+  if (!file || !file.row || !file.column) return;
   var maxRow = file.row;
   var maxCol = file.column;
-  if (_lodash.default.isNil(maxRow) || _lodash.default.isNil(maxCol)) return;
-  var last = ctx.luckysheet_select_save && ctx.luckysheet_select_save.length > 0 ? ctx.luckysheet_select_save[ctx.luckysheet_select_save.length - 1] : undefined;
+  var last;
+  if (ctx.luckysheet_select_save && ctx.luckysheet_select_save.length > 0) last = ctx.luckysheet_select_save[ctx.luckysheet_select_save.length - 1];
   if (!last) return;
   var currR = last.row_focus;
   var currC = last.column_focus;
   if (_lodash.default.isNil(currR) || _lodash.default.isNil(currC)) return;
-  var startR = (_a = last.row) === null || _a === void 0 ? void 0 : _a[0];
-  var endR = (_b = last.row) === null || _b === void 0 ? void 0 : _b[1];
-  var startC = (_c = last.column) === null || _c === void 0 ? void 0 : _c[0];
-  var endC = (_d = last.column) === null || _d === void 0 ? void 0 : _d[1];
-  if (_lodash.default.isNil(startR) || _lodash.default.isNil(endR) || _lodash.default.isNil(startC) || _lodash.default.isNil(endC)) {
-    return;
-  }
+  var startR = last.row[0];
+  var endR = last.row[1];
+  var startC = last.column[0];
+  var endC = last.column[1];
   var horizontalOffset = currC - endC !== 0 ? currC - endC : currC - startC;
   var verticalOffset = currR - endR !== 0 ? currR - endR : currR - startR;
   var sheetData = file.data;
   if (!sheetData) return;
+  var selectedLimit;
   switch (e.key) {
     case "ArrowUp":
-      {
-        var selectedLimit = moveToEdge(sheetData, e.key, currC, -1, 0, startR, endR, startC, endC, maxRow, maxCol);
-        if (shiftPressed) {
-          (0, _selection.moveHighlightRange)(ctx, "down", verticalOffset, "rangeOfSelect");
-          (0, _selection.moveHighlightRange)(ctx, "down", selectedLimit - currR, "rangeOfSelect");
-        } else {
-          (0, _selection.moveHighlightCell)(ctx, "down", selectedLimit - currR, "rangeOfSelect");
-        }
+      selectedLimit = moveToEdge(sheetData, e.key, currC, -1, 0, startR, endR, startC, endC, maxRow, maxCol);
+      if (shiftPressed) {
+        (0, _selection.moveHighlightRange)(ctx, "down", verticalOffset, "rangeOfSelect");
+        (0, _selection.moveHighlightRange)(ctx, "down", selectedLimit - currR, "rangeOfSelect");
+      } else {
+        (0, _selection.moveHighlightCell)(ctx, "down", selectedLimit - currR, "rangeOfSelect");
       }
       break;
     case "ArrowDown":
-      {
-        var selectedLimit = moveToEdge(sheetData, e.key, currC, 1, 0, startR, endR, startC, endC, maxRow, maxCol);
-        if (shiftPressed) {
-          (0, _selection.moveHighlightRange)(ctx, "down", verticalOffset, "rangeOfSelect");
-          (0, _selection.moveHighlightRange)(ctx, "down", selectedLimit - currR, "rangeOfSelect");
-        } else {
-          (0, _selection.moveHighlightCell)(ctx, "down", selectedLimit - currR, "rangeOfSelect");
-        }
+      selectedLimit = moveToEdge(sheetData, e.key, currC, 1, 0, startR, endR, startC, endC, maxRow, maxCol);
+      if (shiftPressed) {
+        (0, _selection.moveHighlightRange)(ctx, "down", verticalOffset, "rangeOfSelect");
+        (0, _selection.moveHighlightRange)(ctx, "down", selectedLimit - currR, "rangeOfSelect");
+      } else {
+        (0, _selection.moveHighlightCell)(ctx, "down", selectedLimit - currR, "rangeOfSelect");
       }
       break;
     case "ArrowLeft":
-      {
-        var selectedLimit = moveToEdge(sheetData, e.key, currR, 0, -1, startR, endR, startC, endC, maxRow, maxCol);
-        if (shiftPressed) {
-          (0, _selection.moveHighlightRange)(ctx, "right", horizontalOffset, "rangeOfSelect");
-          (0, _selection.moveHighlightRange)(ctx, "right", selectedLimit - currC, "rangeOfSelect");
-        } else {
-          (0, _selection.moveHighlightCell)(ctx, "right", selectedLimit - currC, "rangeOfSelect");
-        }
+      selectedLimit = moveToEdge(sheetData, e.key, currR, 0, -1, startR, endR, startC, endC, maxRow, maxCol);
+      if (shiftPressed) {
+        (0, _selection.moveHighlightRange)(ctx, "right", horizontalOffset, "rangeOfSelect");
+        (0, _selection.moveHighlightRange)(ctx, "right", selectedLimit - currC, "rangeOfSelect");
+      } else {
+        (0, _selection.moveHighlightCell)(ctx, "right", selectedLimit - currC, "rangeOfSelect");
       }
       break;
     case "ArrowRight":
-      {
-        var selectedLimit = moveToEdge(sheetData, e.key, currR, 0, 1, startR, endR, startC, endC, maxRow, maxCol);
-        if (shiftPressed) {
-          (0, _selection.moveHighlightRange)(ctx, "right", horizontalOffset, "rangeOfSelect");
-          (0, _selection.moveHighlightRange)(ctx, "right", selectedLimit - currC, "rangeOfSelect");
-        } else {
-          (0, _selection.moveHighlightCell)(ctx, "right", selectedLimit - currC, "rangeOfSelect");
-        }
+      selectedLimit = moveToEdge(sheetData, e.key, currR, 0, 1, startR, endR, startC, endC, maxRow, maxCol);
+      if (shiftPressed) {
+        (0, _selection.moveHighlightRange)(ctx, "right", horizontalOffset, "rangeOfSelect");
+        (0, _selection.moveHighlightRange)(ctx, "right", selectedLimit - currC, "rangeOfSelect");
+      } else {
+        (0, _selection.moveHighlightCell)(ctx, "right", selectedLimit - currC, "rangeOfSelect");
       }
       break;
     default:
@@ -397,10 +388,10 @@ function handleArrowKey(ctx, e) {
   }
 }
 function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, handleRedo, canvas) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c;
   return __awaiter(this, void 0, void 0, function () {
-    var handledFlvShortcut, kcode, kstr, allowEdit, isFxInput, ignoredKeys, restCod, last, row_index, col_index, isEditing, inputText, isFormulaEdit, enteredByTyping, last, row_index, col_index;
-    return __generator(this, function (_e) {
+    var handledFlvShortcut, kcode, kstr, allowEdit, isFxInput, ignoredKeys, restCod, last, row_index, col_index, last, row_index, col_index;
+    return __generator(this, function (_d) {
       if (e.shiftKey && e.code === "Space") {
         e.stopImmediatePropagation();
         e.stopPropagation();
@@ -508,18 +499,7 @@ function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, hand
           (0, _refresh.jfrefreshgrid)(ctx, null, undefined);
           e.preventDefault();
         } else if (kstr === "ArrowUp" || kstr === "ArrowDown" || kstr === "ArrowLeft" || kstr === "ArrowRight") {
-          isEditing = ctx.luckysheetCellUpdate.length > 0;
-          inputText = (_d = cellInput === null || cellInput === void 0 ? void 0 : cellInput.innerText) !== null && _d !== void 0 ? _d : "";
-          isFormulaEdit = isEditing && inputText.trim().startsWith("=");
-          enteredByTyping = cache.enteredEditByTyping === true;
-          if (isEditing && !isFormulaEdit && enteredByTyping) {
-            (0, _cell.updateCell)(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput, undefined, canvas);
-            cache.enteredEditByTyping = false;
-            handleArrowKey(ctx, e);
-            e.preventDefault();
-          } else {
-            handleArrowKey(ctx, e);
-          }
+          handleArrowKey(ctx, e);
         } else if (!(kcode >= 112 && kcode <= 123 || kcode <= 46 || kcode === 144 || kcode === 108 || e.ctrlKey || e.altKey || e.shiftKey && (kcode === 37 || kcode === 38 || kcode === 39 || kcode === 40)) || kcode === 8 || kcode === 32 || kcode === 46 || kcode === 0 || e.ctrlKey && kcode === 86) {
           if (!allowEdit) return [2];
           if (String.fromCharCode(kcode) != null && !_lodash.default.isEmpty(ctx.luckysheet_select_save) && kstr !== "CapsLock" && kstr !== "Win" && kcode !== 18) {
@@ -528,10 +508,7 @@ function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, hand
             col_index = last.column_focus;
             ctx.luckysheetCellUpdate = [row_index, col_index];
             cache.overwriteCell = true;
-            cache.overwriteCellFirstChar = e.key;
-            cache.enteredEditByTyping = true;
             (0, _formula.handleFormulaInput)(ctx, fxInput, cellInput, kcode);
-            e.preventDefault();
           }
         }
       }

package/lib/events/mouse.js

@@ -508,7 +508,6 @@ function handleCellAreaDoubleClick(ctx, globalCache, settings, e, container) {
     row_index = row_focus;
     col_index = column_focus;
   }
-  globalCache.enteredEditByTyping = false;
   (0, _cell.luckysheetUpdateCell)(ctx, row_index, col_index);
 }
 function handleContextMenu(ctx, settings, e, workbookContainer, container, area) {

package/lib/events/paste.js

@@ -236,7 +236,7 @@ var handleFormulaOnPaste = function handleFormulaOnPaste(ctx, d) {
   }
 };
 function pasteHandler(ctx, data, borderInfo) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
   if (ctx.luckysheet_selection_range) {
     ctx.luckysheet_selection_range = [];
   }
@@ -420,39 +420,25 @@ function pasteHandler(ctx, data, borderInfo) {
           }
         }
         if (originCell) {
-          if (!isUrl) {
-            var generated = (0, _format.genarate)(originalValueStr);
-            if (generated) {
-              var genM = generated[0],
-                genCt = generated[1],
-                genV = generated[2];
-              if ((genCt === null || genCt === void 0 ? void 0 : genCt.t) === "d") {
-                originCell.v = genV;
-                originCell.m = genM !== null && genM !== void 0 ? genM : originalValueStr;
-                originCell.ct = genCt;
-              } else {
-                originCell.v = value;
-                if (originCell.ct != null && originCell.ct.fa != null) {
-                  if (originCell.ct.t === "d" && typeof originCell.v !== "number") {
-                    originCell.m = String(originCell.v);
-                  } else {
-                    originCell.m = (0, _format.update)(originCell.ct.fa, originCell.v);
-                  }
-                } else {
-                  originCell.m = typeof originCell.v === "boolean" ? String(originCell.v) : originCell.v;
-                }
-              }
+          if (originCell.ct && originCell.ct.t === "d" && !isUrl) {
+            var df = (0, _validation.detectDateFormat)(originalValueStr);
+            if (df) {
+              var dateObj = new Date(df.year, df.month - 1, df.day, df.hours, df.minutes, df.seconds);
+              originCell.v = (0, _format.datenum_local)(dateObj);
             } else {
-              originCell.v = value;
-              if (originCell.ct != null && originCell.ct.fa != null) {
-                originCell.m = (0, _format.update)(originCell.ct.fa, originCell.v);
-              } else {
-                originCell.m = typeof originCell.v === "boolean" ? String(originCell.v) : originCell.v;
-              }
+              originCell.v = originalValueStr;
+            }
+          } else {
+            originCell.v = isUrl ? originalValueStr : value;
+          }
+          if (originCell.ct != null && originCell.ct.fa != null) {
+            if (originCell.ct.t === "d" && typeof originCell.v !== "number") {
+              originCell.m = String(originCell.v);
+            } else {
+              originCell.m = (0, _format.update)(originCell.ct.fa, originCell.v);
             }
           } else {
-            originCell.v = originalValueStr;
-            originCell.m = originalValueStr;
+            originCell.m = typeof originCell.v === "boolean" ? String(originCell.v) : originCell.v;
           }
           if (originCell.f != null && originCell.f.length > 0) {
             originCell.f = "";
@@ -479,24 +465,19 @@ function pasteHandler(ctx, data, borderInfo) {
               t: "s"
             };
           } else {
+            cell.v = originalValueStr;
+            cell.m = originalValueStr;
+            cell.ct = {
+              fa: "General",
+              t: "g"
+            };
             if (/^0x?[a-fA-F0-9]+$/.test(value)) {
-              cell.v = value;
               cell.m = value;
               cell.ct = {
                 fa: "@",
                 t: "s"
               };
-            } else {
-              var _m = (_j = (0, _format.genarate)(originalValueStr)) !== null && _j !== void 0 ? _j : [],
-                m = _m[0],
-                ct = _m[1],
-                v = _m[2];
-              cell.v = v !== null && v !== void 0 ? v : originalValueStr;
-              cell.m = m != null ? String(m) : originalValueStr;
-              cell.ct = ct !== null && ct !== void 0 ? ct : {
-                fa: "General",
-                t: "g"
-              };
+              cell.v = value;
             }
           }
           if (isUrl && url) {
@@ -527,8 +508,8 @@ function pasteHandler(ctx, data, borderInfo) {
       }
       d[r + curR] = x;
     }
-    if ((_k = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _k === void 0 ? void 0 : _k.updateCellYdoc) {
-      (_l = ctx.hooks) === null || _l === void 0 ? void 0 : _l.updateCellYdoc(changes);
+    if ((_j = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _j === void 0 ? void 0 : _j.updateCellYdoc) {
+      (_k = ctx.hooks) === null || _k === void 0 ? void 0 : _k.updateCellYdoc(changes);
     }
     last.row = [curR, curR + rlen - 1];
     last.column = [curC, curC + clen - 1];

package/lib/locale/en.d.ts

@@ -530,8 +530,6 @@ declare const _default: {
         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;
@@ -635,7 +633,6 @@ declare const _default: {
         between2: string;
         contain: string;
         textContains: string;
-        empty: string;
         duplicateValue: string;
         uniqueValue: string;
         top: string;

package/lib/locale/en.js

@@ -9634,8 +9634,6 @@ var _default = exports.default = {
     conditionformat_equal_title: "Format cells equal to",
     conditionformat_textContains: "Conditional format - Text Contains",
     conditionformat_textContains_title: "Format cells containing the following text",
-    conditionformat_empty: "Conditional format - Empty",
-    conditionformat_empty_title: "Format cells that are empty",
     conditionformat_occurrenceDate: "Conditional format - Occurrence Date",
     conditionformat_occurrenceDate_title: "Format cells containing the following dates",
     conditionformat_duplicateValue: "Conditional format - Duplicate Value",
@@ -9739,7 +9737,6 @@ var _default = exports.default = {
     between2: "",
     contain: "Contain",
     textContains: "Text contains",
-    empty: "Empty",
     duplicateValue: "Duplicate value",
     uniqueValue: "Unique value",
     top: "Top",

package/lib/locale/es.d.ts

@@ -688,8 +688,6 @@ declare const _default: {
         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;
@@ -791,7 +789,6 @@ declare const _default: {
         between2: string;
         contain: string;
         textContains: string;
-        empty: string;
         duplicateValue: string;
         uniqueValue: string;
         top: string;

package/lib/locale/es.js

@@ -9571,8 +9571,6 @@ var _default = exports.default = {
     conditionformat_equal_title: "Dar formato a celdas iguales a",
     conditionformat_textContains: "Conditionformat-TextContains",
     conditionformat_textContains_title: "Dar formato a las celdas que contienen el siguiente texto",
-    conditionformat_empty: "Conditional format - Empty",
-    conditionformat_empty_title: "Dar formato a las celdas vacías",
     conditionformat_occurrenceDate: "Conditionformat-OccurrenceDate",
     conditionformat_occurrenceDate_title: "Dar formato a celdas que contienen las siguientes fechas",
     conditionformat_duplicateValue: "Conditionformat-DuplicateValue",
@@ -9674,7 +9672,6 @@ var _default = exports.default = {
     between2: "",
     contain: "Contiene",
     textContains: "Texto contiene",
-    empty: "Vacío",
     duplicateValue: "Valor duplicado",
     uniqueValue: "Valor Unico",
     top: "Mejor",

package/lib/locale/hi.d.ts

@@ -563,8 +563,6 @@ declare const _default: {
         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;
@@ -666,7 +664,6 @@ declare const _default: {
         between2: string;
         contain: string;
         textContains: string;
-        empty: string;
         duplicateValue: string;
         uniqueValue: string;
         top: string;

package/lib/locale/hi.js

@@ -10084,8 +10084,6 @@ var _default = exports.default = {
     conditionformat_equal_title: "के बराबर कोशिकाओं को प्रारूपित करें",
     conditionformat_textContains: "Conditionformat-TextContains",
     conditionformat_textContains_title: "निम्नलिखित पाठ वाली कोशिकाओं को प्रारूपित करें",
-    conditionformat_empty: "Conditional format - Empty",
-    conditionformat_empty_title: "खाली कोशिकाओं को प्रारूपित करें",
     conditionformat_occurrenceDate: "Conditionformat-OccurrenceDate",
     conditionformat_occurrenceDate_title: "निम्नलिखित तिथियों वाली कोशिकाओं को प्रारूपित करें",
     conditionformat_duplicateValue: "Conditionformat-DuplicateValue",
@@ -10187,7 +10185,6 @@ var _default = exports.default = {
     between2: "",
     contain: "शामिल",
     textContains: "पाठ शामिल है",
-    empty: "खाली",
     duplicateValue: "डुप्लिकेट मान",
     uniqueValue: "अद्वितीय मान",
     top: "शीर्ष",