@leankylin-sheet/core 5.2.22 → 5.2.24

package/dist/index.esm.js

@@ -46587,26 +46587,45 @@ function copySheet(ctx, sheetId, hooks) {
 }
 function calculateSheetFromula(ctx, id, isrefresh) {
   console.time("calcTime:".concat(id));
-  var index$1 = getSheetIndex(ctx, id);
-  var luckysheetfile = ctx.luckysheetfile;
-  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 cell = ctx.luckysheetfile[index$1].data[r][c];
+  if (isrefresh) {
+    execFunctionGroup(ctx, null, null, null, id, [], true);
+    groupValuesRefresh(ctx);
+  } else {
+    var index$1 = getSheetIndex(ctx, id);
+    var luckysheetfile = ctx.luckysheetfile;
+    var sheetData = luckysheetfile[index$1].data;
+    if (!sheetData) return;
+    var calcChain = luckysheetfile[index$1].calcChain || [];
+    var cellsToUpdate = [];
+    for (var i = 0; i < calcChain.length; i += 1) {
+      var _calcChain$i = calcChain[i],
+        r = _calcChain$i.r,
+        c = _calcChain$i.c;
+      var cell = sheetData[r][c];
       if (!(cell === null || cell === void 0 ? void 0 : cell.f)) {
         continue;
       }
-      var result = execfunction(ctx, cell === null || cell === void 0 ? void 0 : cell.f, r, c, id, isrefresh, true);
+      var result = execfunction(ctx, cell.f, r, c, id, false, true);
       var newV = result[1];
       if (newV === cell.v) {
         continue;
       }
-      setCellValue$1(ctx, r, c, result[1], null, {
+      cellsToUpdate.push({
+        r: r,
+        c: c,
+        v: newV
+      });
+    }
+    for (var _i = 0; _i < cellsToUpdate.length; _i += 1) {
+      var _cellsToUpdate$_i = cellsToUpdate[_i],
+        _r = _cellsToUpdate$_i.r,
+        _c = _cellsToUpdate$_i.c,
+        v = _cellsToUpdate$_i.v;
+      setCellValue$1(ctx, _r, _c, v, null, {
         id: id
       });
     }
   }
-  ctx.luckysheetfile = luckysheetfile;
   console.timeEnd("calcTime:".concat(id));
 }
 function updateFunctionGroup(ctx) {
@@ -46671,9 +46690,9 @@ function calculateSheetByCells(ctx, cells) {
     for (var _index = 0; _index < calcChain.length; _index++) {
       var _parseCellReferences;
       var _calcChain$_index = calcChain[_index],
-        _r2 = _calcChain$_index.r,
-        _c2 = _calcChain$_index.c;
-      var cell = file.data[_r2][_c2];
+        _r3 = _calcChain$_index.r,
+        _c3 = _calcChain$_index.c;
+      var cell = file.data[_r3][_c3];
       if (!(cell === null || cell === void 0 ? void 0 : cell.f)) {
         continue;
       }
@@ -46685,8 +46704,8 @@ function calculateSheetByCells(ctx, cells) {
       });
       if (n) {
         needUpdateCell.push({
-          r: _r2,
-          c: _c2,
+          r: _r3,
+          c: _c3,
           id: sheetId,
           f: cell.f,
           v: cell.v
@@ -46702,17 +46721,17 @@ function calculateSheetByCells(ctx, cells) {
   });
   for (var nIndex = 0; nIndex < needUpdateCell.length; nIndex++) {
     var _needUpdateCell$nInde = needUpdateCell[nIndex],
-      _r = _needUpdateCell$nInde.r,
-      _c = _needUpdateCell$nInde.c,
+      _r2 = _needUpdateCell$nInde.r,
+      _c2 = _needUpdateCell$nInde.c,
       _id = _needUpdateCell$nInde.id,
       _f = _needUpdateCell$nInde.f,
       v = _needUpdateCell$nInde.v;
-    var result = execfunction(ctx, _f, _r, _c, _id, undefined, true);
+    var result = execfunction(ctx, _f, _r2, _c2, _id, undefined, true);
     var newV = result[1];
     if (newV === v) {
       continue;
     }
-    setCellValue$1(ctx, _r, _c, result[1], null, {
+    setCellValue$1(ctx, _r2, _c2, result[1], null, {
       id: _id
     });
   }

package/dist/index.js

@@ -46597,26 +46597,45 @@ function copySheet(ctx, sheetId, hooks) {
 }
 function calculateSheetFromula(ctx, id, isrefresh) {
   console.time("calcTime:".concat(id));
-  var index$1 = getSheetIndex(ctx, id);
-  var luckysheetfile = ctx.luckysheetfile;
-  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 cell = ctx.luckysheetfile[index$1].data[r][c];
+  if (isrefresh) {
+    execFunctionGroup(ctx, null, null, null, id, [], true);
+    groupValuesRefresh(ctx);
+  } else {
+    var index$1 = getSheetIndex(ctx, id);
+    var luckysheetfile = ctx.luckysheetfile;
+    var sheetData = luckysheetfile[index$1].data;
+    if (!sheetData) return;
+    var calcChain = luckysheetfile[index$1].calcChain || [];
+    var cellsToUpdate = [];
+    for (var i = 0; i < calcChain.length; i += 1) {
+      var _calcChain$i = calcChain[i],
+        r = _calcChain$i.r,
+        c = _calcChain$i.c;
+      var cell = sheetData[r][c];
       if (!(cell === null || cell === void 0 ? void 0 : cell.f)) {
         continue;
       }
-      var result = execfunction(ctx, cell === null || cell === void 0 ? void 0 : cell.f, r, c, id, isrefresh, true);
+      var result = execfunction(ctx, cell.f, r, c, id, false, true);
       var newV = result[1];
       if (newV === cell.v) {
         continue;
       }
-      setCellValue$1(ctx, r, c, result[1], null, {
+      cellsToUpdate.push({
+        r: r,
+        c: c,
+        v: newV
+      });
+    }
+    for (var _i = 0; _i < cellsToUpdate.length; _i += 1) {
+      var _cellsToUpdate$_i = cellsToUpdate[_i],
+        _r = _cellsToUpdate$_i.r,
+        _c = _cellsToUpdate$_i.c,
+        v = _cellsToUpdate$_i.v;
+      setCellValue$1(ctx, _r, _c, v, null, {
         id: id
       });
     }
   }
-  ctx.luckysheetfile = luckysheetfile;
   console.timeEnd("calcTime:".concat(id));
 }
 function updateFunctionGroup(ctx) {
@@ -46681,9 +46700,9 @@ function calculateSheetByCells(ctx, cells) {
     for (var _index = 0; _index < calcChain.length; _index++) {
       var _parseCellReferences;
       var _calcChain$_index = calcChain[_index],
-        _r2 = _calcChain$_index.r,
-        _c2 = _calcChain$_index.c;
-      var cell = file.data[_r2][_c2];
+        _r3 = _calcChain$_index.r,
+        _c3 = _calcChain$_index.c;
+      var cell = file.data[_r3][_c3];
       if (!(cell === null || cell === void 0 ? void 0 : cell.f)) {
         continue;
       }
@@ -46695,8 +46714,8 @@ function calculateSheetByCells(ctx, cells) {
       });
       if (n) {
         needUpdateCell.push({
-          r: _r2,
-          c: _c2,
+          r: _r3,
+          c: _c3,
           id: sheetId,
           f: cell.f,
           v: cell.v
@@ -46712,17 +46731,17 @@ function calculateSheetByCells(ctx, cells) {
   });
   for (var nIndex = 0; nIndex < needUpdateCell.length; nIndex++) {
     var _needUpdateCell$nInde = needUpdateCell[nIndex],
-      _r = _needUpdateCell$nInde.r,
-      _c = _needUpdateCell$nInde.c,
+      _r2 = _needUpdateCell$nInde.r,
+      _c2 = _needUpdateCell$nInde.c,
       _id = _needUpdateCell$nInde.id,
       _f = _needUpdateCell$nInde.f,
       v = _needUpdateCell$nInde.v;
-    var result = execfunction(ctx, _f, _r, _c, _id, undefined, true);
+    var result = execfunction(ctx, _f, _r2, _c2, _id, undefined, true);
     var newV = result[1];
     if (newV === v) {
       continue;
     }
-    setCellValue$1(ctx, _r, _c, result[1], null, {
+    setCellValue$1(ctx, _r2, _c2, result[1], null, {
       id: _id
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leankylin-sheet/core",
-  "version": "5.2.22",
+  "version": "5.2.24",
   "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": "5.2.22",
+    "@leankylin-sheet/formula-parser": "5.2.24",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",