@fileverse-dev/fortune-core 1.3.10-copyPaste-3 → 1.3.10-input-1

package/es/events/keyboard.js

@@ -378,10 +378,10 @@ export function handleArrowKey(ctx, e) {
   }
 }
 export function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, handleRedo, canvas) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   return __awaiter(this, void 0, void 0, function () {
-    var kcode, kstr, allowEdit, isFxInput, ignoredKeys, restCod, last, row_index, col_index, last, row_index, col_index;
-    return __generator(this, function (_d) {
+    var 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) {
       if (e.shiftKey && e.code === "Space") {
         e.stopImmediatePropagation();
         e.stopPropagation();
@@ -475,7 +475,18 @@ export function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUnd
           jfrefreshgrid(ctx, null, undefined);
           e.preventDefault();
         } else if (kstr === "ArrowUp" || kstr === "ArrowDown" || kstr === "ArrowLeft" || kstr === "ArrowRight") {
-          handleArrowKey(ctx, e);
+          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) {
+            updateCell(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput, undefined, canvas);
+            cache.enteredEditByTyping = false;
+            handleArrowKey(ctx, e);
+            e.preventDefault();
+          } else {
+            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 && !_.isEmpty(ctx.luckysheet_select_save) && kstr !== "CapsLock" && kstr !== "Win" && kcode !== 18) {
@@ -484,7 +495,10 @@ export function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUnd
             col_index = last.column_focus;
             ctx.luckysheetCellUpdate = [row_index, col_index];
             cache.overwriteCell = true;
+            cache.overwriteCellFirstChar = e.key;
+            cache.enteredEditByTyping = true;
             handleFormulaInput(ctx, fxInput, cellInput, kcode);
+            e.preventDefault();
           }
         }
       }

package/es/events/mouse.js

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

package/es/modules/cell.js

@@ -1041,7 +1041,7 @@ export function getFontStyleByCell(cell, checksAF, checksCF, isCheck) {
     if (key === "it" && valueNum !== 0) {
       style.fontStyle = "italic";
     }
-    if (key === "fs" && !_.isNil(value)) {
+    if (key === "fs" && valueNum !== 10) {
       style.fontSize = "".concat(valueNum, "pt");
     }
     if (key === "fc" && value !== "#000000" || ((_a = checksAF === null || checksAF === void 0 ? void 0 : checksAF.length) !== null && _a !== void 0 ? _a : 0) > 0 || (checksCF === null || checksCF === void 0 ? void 0 : checksCF.textColor)) {

package/es/modules/selection.js

@@ -1171,7 +1171,7 @@ export function rangeValueToHtml(ctx, sheetId, ranges) {
     cpdata += "<tr height=".concat(rowLen, "px >");
     var _loop_3 = function _loop_3(j) {
       var c = colIndexArr[j];
-      var column = '<td ${span} style="${style}" data-fortune-cell="${cellData}">';
+      var column = '<td ${span} style="${style}">';
       var cell = (_f = d[r]) === null || _f === void 0 ? void 0 : _f[c];
       if (cell != null) {
         var style = "";
@@ -1382,14 +1382,9 @@ export function rangeValueToHtml(ctx, sheetId, ranges) {
             }
           }
         }
-        var cellData = encodeURIComponent(JSON.stringify(__assign(__assign({}, cell), {
-          _srcRow: r,
-          _srcCol: c
-        })));
         column = replaceHtml(column, {
           style: style,
-          span: span,
-          cellData: cellData
+          span: span
         });
         if (_.isNil(c_value)) {
           c_value = getCellValue(r, c, d);
@@ -1439,8 +1434,7 @@ export function rangeValueToHtml(ctx, sheetId, ranges) {
         }
         column = replaceHtml(column, {
           style: style,
-          span: "",
-          cellData: ""
+          span: ""
         });
         column += "";
       }

package/es/paste-table-helpers.js

@@ -9,20 +9,11 @@ var __assign = this && this.__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
-var __rest = this && this.__rest || function (s, e) {
-  var t = {};
-  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
-  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
-  }
-  return t;
-};
 import _ from "lodash";
 import { locale } from "./locale";
 import { getQKBorder, saveHyperlink } from "./modules";
 import { getSheetIndex } from "./utils";
 import { setRowHeight, setColumnWidth } from "./api";
-import { adjustFormulaForPaste } from "./events/paste";
 export var DEFAULT_FONT_SIZE = 12;
 var parseStylesheetPairs = function parseStylesheetPairs(styleInner) {
   var patternReg = /{([^}]*)}/g;
@@ -136,28 +127,6 @@ function brToNewline(str) {
 }
 var buildCellFromTd = function buildCellFromTd(td, classStyles, ctx) {
   var _a, _b, _c, _d;
-  var fortuneCellAttr = td.getAttribute("data-fortune-cell");
-  if (fortuneCellAttr) {
-    try {
-      var _e = JSON.parse(decodeURIComponent(fortuneCellAttr)),
-        _srcRow = _e._srcRow,
-        _srcCol = _e._srcCol,
-        parsed = __rest(_e, ["_srcRow", "_srcCol"]);
-      var cell_1 = parsed;
-      delete cell_1.mc;
-      delete cell_1.hl;
-      var rowspan_1 = parseInt(td.getAttribute("rowspan") || "1", 10);
-      var colspan_1 = parseInt(td.getAttribute("colspan") || "1", 10);
-      return {
-        cell: cell_1,
-        rowspan: Number.isNaN(rowspan_1) ? 1 : rowspan_1,
-        colspan: Number.isNaN(colspan_1) ? 1 : colspan_1,
-        hyperlink: detectHyperlink(td),
-        srcRow: _srcRow,
-        srcCol: _srcCol
-      };
-    } catch (_f) {}
-  }
   var cell = {};
   var rawText = (td.innerText || td.innerHTML || "").trim();
   var isLineBreak = rawText.includes("<br />");
@@ -308,17 +277,10 @@ export function handlePastedTable(ctx, html, pasteHandler) {
         cell = _a.cell,
         rowspan = _a.rowspan,
         colspan = _a.colspan,
-        hyperlink = _a.hyperlink,
-        srcRow = _a.srcRow,
-        srcCol = _a.srcCol;
+        hyperlink = _a.hyperlink;
       var anchorCol = ctx.luckysheet_select_save[0].column[0];
       var absoluteRow = anchorRow + localRowIndex;
       var absoluteCol = anchorCol + localColIndex;
-      if (cell.f && srcRow != null && srcCol != null) {
-        try {
-          cell.f = adjustFormulaForPaste(cell.f, srcCol, srcRow, absoluteCol, absoluteRow);
-        } catch (_b) {}
-      }
       pastedMatrix[localRowIndex][localColIndex] = cell;
       if (hyperlink) {
         saveHyperlink(ctx, absoluteRow, absoluteCol, hyperlink.href, "webpage", hyperlink.display);

package/es/types.d.ts

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

package/lib/events/keyboard.js

@@ -388,10 +388,10 @@ function handleArrowKey(ctx, e) {
   }
 }
 function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, handleRedo, canvas) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   return __awaiter(this, void 0, void 0, function () {
-    var kcode, kstr, allowEdit, isFxInput, ignoredKeys, restCod, last, row_index, col_index, last, row_index, col_index;
-    return __generator(this, function (_d) {
+    var 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) {
       if (e.shiftKey && e.code === "Space") {
         e.stopImmediatePropagation();
         e.stopPropagation();
@@ -485,7 +485,18 @@ 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") {
-          handleArrowKey(ctx, e);
+          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);
+          }
         } 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) {
@@ -494,7 +505,10 @@ 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,6 +508,7 @@ 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/modules/cell.js

@@ -1074,7 +1074,7 @@ function getFontStyleByCell(cell, checksAF, checksCF, isCheck) {
     if (key === "it" && valueNum !== 0) {
       style.fontStyle = "italic";
     }
-    if (key === "fs" && !_lodash.default.isNil(value)) {
+    if (key === "fs" && valueNum !== 10) {
       style.fontSize = "".concat(valueNum, "pt");
     }
     if (key === "fc" && value !== "#000000" || ((_a = checksAF === null || checksAF === void 0 ? void 0 : checksAF.length) !== null && _a !== void 0 ? _a : 0) > 0 || (checksCF === null || checksCF === void 0 ? void 0 : checksCF.textColor)) {

package/lib/modules/selection.js

@@ -1206,7 +1206,7 @@ function rangeValueToHtml(ctx, sheetId, ranges) {
     cpdata += "<tr height=".concat(rowLen, "px >");
     var _loop_3 = function _loop_3(j) {
       var c = colIndexArr[j];
-      var column = '<td ${span} style="${style}" data-fortune-cell="${cellData}">';
+      var column = '<td ${span} style="${style}">';
       var cell = (_f = d[r]) === null || _f === void 0 ? void 0 : _f[c];
       if (cell != null) {
         var style = "";
@@ -1417,14 +1417,9 @@ function rangeValueToHtml(ctx, sheetId, ranges) {
             }
           }
         }
-        var cellData = encodeURIComponent(JSON.stringify(__assign(__assign({}, cell), {
-          _srcRow: r,
-          _srcCol: c
-        })));
         column = (0, _utils.replaceHtml)(column, {
           style: style,
-          span: span,
-          cellData: cellData
+          span: span
         });
         if (_lodash.default.isNil(c_value)) {
           c_value = (0, _cell.getCellValue)(r, c, d);
@@ -1474,8 +1469,7 @@ function rangeValueToHtml(ctx, sheetId, ranges) {
         }
         column = (0, _utils.replaceHtml)(column, {
           style: style,
-          span: "",
-          cellData: ""
+          span: ""
         });
         column += "";
       }

package/lib/paste-table-helpers.js

@@ -10,7 +10,6 @@ var _locale = require("./locale");
 var _modules = require("./modules");
 var _utils = require("./utils");
 var _api = require("./api");
-var _paste = require("./events/paste");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 var __assign = void 0 && (void 0).__assign || function () {
@@ -23,14 +22,6 @@ var __assign = void 0 && (void 0).__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
-var __rest = void 0 && (void 0).__rest || function (s, e) {
-  var t = {};
-  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
-  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
-  }
-  return t;
-};
 var DEFAULT_FONT_SIZE = exports.DEFAULT_FONT_SIZE = 12;
 var parseStylesheetPairs = function parseStylesheetPairs(styleInner) {
   var patternReg = /{([^}]*)}/g;
@@ -144,28 +135,6 @@ function brToNewline(str) {
 }
 var buildCellFromTd = function buildCellFromTd(td, classStyles, ctx) {
   var _a, _b, _c, _d;
-  var fortuneCellAttr = td.getAttribute("data-fortune-cell");
-  if (fortuneCellAttr) {
-    try {
-      var _e = JSON.parse(decodeURIComponent(fortuneCellAttr)),
-        _srcRow = _e._srcRow,
-        _srcCol = _e._srcCol,
-        parsed = __rest(_e, ["_srcRow", "_srcCol"]);
-      var cell_1 = parsed;
-      delete cell_1.mc;
-      delete cell_1.hl;
-      var rowspan_1 = parseInt(td.getAttribute("rowspan") || "1", 10);
-      var colspan_1 = parseInt(td.getAttribute("colspan") || "1", 10);
-      return {
-        cell: cell_1,
-        rowspan: Number.isNaN(rowspan_1) ? 1 : rowspan_1,
-        colspan: Number.isNaN(colspan_1) ? 1 : colspan_1,
-        hyperlink: detectHyperlink(td),
-        srcRow: _srcRow,
-        srcCol: _srcCol
-      };
-    } catch (_f) {}
-  }
   var cell = {};
   var rawText = (td.innerText || td.innerHTML || "").trim();
   var isLineBreak = rawText.includes("<br />");
@@ -316,17 +285,10 @@ function handlePastedTable(ctx, html, pasteHandler) {
         cell = _a.cell,
         rowspan = _a.rowspan,
         colspan = _a.colspan,
-        hyperlink = _a.hyperlink,
-        srcRow = _a.srcRow,
-        srcCol = _a.srcCol;
+        hyperlink = _a.hyperlink;
       var anchorCol = ctx.luckysheet_select_save[0].column[0];
       var absoluteRow = anchorRow + localRowIndex;
       var absoluteCol = anchorCol + localColIndex;
-      if (cell.f && srcRow != null && srcCol != null) {
-        try {
-          cell.f = (0, _paste.adjustFormulaForPaste)(cell.f, srcCol, srcRow, absoluteCol, absoluteRow);
-        } catch (_b) {}
-      }
       pastedMatrix[localRowIndex][localColIndex] = cell;
       if (hyperlink) {
         (0, _modules.saveHyperlink)(ctx, absoluteRow, absoluteCol, hyperlink.href, "webpage", hyperlink.display);

package/lib/types.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.3.10-copyPaste-3",
+  "version": "1.3.10-input-1",
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",