@leankylin-sheet/core 4.0.58 → 4.0.60

package/dist/index.esm.js

@@ -1,4 +1,4 @@
-import _, { isPlainObject, pick } from 'lodash';
+import _, { isPlainObject, uniqBy, pick } from 'lodash';
 import numeral from 'numeral';
 import dayjs from 'dayjs';
 import { Parser, ERROR_REF } from '@leankylin-sheet/formula-parser';
@@ -46539,21 +46539,42 @@ function copySheet(ctx, sheetId, hooks) {
   (_hooks$onCopySheet = hooks.onCopySheet) === null || _hooks$onCopySheet === void 0 ? void 0 : _hooks$onCopySheet.call(hooks, sheetId, copyId);
 }
 function calculateSheetFromula(ctx, id) {
+  console.time("calcTime:".concat(id));
   var index$1 = getSheetIndex(ctx, id);
+  var luckysheetfile = ctx.luckysheetfile;
+  var file = luckysheetfile[index$1];
+  var calcChain = file.calcChain;
+  if (_.isNil(calcChain)) {
+    calcChain = [];
+  }
   if (!ctx.luckysheetfile[index$1].data) return;
   for (var r = 0; r < ctx.luckysheetfile[index$1].data.length; r += 1) {
     for (var c = 0; c < ctx.luckysheetfile[index$1].data[r].length; c += 1) {
-      var _ctx$luckysheetfile$i, _ctx$luckysheetfile$i2;
-      if (!((_ctx$luckysheetfile$i = ctx.luckysheetfile[index$1].data[r][c]) === null || _ctx$luckysheetfile$i === void 0 ? void 0 : _ctx$luckysheetfile$i.f)) {
+      var cell = ctx.luckysheetfile[index$1].data[r][c];
+      if (!(cell === null || cell === void 0 ? void 0 : cell.f)) {
+        continue;
+      }
+      var cc = {
+        r: r,
+        c: c,
+        id: id
+      };
+      calcChain.push(cc);
+      var result = execfunction(ctx, cell === null || cell === void 0 ? void 0 : cell.f, r, c, id, undefined, true);
+      var newV = result[1];
+      if (newV === cell.v) {
         continue;
       }
-      var result = execfunction(ctx, (_ctx$luckysheetfile$i2 = ctx.luckysheetfile[index$1].data[r][c]) === null || _ctx$luckysheetfile$i2 === void 0 ? void 0 : _ctx$luckysheetfile$i2.f, r, c, id);
       setCellValue$1(ctx, r, c, result[1], null, {
         id: id
       });
-      insertUpdateFunctionGroup(ctx, r, c, id);
     }
   }
+  file.calcChain = uniqBy(calcChain, function (item) {
+    return item.r + item.c + item.id;
+  });
+  ctx.luckysheetfile = luckysheetfile;
+  console.timeEnd("calcTime:".concat(id));
 }
 
 function storeSheetParam(ctx) {

package/dist/index.js

@@ -46549,21 +46549,42 @@ function copySheet(ctx, sheetId, hooks) {
   (_hooks$onCopySheet = hooks.onCopySheet) === null || _hooks$onCopySheet === void 0 ? void 0 : _hooks$onCopySheet.call(hooks, sheetId, copyId);
 }
 function calculateSheetFromula(ctx, id) {
+  console.time("calcTime:".concat(id));
   var index$1 = getSheetIndex(ctx, id);
+  var luckysheetfile = ctx.luckysheetfile;
+  var file = luckysheetfile[index$1];
+  var calcChain = file.calcChain;
+  if (___default['default'].isNil(calcChain)) {
+    calcChain = [];
+  }
   if (!ctx.luckysheetfile[index$1].data) return;
   for (var r = 0; r < ctx.luckysheetfile[index$1].data.length; r += 1) {
     for (var c = 0; c < ctx.luckysheetfile[index$1].data[r].length; c += 1) {
-      var _ctx$luckysheetfile$i, _ctx$luckysheetfile$i2;
-      if (!((_ctx$luckysheetfile$i = ctx.luckysheetfile[index$1].data[r][c]) === null || _ctx$luckysheetfile$i === void 0 ? void 0 : _ctx$luckysheetfile$i.f)) {
+      var cell = ctx.luckysheetfile[index$1].data[r][c];
+      if (!(cell === null || cell === void 0 ? void 0 : cell.f)) {
+        continue;
+      }
+      var cc = {
+        r: r,
+        c: c,
+        id: id
+      };
+      calcChain.push(cc);
+      var result = execfunction(ctx, cell === null || cell === void 0 ? void 0 : cell.f, r, c, id, undefined, true);
+      var newV = result[1];
+      if (newV === cell.v) {
         continue;
       }
-      var result = execfunction(ctx, (_ctx$luckysheetfile$i2 = ctx.luckysheetfile[index$1].data[r][c]) === null || _ctx$luckysheetfile$i2 === void 0 ? void 0 : _ctx$luckysheetfile$i2.f, r, c, id);
       setCellValue$1(ctx, r, c, result[1], null, {
         id: id
       });
-      insertUpdateFunctionGroup(ctx, r, c, id);
     }
   }
+  file.calcChain = _.uniqBy(calcChain, function (item) {
+    return item.r + item.c + item.id;
+  });
+  ctx.luckysheetfile = luckysheetfile;
+  console.timeEnd("calcTime:".concat(id));
 }
 
 function storeSheetParam(ctx) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leankylin-sheet/core",
-  "version": "4.0.58",
+  "version": "4.0.60",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
   "typings": "dist/index.d.ts",
@@ -13,7 +13,7 @@
     "build": "father-build"
   },
   "dependencies": {
-    "@leankylin-sheet/formula-parser": "4.0.58",
+    "@leankylin-sheet/formula-parser": "4.0.60",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",