@fileverse-dev/fortune-core 1.2.85 → 1.2.86

package/es/api/sheet.d.ts

@@ -7,4 +7,4 @@ export declare function initSheetData(draftCtx: Context, index: number, newData:
 export declare function hideSheet(ctx: Context, sheetId: string): void;
 export declare function showSheet(ctx: Context, sheetId: string): void;
 export declare function copySheet(ctx: Context, sheetId: string): void;
-export declare function calculateSheetFromula(ctx: Context, id: string, refCell?: string[]): void;
+export declare function calculateSheetFromula(ctx: Context, id: string): void;

package/es/api/sheet.js

@@ -2,44 +2,7 @@ import _ from "lodash";
 import { v4 as uuidv4 } from "uuid";
 import { dataToCelldata, getSheet } from "./common";
 import { getSheetIndex } from "../utils";
-import { api, locale } from "..";
-function isCellReferenced(formulaString, cell) {
-  function colToNumber(col) {
-    var num = 0;
-    for (var i = 0; i < col.length; i++) {
-      num = num * 26 + (col.charCodeAt(i) - 64);
-    }
-    return num;
-  }
-  function parseCell(cellRef) {
-    var match = cellRef.match(/^([A-Z]+)(\d+)$/);
-    if (!match) return null;
-    return {
-      col: colToNumber(match[1]),
-      row: Number(match[2])
-    };
-  }
-  var target = parseCell(cell.toUpperCase());
-  if (!target) return false;
-  var formula = formulaString.toUpperCase();
-  var rangeRegex = /([A-Z]+\d+):([A-Z]+\d+)/g;
-  var match;
-  while ((match = rangeRegex.exec(formula)) !== null) {
-    var start = parseCell(match[1]);
-    var end = parseCell(match[2]);
-    if (target.col >= Math.min(start.col, end.col) && target.col <= Math.max(start.col, end.col) && target.row >= Math.min(start.row, end.row) && target.row <= Math.max(start.row, end.row)) {
-      return true;
-    }
-  }
-  var cleanedFormula = formula.replace(rangeRegex, "");
-  var cellRegex = /([A-Z]+\d+)/g;
-  while ((match = cellRegex.exec(cleanedFormula)) !== null) {
-    if (match[1] === cell.toUpperCase()) {
-      return true;
-    }
-  }
-  return false;
-}
+import { api, execfunction, getFlowdata, insertUpdateFunctionGroup, locale, spillSortResult } from "..";
 export function getAllSheets(ctx) {
   return ctx.luckysheetfile;
 }
@@ -148,30 +111,27 @@ export function copySheet(ctx, sheetId) {
   sheetOrderList[ctx.luckysheetfile[ctx.luckysheetfile.length - 1].id] = order;
   api.setSheetOrder(ctx, sheetOrderList);
 }
-export function calculateSheetFromula(ctx, id, refCell) {
-  var _a, _b, _c, _d, _e, _f;
+export function calculateSheetFromula(ctx, id) {
+  var _a, _b, _c;
   var index = getSheetIndex(ctx, id);
   if (!ctx.luckysheetfile[index].data) return;
-  var _loop_1 = function _loop_1(r) {
-    var _loop_2 = function _loop_2(c) {
-      console.log(refCell, (_a = ctx.luckysheetfile[index].data[r][c]) === null || _a === void 0 ? void 0 : _a.f);
-      var isRef = false;
-      if (refCell && ((_b = ctx.luckysheetfile[index].data[r][c]) === null || _b === void 0 ? void 0 : _b.f) && !((_c = ctx.luckysheetfile[index].data[r][c]) === null || _c === void 0 ? void 0 : _c.isDataBlockFormula)) {
-        isRef = refCell.some(function (cell) {
-          var _a;
-          return isCellReferenced((_a = ctx.luckysheetfile[index].data[r][c]) === null || _a === void 0 ? void 0 : _a.f, cell);
-        });
+  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) || ((_b = ctx.luckysheetfile[index].data[r][c]) === null || _b === void 0 ? void 0 : _b.isDataBlockFormula)) {
+        continue;
       }
-      console.log(isRef, (_d = ctx.luckysheetfile[index].data[r][c]) === null || _d === void 0 ? void 0 : _d.f, refCell);
-      if (isRef && !((_e = ctx.luckysheetfile[index].data[r][c]) === null || _e === void 0 ? void 0 : _e.f) || ((_f = ctx.luckysheetfile[index].data[r][c]) === null || _f === void 0 ? void 0 : _f.isDataBlockFormula)) {
-        return "continue";
+      var result = execfunction(ctx, (_c = ctx.luckysheetfile[index].data[r][c]) === null || _c === void 0 ? void 0 : _c.f, r, c, id);
+      var isValueArray = Array.isArray(result[1]);
+      if (isValueArray) {
+        var value = {
+          f: result[2],
+          v: result[1]
+        };
+        spillSortResult(ctx, r, c, value, getFlowdata(ctx));
+      } else {
+        api.setCellValue(ctx, r, c, result[1], null);
       }
-    };
-    for (var c = 0; c < ctx.luckysheetfile[index].data[r].length; c += 1) {
-      _loop_2(c);
+      insertUpdateFunctionGroup(ctx, r, c, id);
     }
-  };
-  for (var r = 0; r < ctx.luckysheetfile[index].data.length; r += 1) {
-    _loop_1(r);
   }
 }

package/lib/api/sheet.d.ts

@@ -7,4 +7,4 @@ export declare function initSheetData(draftCtx: Context, index: number, newData:
 export declare function hideSheet(ctx: Context, sheetId: string): void;
 export declare function showSheet(ctx: Context, sheetId: string): void;
 export declare function copySheet(ctx: Context, sheetId: string): void;
-export declare function calculateSheetFromula(ctx: Context, id: string, refCell?: string[]): void;
+export declare function calculateSheetFromula(ctx: Context, id: string): void;

package/lib/api/sheet.js

@@ -21,43 +21,6 @@ var _common = require("./common");
 var _utils = require("../utils");
 var _2 = require("..");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function isCellReferenced(formulaString, cell) {
-  function colToNumber(col) {
-    var num = 0;
-    for (var i = 0; i < col.length; i++) {
-      num = num * 26 + (col.charCodeAt(i) - 64);
-    }
-    return num;
-  }
-  function parseCell(cellRef) {
-    var match = cellRef.match(/^([A-Z]+)(\d+)$/);
-    if (!match) return null;
-    return {
-      col: colToNumber(match[1]),
-      row: Number(match[2])
-    };
-  }
-  var target = parseCell(cell.toUpperCase());
-  if (!target) return false;
-  var formula = formulaString.toUpperCase();
-  var rangeRegex = /([A-Z]+\d+):([A-Z]+\d+)/g;
-  var match;
-  while ((match = rangeRegex.exec(formula)) !== null) {
-    var start = parseCell(match[1]);
-    var end = parseCell(match[2]);
-    if (target.col >= Math.min(start.col, end.col) && target.col <= Math.max(start.col, end.col) && target.row >= Math.min(start.row, end.row) && target.row <= Math.max(start.row, end.row)) {
-      return true;
-    }
-  }
-  var cleanedFormula = formula.replace(rangeRegex, "");
-  var cellRegex = /([A-Z]+\d+)/g;
-  while ((match = cellRegex.exec(cleanedFormula)) !== null) {
-    if (match[1] === cell.toUpperCase()) {
-      return true;
-    }
-  }
-  return false;
-}
 function getAllSheets(ctx) {
   return ctx.luckysheetfile;
 }
@@ -165,30 +128,27 @@ function copySheet(ctx, sheetId) {
   sheetOrderList[ctx.luckysheetfile[ctx.luckysheetfile.length - 1].id] = order;
   _2.api.setSheetOrder(ctx, sheetOrderList);
 }
-function calculateSheetFromula(ctx, id, refCell) {
-  var _a, _b, _c, _d, _e, _f;
+function calculateSheetFromula(ctx, id) {
+  var _a, _b, _c;
   var index = (0, _utils.getSheetIndex)(ctx, id);
   if (!ctx.luckysheetfile[index].data) return;
-  var _loop_1 = function _loop_1(r) {
-    var _loop_2 = function _loop_2(c) {
-      console.log(refCell, (_a = ctx.luckysheetfile[index].data[r][c]) === null || _a === void 0 ? void 0 : _a.f);
-      var isRef = false;
-      if (refCell && ((_b = ctx.luckysheetfile[index].data[r][c]) === null || _b === void 0 ? void 0 : _b.f) && !((_c = ctx.luckysheetfile[index].data[r][c]) === null || _c === void 0 ? void 0 : _c.isDataBlockFormula)) {
-        isRef = refCell.some(function (cell) {
-          var _a;
-          return isCellReferenced((_a = ctx.luckysheetfile[index].data[r][c]) === null || _a === void 0 ? void 0 : _a.f, cell);
-        });
+  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) || ((_b = ctx.luckysheetfile[index].data[r][c]) === null || _b === void 0 ? void 0 : _b.isDataBlockFormula)) {
+        continue;
       }
-      console.log(isRef, (_d = ctx.luckysheetfile[index].data[r][c]) === null || _d === void 0 ? void 0 : _d.f, refCell);
-      if (isRef && !((_e = ctx.luckysheetfile[index].data[r][c]) === null || _e === void 0 ? void 0 : _e.f) || ((_f = ctx.luckysheetfile[index].data[r][c]) === null || _f === void 0 ? void 0 : _f.isDataBlockFormula)) {
-        return "continue";
+      var result = (0, _2.execfunction)(ctx, (_c = ctx.luckysheetfile[index].data[r][c]) === null || _c === void 0 ? void 0 : _c.f, r, c, id);
+      var isValueArray = Array.isArray(result[1]);
+      if (isValueArray) {
+        var value = {
+          f: result[2],
+          v: result[1]
+        };
+        (0, _2.spillSortResult)(ctx, r, c, value, (0, _2.getFlowdata)(ctx));
+      } else {
+        _2.api.setCellValue(ctx, r, c, result[1], null);
       }
-    };
-    for (var c = 0; c < ctx.luckysheetfile[index].data[r].length; c += 1) {
-      _loop_2(c);
+      (0, _2.insertUpdateFunctionGroup)(ctx, r, c, id);
     }
-  };
-  for (var r = 0; r < ctx.luckysheetfile[index].data.length; r += 1) {
-    _loop_1(r);
   }
 }

package/package.json

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