@fileverse-dev/fortune-core 1.0.68 → 1.0.69

package/es/api/sheet.js

@@ -112,15 +112,15 @@ export function copySheet(ctx, sheetId) {
   api.setSheetOrder(ctx, sheetOrderList);
 }
 export function calculateSheetFromula(ctx, id) {
-  var _a, _b;
+  var _a, _b, _c;
   var index = getSheetIndex(ctx, id);
   if (!ctx.luckysheetfile[index].data) return;
   for (var r = 0; r < ctx.luckysheetfile[index].data.length; r += 1) {
     for (var c = 0; c < ctx.luckysheetfile[index].data[r].length; c += 1) {
-      if (!((_a = ctx.luckysheetfile[index].data[r][c]) === null || _a === void 0 ? void 0 : _a.f)) {
+      if (!((_a = ctx.luckysheetfile[index].data[r][c]) === null || _a === void 0 ? void 0 : _a.f) || ((_b = ctx.luckysheetfile[index].data[r][c]) === null || _b === void 0 ? void 0 : _b.isDataBlockFormula)) {
         continue;
       }
-      var result = execfunction(ctx, (_b = ctx.luckysheetfile[index].data[r][c]) === null || _b === void 0 ? void 0 : _b.f, r, c, id);
+      var result = execfunction(ctx, (_c = ctx.luckysheetfile[index].data[r][c]) === null || _c === void 0 ? void 0 : _c.f, r, c, id);
       api.setCellValue(ctx, r, c, result[1], null);
       insertUpdateFunctionGroup(ctx, r, c, id);
     }

package/es/events/paste.js

@@ -12,7 +12,7 @@ var __assign = this && this.__assign || function () {
 import _ from "lodash";
 import { getFlowdata } from "../context";
 import { locale } from "../locale";
-import { delFunctionGroup, execfunction, execFunctionGroup, functionCopy } from "../modules/formula";
+import { execfunction, functionCopy } from "../modules/formula";
 import { getdatabyselection, getQKBorder } from "../modules/cell";
 import { genarate, update } from "../modules/format";
 import { normalizeSelection, selectionCache } from "../modules/selection";
@@ -105,14 +105,12 @@ function postPasteCut(ctx, source, target, RowlChange) {
   ctx.luckysheetfile[getSheetIndex(ctx, source.sheetId)].dataVerification = source.curDataVerification;
   ctx.luckysheetfile[getSheetIndex(ctx, target.sheetId)].dataVerification = target.curDataVerification;
   ctx.formulaCache.execFunctionExist.reverse();
-  execFunctionGroup(ctx, null, null, null, null, target.curData);
   ctx.formulaCache.execFunctionGlobalData = null;
   storeSheetParamALL(ctx);
 }
 function pasteHandler(ctx, data, borderInfo) {
   var _a;
   var _b, _c, _d, _e, _f, _g;
-  console.log("pasteHandler", ctx.isFlvReadOnly);
   var allowEdit = isAllowEdit(ctx);
   if (!allowEdit || ctx.isFlvReadOnly) return;
   if (((_c = (_b = ctx.luckysheet_select_save) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0) !== 1) {
@@ -273,7 +271,6 @@ function pasteHandler(ctx, data, borderInfo) {
           }
           if (originCell.f != null && originCell.f.length > 0) {
             originCell.f = "";
-            delFunctionGroup(ctx, r + curR, c + curC, ctx.currentSheetId);
           }
         } else {
           var cell = {};
@@ -858,6 +855,9 @@ 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]);
+            if ((value === null || value === void 0 ? void 0 : value.v) && (value === null || value === void 0 ? void 0 : value.isDataBlockFormula)) {
+              value.m = "Loading...";
+            }
           }
           if (!_.isNil(value) && !_.isNil(value.f)) {
             var func = value.f;
@@ -874,14 +874,14 @@ function pasteHandlerOfCopyPaste(ctx, copyRange) {
               func = "=".concat(functionCopy(ctx, func, "left", Math.abs(offsetCol)));
             }
             var funcV = execfunction(ctx, func, h, c, undefined, undefined, true);
-            if (!_.isNil(value.spl)) {} else {
-              value.v = funcV[1], value.f = funcV[2];
-              if (!_.isNil(value.ct) && !_.isNil(value.ct.fa)) {
-                value.m = update(value.ct.fa, funcV[1]);
-              } else {
-                value.m = update("General", funcV[1]);
-              }
+            var afterUpdateCell = ctx.hooks.afterUpdateCell;
+            if (afterUpdateCell && arr.length === 1) {
+              afterUpdateCell(h, c, null, __assign(__assign({}, value), {
+                v: funcV[1],
+                m: "[object Promise]"
+              }));
             }
+            if (!_.isNil(value.spl)) {}
           }
           x[c] = _.cloneDeep(value);
           if (value != null && copyHasMC && ((_g = x === null || x === void 0 ? void 0 : x[c]) === null || _g === void 0 ? void 0 : _g.mc)) {
@@ -970,12 +970,17 @@ function handleFormulaStringPaste(ctx, formulaStr) {
   var c = ctx.luckysheet_select_save[0].column[0];
   var funcV = execfunction(ctx, formulaStr, r, c, undefined, undefined, true);
   var val = funcV[1];
+  var isDataBlockRespose = typeof val !== "string" && typeof val !== "number";
   var d = getFlowdata(ctx);
   if (!d) return;
   if (!d[r][c]) d[r][c] = {};
-  d[r][c].m = val.toString();
+  d[r][c].m = isDataBlockRespose ? "Loading..." : val.toString();
   d[r][c].v = val;
   d[r][c].f = formulaStr;
+  var afterUpdateCell = ctx.hooks.afterUpdateCell;
+  if (afterUpdateCell && isDataBlockRespose) {
+    afterUpdateCell(r, c, null, d[r][c]);
+  }
 }
 export function handlePaste(ctx, e) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
@@ -1369,7 +1374,7 @@ export function handlePasteByClick(ctx, clipboardData, triggerType) {
     }
   } else if (data.indexOf("fortune-copy-action-image") > -1) {} else if (triggerType !== "btn") {
     var isExcelFormula = clipboardData.startsWith("=");
-    if (isExcelFormula) {
+    if (isExcelFormula && false) {
       handleFormulaStringPaste(ctx, clipboardData);
     } else {
       pasteHandler(ctx, clipboardData);

package/es/modules/cell.js

@@ -688,12 +688,12 @@ export function updateCell(ctx, r, c, $input, value, canvas) {
   }
   if (typeof value === "string") {
     value = {
-      "ct": {
-        "fa": "General",
-        "t": "g"
+      ct: {
+        fa: "General",
+        t: "g"
       },
-      "v": value,
-      "tb": "1"
+      v: value,
+      tb: "1"
     };
   } else if (_typeof(value) === "object" && !value.tb) {
     value.tb = "1";

package/es/modules/formula.js

@@ -121,8 +121,8 @@ var FormulaCache = function () {
   }
   FormulaCache.prototype.tryGetCellAsNumber = function (cell) {
     var _a, _b, _c, _d;
-    var isCryptoDeno = ((_a = cell === null || cell === void 0 ? void 0 : cell.m) === null || _a === void 0 ? void 0 : _a.includes("ETH")) || ((_b = cell === null || cell === void 0 ? void 0 : cell.m) === null || _b === void 0 ? void 0 : _b.includes("SOL")) || ((_c = cell === null || cell === void 0 ? void 0 : cell.m) === null || _c === void 0 ? void 0 : _c.includes("BTC"));
-    if (isCryptoDeno) {
+    var isCryptoDeno = typeof (cell === null || cell === void 0 ? void 0 : cell.m) === "string" ? ((_a = cell === null || cell === void 0 ? void 0 : cell.m) === null || _a === void 0 ? void 0 : _a.includes("ETH")) || ((_b = cell === null || cell === void 0 ? void 0 : cell.m) === null || _b === void 0 ? void 0 : _b.includes("SOL")) || ((_c = cell === null || cell === void 0 ? void 0 : cell.m) === null || _c === void 0 ? void 0 : _c.includes("BTC")) : false;
+    if (isCryptoDeno && typeof (cell === null || cell === void 0 ? void 0 : cell.m) === "string") {
       var splitedNumberString = cell.m.split(" ")[0];
       return Number(splitedNumberString);
     }
@@ -708,7 +708,7 @@ export function execfunction(ctx, txt, r, c, id, calcChainSet, isrefresh, notIns
   if (!_.isNil(r) && !_.isNil(c)) {
     if (isrefresh) {
       var finalResult_1 = result;
-      if (ctx.formulaCache.parser.cryptoDenomination && ctx.formulaCache.parser.cryptoDenomination !== "") {
+      if (ctx.formulaCache.parser.cryptoDenomination && ctx.formulaCache.parser.cryptoDenomination !== "" && (typeof result === "number" || typeof result === "string")) {
         var resultStr = Number(result).toFixed(ctx.formulaCache.parser.cryptoDecimals).toLowerCase();
         finalResult_1 = "".concat(resultStr, " ").concat(ctx.formulaCache.parser.cryptoDenomination);
       }
@@ -719,7 +719,7 @@ export function execfunction(ctx, txt, r, c, id, calcChainSet, isrefresh, notIns
     }
   }
   var finalResult = result;
-  if (ctx.formulaCache.parser.cryptoDenomination && ctx.formulaCache.parser.cryptoDenomination !== "") {
+  if (ctx.formulaCache.parser.cryptoDenomination && ctx.formulaCache.parser.cryptoDenomination !== "" && (typeof result === "number" || typeof result === "string")) {
     var resultStr = Number(result).toFixed(ctx.formulaCache.parser.cryptoDecimals).toLowerCase();
     finalResult = "".concat(resultStr, " ").concat(ctx.formulaCache.parser.cryptoDenomination);
   }

package/es/types.d.ts

@@ -45,6 +45,10 @@ export type Cell = {
     bg?: string;
     lo?: number;
     rt?: number;
+    baseValue?: number | string;
+    baseCurrency?: string;
+    baseCurrencyPrice?: string | number;
+    isDataBlockFormula?: boolean;
     ps?: {
         left: number | null;
         top: number | null;

package/lib/api/sheet.js

@@ -129,15 +129,15 @@ function copySheet(ctx, sheetId) {
   _2.api.setSheetOrder(ctx, sheetOrderList);
 }
 function calculateSheetFromula(ctx, id) {
-  var _a, _b;
+  var _a, _b, _c;
   var index = (0, _utils.getSheetIndex)(ctx, id);
   if (!ctx.luckysheetfile[index].data) return;
   for (var r = 0; r < ctx.luckysheetfile[index].data.length; r += 1) {
     for (var c = 0; c < ctx.luckysheetfile[index].data[r].length; c += 1) {
-      if (!((_a = ctx.luckysheetfile[index].data[r][c]) === null || _a === void 0 ? void 0 : _a.f)) {
+      if (!((_a = ctx.luckysheetfile[index].data[r][c]) === null || _a === void 0 ? void 0 : _a.f) || ((_b = ctx.luckysheetfile[index].data[r][c]) === null || _b === void 0 ? void 0 : _b.isDataBlockFormula)) {
         continue;
       }
-      var result = (0, _2.execfunction)(ctx, (_b = ctx.luckysheetfile[index].data[r][c]) === null || _b === void 0 ? void 0 : _b.f, r, c, id);
+      var result = (0, _2.execfunction)(ctx, (_c = ctx.luckysheetfile[index].data[r][c]) === null || _c === void 0 ? void 0 : _c.f, r, c, id);
       _2.api.setCellValue(ctx, r, c, result[1], null);
       (0, _2.insertUpdateFunctionGroup)(ctx, r, c, id);
     }

package/lib/events/paste.js

@@ -113,14 +113,12 @@ function postPasteCut(ctx, source, target, RowlChange) {
   ctx.luckysheetfile[(0, _utils.getSheetIndex)(ctx, source.sheetId)].dataVerification = source.curDataVerification;
   ctx.luckysheetfile[(0, _utils.getSheetIndex)(ctx, target.sheetId)].dataVerification = target.curDataVerification;
   ctx.formulaCache.execFunctionExist.reverse();
-  (0, _formula.execFunctionGroup)(ctx, null, null, null, null, target.curData);
   ctx.formulaCache.execFunctionGlobalData = null;
   (0, _sheet.storeSheetParamALL)(ctx);
 }
 function pasteHandler(ctx, data, borderInfo) {
   var _a;
   var _b, _c, _d, _e, _f, _g;
-  console.log("pasteHandler", ctx.isFlvReadOnly);
   var allowEdit = (0, _utils.isAllowEdit)(ctx);
   if (!allowEdit || ctx.isFlvReadOnly) return;
   if (((_c = (_b = ctx.luckysheet_select_save) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0) !== 1) {
@@ -281,7 +279,6 @@ function pasteHandler(ctx, data, borderInfo) {
           }
           if (originCell.f != null && originCell.f.length > 0) {
             originCell.f = "";
-            (0, _formula.delFunctionGroup)(ctx, r + curR, c + curC, ctx.currentSheetId);
           }
         } else {
           var cell = {};
@@ -866,6 +863,9 @@ 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]);
+            if ((value === null || value === void 0 ? void 0 : value.v) && (value === null || value === void 0 ? void 0 : value.isDataBlockFormula)) {
+              value.m = "Loading...";
+            }
           }
           if (!_lodash.default.isNil(value) && !_lodash.default.isNil(value.f)) {
             var func = value.f;
@@ -882,14 +882,14 @@ function pasteHandlerOfCopyPaste(ctx, copyRange) {
               func = "=".concat((0, _formula.functionCopy)(ctx, func, "left", Math.abs(offsetCol)));
             }
             var funcV = (0, _formula.execfunction)(ctx, func, h, c, undefined, undefined, true);
-            if (!_lodash.default.isNil(value.spl)) {} else {
-              value.v = funcV[1], value.f = funcV[2];
-              if (!_lodash.default.isNil(value.ct) && !_lodash.default.isNil(value.ct.fa)) {
-                value.m = (0, _format.update)(value.ct.fa, funcV[1]);
-              } else {
-                value.m = (0, _format.update)("General", funcV[1]);
-              }
+            var afterUpdateCell = ctx.hooks.afterUpdateCell;
+            if (afterUpdateCell && arr.length === 1) {
+              afterUpdateCell(h, c, null, __assign(__assign({}, value), {
+                v: funcV[1],
+                m: "[object Promise]"
+              }));
             }
+            if (!_lodash.default.isNil(value.spl)) {}
           }
           x[c] = _lodash.default.cloneDeep(value);
           if (value != null && copyHasMC && ((_g = x === null || x === void 0 ? void 0 : x[c]) === null || _g === void 0 ? void 0 : _g.mc)) {
@@ -978,12 +978,17 @@ function handleFormulaStringPaste(ctx, formulaStr) {
   var c = ctx.luckysheet_select_save[0].column[0];
   var funcV = (0, _formula.execfunction)(ctx, formulaStr, r, c, undefined, undefined, true);
   var val = funcV[1];
+  var isDataBlockRespose = typeof val !== "string" && typeof val !== "number";
   var d = (0, _context.getFlowdata)(ctx);
   if (!d) return;
   if (!d[r][c]) d[r][c] = {};
-  d[r][c].m = val.toString();
+  d[r][c].m = isDataBlockRespose ? "Loading..." : val.toString();
   d[r][c].v = val;
   d[r][c].f = formulaStr;
+  var afterUpdateCell = ctx.hooks.afterUpdateCell;
+  if (afterUpdateCell && isDataBlockRespose) {
+    afterUpdateCell(r, c, null, d[r][c]);
+  }
 }
 function handlePaste(ctx, e) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
@@ -1377,7 +1382,7 @@ function handlePasteByClick(ctx, clipboardData, triggerType) {
     }
   } else if (data.indexOf("fortune-copy-action-image") > -1) {} else if (triggerType !== "btn") {
     var isExcelFormula = clipboardData.startsWith("=");
-    if (isExcelFormula) {
+    if (isExcelFormula && false) {
       handleFormulaStringPaste(ctx, clipboardData);
     } else {
       pasteHandler(ctx, clipboardData);

package/lib/modules/cell.js

@@ -718,12 +718,12 @@ function updateCell(ctx, r, c, $input, value, canvas) {
   }
   if (typeof value === "string") {
     value = {
-      "ct": {
-        "fa": "General",
-        "t": "g"
+      ct: {
+        fa: "General",
+        t: "g"
       },
-      "v": value,
-      "tb": "1"
+      v: value,
+      tb: "1"
     };
   } else if (_typeof(value) === "object" && !value.tb) {
     value.tb = "1";

package/lib/modules/formula.js

@@ -151,8 +151,8 @@ var FormulaCache = exports.FormulaCache = function () {
   }
   FormulaCache.prototype.tryGetCellAsNumber = function (cell) {
     var _a, _b, _c, _d;
-    var isCryptoDeno = ((_a = cell === null || cell === void 0 ? void 0 : cell.m) === null || _a === void 0 ? void 0 : _a.includes("ETH")) || ((_b = cell === null || cell === void 0 ? void 0 : cell.m) === null || _b === void 0 ? void 0 : _b.includes("SOL")) || ((_c = cell === null || cell === void 0 ? void 0 : cell.m) === null || _c === void 0 ? void 0 : _c.includes("BTC"));
-    if (isCryptoDeno) {
+    var isCryptoDeno = typeof (cell === null || cell === void 0 ? void 0 : cell.m) === "string" ? ((_a = cell === null || cell === void 0 ? void 0 : cell.m) === null || _a === void 0 ? void 0 : _a.includes("ETH")) || ((_b = cell === null || cell === void 0 ? void 0 : cell.m) === null || _b === void 0 ? void 0 : _b.includes("SOL")) || ((_c = cell === null || cell === void 0 ? void 0 : cell.m) === null || _c === void 0 ? void 0 : _c.includes("BTC")) : false;
+    if (isCryptoDeno && typeof (cell === null || cell === void 0 ? void 0 : cell.m) === "string") {
       var splitedNumberString = cell.m.split(" ")[0];
       return Number(splitedNumberString);
     }
@@ -737,7 +737,7 @@ function execfunction(ctx, txt, r, c, id, calcChainSet, isrefresh, notInsertFunc
   if (!_lodash.default.isNil(r) && !_lodash.default.isNil(c)) {
     if (isrefresh) {
       var finalResult_1 = result;
-      if (ctx.formulaCache.parser.cryptoDenomination && ctx.formulaCache.parser.cryptoDenomination !== "") {
+      if (ctx.formulaCache.parser.cryptoDenomination && ctx.formulaCache.parser.cryptoDenomination !== "" && (typeof result === "number" || typeof result === "string")) {
         var resultStr = Number(result).toFixed(ctx.formulaCache.parser.cryptoDecimals).toLowerCase();
         finalResult_1 = "".concat(resultStr, " ").concat(ctx.formulaCache.parser.cryptoDenomination);
       }
@@ -748,7 +748,7 @@ function execfunction(ctx, txt, r, c, id, calcChainSet, isrefresh, notInsertFunc
     }
   }
   var finalResult = result;
-  if (ctx.formulaCache.parser.cryptoDenomination && ctx.formulaCache.parser.cryptoDenomination !== "") {
+  if (ctx.formulaCache.parser.cryptoDenomination && ctx.formulaCache.parser.cryptoDenomination !== "" && (typeof result === "number" || typeof result === "string")) {
     var resultStr = Number(result).toFixed(ctx.formulaCache.parser.cryptoDecimals).toLowerCase();
     finalResult = "".concat(resultStr, " ").concat(ctx.formulaCache.parser.cryptoDenomination);
   }

package/lib/types.d.ts

@@ -45,6 +45,10 @@ export type Cell = {
     bg?: string;
     lo?: number;
     rt?: number;
+    baseValue?: number | string;
+    baseCurrency?: string;
+    baseCurrencyPrice?: string | number;
+    isDataBlockFormula?: boolean;
     ps?: {
         left: number | null;
         top: number | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.0.68",
+  "version": "1.0.69",
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",
@@ -15,7 +15,7 @@
     "dev": "father-build --watch"
   },
   "dependencies": {
-    "@fileverse-dev/formula-parser": "0.2.45",
+    "@fileverse-dev/formula-parser": "0.2.46",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",