@fileverse-dev/fortune-core 1.2.32 → 1.2.33

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;
+  var _a, _b, _c;
   return __awaiter(this, void 0, void 0, function () {
-    var kcode, kstr, allowEdit, last, row_index, col_index, last, row_index, col_index;
-    return __generator(this, function (_b) {
+    var 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();
@@ -420,7 +420,10 @@ export function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUnd
         ctx.luckysheet_selection_range = [];
       }
       allowEdit = isAllowEdit(ctx);
-      if (ctx.luckysheetCellUpdate.length > 0 && kstr !== "Enter" && kstr !== "Tab" && kstr !== "ArrowUp" && kstr !== "ArrowLeft" && kstr !== "ArrowRight") {
+      isFxInput = (_b = (_a = event === null || event === void 0 ? void 0 : event.target) === null || _a === void 0 ? void 0 : _a.classList) === null || _b === void 0 ? void 0 : _b.contains("fortune-fx-input");
+      ignoredKeys = new Set(isFxInput ? ["Enter", "Tab", "ArrowLeft", "ArrowRight"] : ["Enter", "Tab", "ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight"]);
+      restCod = !ignoredKeys.has(kstr);
+      if (ctx.luckysheetCellUpdate.length > 0 && restCod) {
         return [2];
       }
       if (kstr === "Enter") {
@@ -441,7 +444,7 @@ export function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUnd
         if (ctx.luckysheetCellUpdate.length > 0) {
           return [2];
         }
-        last = (_a = ctx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[ctx.luckysheet_select_save.length - 1];
+        last = (_c = ctx.luckysheet_select_save) === null || _c === void 0 ? void 0 : _c[ctx.luckysheet_select_save.length - 1];
         if (!last) return [2];
         row_index = last.row_focus;
         col_index = last.column_focus;

package/es/events/paste.js

@@ -29,7 +29,7 @@ var __assign = this && this.__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
-import _ from "lodash";
+import _, { isObject } from "lodash";
 import { handlePastedTable } from "../paste-table-helpers";
 import { getFlowdata } from "../context";
 import { execfunction } from "../modules/formula";
@@ -181,10 +181,28 @@ function postPasteCut(ctx, source, target, RowlChange) {
   ctx.formulaCache.execFunctionGlobalData = null;
   storeSheetParamALL(ctx);
 }
+var handleFormulaOnPaste = function handleFormulaOnPaste(ctx, d) {
+  var _a;
+  for (var r = 0; r < d.length; r += 1) {
+    var x = d[r];
+    for (var c = 0; c < d[0].length; c += 1) {
+      var value = isObject(d[r][c]) ? (_a = d[r][c]) === null || _a === void 0 ? void 0 : _a.v : d[r][c];
+      if (value && String(value).includes('=')) {
+        var cell = {};
+        var funcV = execfunction(ctx, String(value), r, c, undefined, undefined, true);
+        console.log(funcV);
+        cell.v = funcV[1];
+        cell.f = funcV[2];
+        cell.m = funcV[1].toString();
+        x[c] = cell;
+      }
+      d[r] = x;
+    }
+  }
+};
 function pasteHandler(ctx, data, borderInfo) {
   var _a;
   var _b, _c, _d, _e, _f, _g;
-  console.log("pasteHandler");
   if (ctx.luckysheet_selection_range) {
     ctx.luckysheet_selection_range = [];
   }
@@ -295,6 +313,7 @@ function pasteHandler(ctx, data, borderInfo) {
       ctx.luckysheetfile[getSheetIndex(ctx, ctx.currentSheetId)].config = cfg;
     }
     jfrefreshgrid(ctx, null, undefined);
+    handleFormulaOnPaste(ctx, d);
   } else {
     data = data.replace(/\r/g, "");
     var dataChe = [];
@@ -369,6 +388,7 @@ function pasteHandler(ctx, data, borderInfo) {
     last.row = [curR, curR + rlen - 1];
     last.column = [curC, curC + clen - 1];
     jfrefreshgrid(ctx, null, undefined);
+    handleFormulaOnPaste(ctx, d);
   }
 }
 function setCellHyperlink(ctx, id, r, c, link) {

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;
+  var _a, _b, _c;
   return __awaiter(this, void 0, void 0, function () {
-    var kcode, kstr, allowEdit, last, row_index, col_index, last, row_index, col_index;
-    return __generator(this, function (_b) {
+    var 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();
@@ -430,7 +430,10 @@ function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, hand
         ctx.luckysheet_selection_range = [];
       }
       allowEdit = (0, _utils.isAllowEdit)(ctx);
-      if (ctx.luckysheetCellUpdate.length > 0 && kstr !== "Enter" && kstr !== "Tab" && kstr !== "ArrowUp" && kstr !== "ArrowLeft" && kstr !== "ArrowRight") {
+      isFxInput = (_b = (_a = event === null || event === void 0 ? void 0 : event.target) === null || _a === void 0 ? void 0 : _a.classList) === null || _b === void 0 ? void 0 : _b.contains("fortune-fx-input");
+      ignoredKeys = new Set(isFxInput ? ["Enter", "Tab", "ArrowLeft", "ArrowRight"] : ["Enter", "Tab", "ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight"]);
+      restCod = !ignoredKeys.has(kstr);
+      if (ctx.luckysheetCellUpdate.length > 0 && restCod) {
         return [2];
       }
       if (kstr === "Enter") {
@@ -451,7 +454,7 @@ function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, hand
         if (ctx.luckysheetCellUpdate.length > 0) {
           return [2];
         }
-        last = (_a = ctx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[ctx.luckysheet_select_save.length - 1];
+        last = (_c = ctx.luckysheet_select_save) === null || _c === void 0 ? void 0 : _c[ctx.luckysheet_select_save.length - 1];
         if (!last) return [2];
         row_index = last.row_focus;
         col_index = last.column_focus;

package/lib/events/paste.js

@@ -10,7 +10,7 @@ exports.handlePaste = handlePaste;
 exports.handlePasteByClick = handlePasteByClick;
 exports.indexToColumnLabel = indexToColumnLabel;
 exports.parseAsLinkIfUrl = parseAsLinkIfUrl;
-var _lodash = _interopRequireDefault(require("lodash"));
+var _lodash = _interopRequireWildcard(require("lodash"));
 var _pasteTableHelpers = require("../paste-table-helpers");
 var _context = require("../context");
 var _formula = require("../modules/formula");
@@ -26,6 +26,7 @@ var _modules = require("../modules");
 var _clipboard = _interopRequireDefault(require("../modules/clipboard"));
 var _calculateRangeCellSize = require("../paste-helpers/calculate-range-cell-size");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
 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 __extends = void 0 && (void 0).__extends || function () {
   var _extendStatics = function extendStatics(d, b) {
@@ -193,10 +194,28 @@ function postPasteCut(ctx, source, target, RowlChange) {
   ctx.formulaCache.execFunctionGlobalData = null;
   (0, _sheet.storeSheetParamALL)(ctx);
 }
+var handleFormulaOnPaste = function handleFormulaOnPaste(ctx, d) {
+  var _a;
+  for (var r = 0; r < d.length; r += 1) {
+    var x = d[r];
+    for (var c = 0; c < d[0].length; c += 1) {
+      var value = (0, _lodash.isObject)(d[r][c]) ? (_a = d[r][c]) === null || _a === void 0 ? void 0 : _a.v : d[r][c];
+      if (value && String(value).includes('=')) {
+        var cell = {};
+        var funcV = (0, _formula.execfunction)(ctx, String(value), r, c, undefined, undefined, true);
+        console.log(funcV);
+        cell.v = funcV[1];
+        cell.f = funcV[2];
+        cell.m = funcV[1].toString();
+        x[c] = cell;
+      }
+      d[r] = x;
+    }
+  }
+};
 function pasteHandler(ctx, data, borderInfo) {
   var _a;
   var _b, _c, _d, _e, _f, _g;
-  console.log("pasteHandler");
   if (ctx.luckysheet_selection_range) {
     ctx.luckysheet_selection_range = [];
   }
@@ -307,6 +326,7 @@ function pasteHandler(ctx, data, borderInfo) {
       ctx.luckysheetfile[(0, _utils.getSheetIndex)(ctx, ctx.currentSheetId)].config = cfg;
     }
     (0, _refresh.jfrefreshgrid)(ctx, null, undefined);
+    handleFormulaOnPaste(ctx, d);
   } else {
     data = data.replace(/\r/g, "");
     var dataChe = [];
@@ -381,6 +401,7 @@ function pasteHandler(ctx, data, borderInfo) {
     last.row = [curR, curR + rlen - 1];
     last.column = [curC, curC + clen - 1];
     (0, _refresh.jfrefreshgrid)(ctx, null, undefined);
+    handleFormulaOnPaste(ctx, d);
   }
 }
 function setCellHyperlink(ctx, id, r, c, link) {

package/package.json

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