@fileverse-dev/fortune-core 1.0.71 → 1.0.73

package/es/events/paste.js

@@ -855,7 +855,6 @@ function pasteHandlerOfCopyPaste(ctx, copyRange) {
           var value = null;
           if ((_f = copyData[h - mth]) === null || _f === void 0 ? void 0 : _f[c - mtc]) {
             value = _.cloneDeep(copyData[h - mth][c - mtc]);
-            console.log("value", value);
             if ((value === null || value === void 0 ? void 0 : value.v) && (value === null || value === void 0 ? void 0 : value.f) && (value === null || value === void 0 ? void 0 : value.isDataBlockFormula) && arr.length === 1) {
               value.m = "Loading...";
             }
@@ -876,7 +875,6 @@ function pasteHandlerOfCopyPaste(ctx, copyRange) {
             }
             var funcV = execfunction(ctx, func, h, c, undefined, undefined, true);
             var afterUpdateCell = ctx.hooks.afterUpdateCell;
-            console.log("fortune about to call afterUpdateCell");
             if (afterUpdateCell && arr.length === 1) {
               afterUpdateCell(h, c, null, __assign(__assign({}, value), {
                 v: funcV[1],

package/es/modules/formula.js

@@ -1,3 +1,4 @@
+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 = this && this.__assign || function () {
   __assign = Object.assign || function (t) {
     for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -95,6 +96,9 @@ var FormulaCache = function () {
       for (var row = startRow; row <= endRow; row += 1) {
         var colFragment = [];
         for (var col = startCol; col <= endCol; col += 1) {
+          if (_typeof(options) === "object" && row === options.row && col === options.column) {
+            continue;
+          }
           var cell = ((_c = context === null || context === void 0 ? void 0 : context.formulaCache.execFunctionGlobalData) === null || _c === void 0 ? void 0 : _c["".concat(row, "_").concat(col, "_").concat(id)]) || ((_d = flowdata === null || flowdata === void 0 ? void 0 : flowdata[row]) === null || _d === void 0 ? void 0 : _d[col]);
           var v = that.tryGetCellAsNumber(cell);
           if ((((_e = cell === null || cell === void 0 ? void 0 : cell.m) === null || _e === void 0 ? void 0 : _e.includes("ETH")) || ((_f = cell === null || cell === void 0 ? void 0 : cell.m) === null || _f === void 0 ? void 0 : _f.includes("SOL")) || ((_g = cell === null || cell === void 0 ? void 0 : cell.m) === null || _g === void 0 ? void 0 : _g.includes("BTC"))) && cryptoDenomination !== "Error") {
@@ -698,7 +702,9 @@ export function execfunction(ctx, txt, r, c, id, calcChainSet, isrefresh, notIns
   ctx.calculateSheetId = id;
   ctx.formulaCache.parser.context = ctx;
   var parsedResponse = ctx.formulaCache.parser.parse(txt.substring(1), {
-    sheetId: id || ctx.currentSheetId
+    sheetId: id || ctx.currentSheetId,
+    row: r,
+    column: c
   });
   var formulaError = parsedResponse.error;
   var result = parsedResponse.result;

package/lib/events/paste.js

@@ -863,7 +863,6 @@ function pasteHandlerOfCopyPaste(ctx, copyRange) {
           var value = null;
           if ((_f = copyData[h - mth]) === null || _f === void 0 ? void 0 : _f[c - mtc]) {
             value = _lodash.default.cloneDeep(copyData[h - mth][c - mtc]);
-            console.log("value", value);
             if ((value === null || value === void 0 ? void 0 : value.v) && (value === null || value === void 0 ? void 0 : value.f) && (value === null || value === void 0 ? void 0 : value.isDataBlockFormula) && arr.length === 1) {
               value.m = "Loading...";
             }
@@ -884,7 +883,6 @@ function pasteHandlerOfCopyPaste(ctx, copyRange) {
             }
             var funcV = (0, _formula.execfunction)(ctx, func, h, c, undefined, undefined, true);
             var afterUpdateCell = ctx.hooks.afterUpdateCell;
-            console.log("fortune about to call afterUpdateCell");
             if (afterUpdateCell && arr.length === 1) {
               afterUpdateCell(h, c, null, __assign(__assign({}, value), {
                 v: funcV[1],

package/lib/modules/formula.js

@@ -39,6 +39,7 @@ var _color = require("./color");
 var _location = require("./location");
 var _2 = require(".");
 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 () {
   __assign = Object.assign || function (t) {
     for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -125,6 +126,9 @@ var FormulaCache = exports.FormulaCache = function () {
       for (var row = startRow; row <= endRow; row += 1) {
         var colFragment = [];
         for (var col = startCol; col <= endCol; col += 1) {
+          if (_typeof(options) === "object" && row === options.row && col === options.column) {
+            continue;
+          }
           var cell = ((_c = context === null || context === void 0 ? void 0 : context.formulaCache.execFunctionGlobalData) === null || _c === void 0 ? void 0 : _c["".concat(row, "_").concat(col, "_").concat(id)]) || ((_d = flowdata === null || flowdata === void 0 ? void 0 : flowdata[row]) === null || _d === void 0 ? void 0 : _d[col]);
           var v = that.tryGetCellAsNumber(cell);
           if ((((_e = cell === null || cell === void 0 ? void 0 : cell.m) === null || _e === void 0 ? void 0 : _e.includes("ETH")) || ((_f = cell === null || cell === void 0 ? void 0 : cell.m) === null || _f === void 0 ? void 0 : _f.includes("SOL")) || ((_g = cell === null || cell === void 0 ? void 0 : cell.m) === null || _g === void 0 ? void 0 : _g.includes("BTC"))) && cryptoDenomination !== "Error") {
@@ -727,7 +731,9 @@ function execfunction(ctx, txt, r, c, id, calcChainSet, isrefresh, notInsertFunc
   ctx.calculateSheetId = id;
   ctx.formulaCache.parser.context = ctx;
   var parsedResponse = ctx.formulaCache.parser.parse(txt.substring(1), {
-    sheetId: id || ctx.currentSheetId
+    sheetId: id || ctx.currentSheetId,
+    row: r,
+    column: c
   });
   var formulaError = parsedResponse.error;
   var result = parsedResponse.result;

package/package.json

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