@leankylin-sheet/core 5.2.43 → 5.2.45

package/dist/index.esm.js

@@ -46766,6 +46766,7 @@ function calculateSheetFromula(ctx, id, isrefresh) {
   console.time("calcTime:all}");
   execFunctionGroup(ctx, null, null, null, undefined, [], true);
   groupValuesRefresh(ctx);
+  ctx.formulaCache.execFunctionGlobalData = null;
   console.timeEnd("calcTime:".concat(id));
 }
 function updateFunctionGroupBySheetId(ctx, id) {
@@ -56692,11 +56693,17 @@ function setCellValuesByRange(ctx, data, range, cellInput) {
     cfg.merge = {};
   }
   var formulaCells = [];
+  var modifiedCells = [];
   for (var i = 0; i < rowCount; i += 1) {
     for (var j = 0; j < columnCount; j += 1) {
       var row = rowStart + i;
       var column = colStart + j;
       var value = data[i][j];
+      modifiedCells.push({
+        r: row,
+        c: column,
+        i: sheet.id
+      });
       setCellValueInBatch(ctx, sheet, row, column, value, cellInput, formulaCells);
       if (setMerge) {
         var _value$mc, _value$mc2, _value$mc3, _value$mc4;
@@ -56718,25 +56725,30 @@ function setCellValuesByRange(ctx, data, range, cellInput) {
   if (setMerge) {
     sheet.config = cfg;
   }
-  if (formulaCells.length > 0) {
-    ctx.formulaCache.execFunctionExist = [];
-    for (var k = 0; k < formulaCells.length; k += 1) {
-      var fc = formulaCells[k];
+  if (modifiedCells.length > 0) {
+    ctx.formulaCache.execFunctionExist = formulaCells.map(function (fc) {
+      return {
+        r: fc.r,
+        c: fc.c,
+        i: sheet.id
+      };
+    });
+    for (var k = 0; k < modifiedCells.length; k += 1) {
+      ctx.formulaCache.execFunctionExist.push(modifiedCells[k]);
+    }
+    for (var _k = 0; _k < formulaCells.length; _k += 1) {
+      var fc = formulaCells[_k];
       var v = execfunction(ctx, fc.f, fc.r, fc.c, sheet.id, false, true);
       setCellValue(ctx, fc.r, fc.c, flowdata, {
         v: v[1],
         f: v[2]
       });
-      ctx.formulaCache.execFunctionExist.push({
-        r: fc.r,
-        c: fc.c,
-        i: sheet.id
-      });
     }
     ctx.formulaCache.execFunctionExist.reverse();
     execFunctionGroup(ctx, null, null, null, null, flowdata, false, true);
     groupValuesRefresh(ctx);
     updateFunctionGroup(ctx);
+    ctx.formulaCache.execFunctionGlobalData = null;
   }
 }
 function setCellValues(ctx, data, cellInput) {
@@ -56780,23 +56792,33 @@ function setCellValues(ctx, data, cellInput) {
       _v = _data$_j.v;
     setCellValueInBatch(ctx, sheet, _r, _c, _v, cellInput, formulaCells);
   }
-  if (formulaCells.length > 0) {
-    ctx.formulaCache.execFunctionExist = [];
-    for (var k = 0; k < formulaCells.length; k += 1) {
-      var fc = formulaCells[k];
-      var val = execfunction(ctx, fc.f, fc.r, fc.c, sheet.id, false, false);
-      setCellValue(ctx, fc.r, fc.c, flowdata, {
-        v: val[1],
-        f: val[2]
-      });
-      ctx.formulaCache.execFunctionExist.push({
-        r: fc.r,
-        c: fc.c,
-        i: sheet.id
-      });
-    }
-    ctx.formulaCache.execFunctionExist.reverse();
+  ctx.formulaCache.execFunctionExist = formulaCells.map(function (fc) {
+    return {
+      r: fc.r,
+      c: fc.c,
+      i: sheet.id
+    };
+  });
+  for (var _j2 = 0; _j2 < data.length; _j2 += 1) {
+    ctx.formulaCache.execFunctionExist.push({
+      r: data[_j2].r,
+      c: data[_j2].c,
+      i: sheet.id
+    });
+  }
+  for (var k = 0; k < formulaCells.length; k += 1) {
+    var fc = formulaCells[k];
+    var val = execfunction(ctx, fc.f, fc.r, fc.c, sheet.id, false, true);
+    setCellValue(ctx, fc.r, fc.c, flowdata, {
+      v: val[1],
+      f: val[2]
+    });
   }
+  ctx.formulaCache.execFunctionExist.reverse();
+  execFunctionGroup(ctx, null, null, null, null, flowdata);
+  groupValuesRefresh(ctx);
+  updateFunctionGroup(ctx);
+  ctx.formulaCache.execFunctionGlobalData = null;
 }
 function setCellFormatByRange(ctx, attr, value, range) {
   var options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};

package/dist/index.js

@@ -46776,6 +46776,7 @@ function calculateSheetFromula(ctx, id, isrefresh) {
   console.time("calcTime:all}");
   execFunctionGroup(ctx, null, null, null, undefined, [], true);
   groupValuesRefresh(ctx);
+  ctx.formulaCache.execFunctionGlobalData = null;
   console.timeEnd("calcTime:".concat(id));
 }
 function updateFunctionGroupBySheetId(ctx, id) {
@@ -56702,11 +56703,17 @@ function setCellValuesByRange(ctx, data, range, cellInput) {
     cfg.merge = {};
   }
   var formulaCells = [];
+  var modifiedCells = [];
   for (var i = 0; i < rowCount; i += 1) {
     for (var j = 0; j < columnCount; j += 1) {
       var row = rowStart + i;
       var column = colStart + j;
       var value = data[i][j];
+      modifiedCells.push({
+        r: row,
+        c: column,
+        i: sheet.id
+      });
       setCellValueInBatch(ctx, sheet, row, column, value, cellInput, formulaCells);
       if (setMerge) {
         var _value$mc, _value$mc2, _value$mc3, _value$mc4;
@@ -56728,25 +56735,30 @@ function setCellValuesByRange(ctx, data, range, cellInput) {
   if (setMerge) {
     sheet.config = cfg;
   }
-  if (formulaCells.length > 0) {
-    ctx.formulaCache.execFunctionExist = [];
-    for (var k = 0; k < formulaCells.length; k += 1) {
-      var fc = formulaCells[k];
+  if (modifiedCells.length > 0) {
+    ctx.formulaCache.execFunctionExist = formulaCells.map(function (fc) {
+      return {
+        r: fc.r,
+        c: fc.c,
+        i: sheet.id
+      };
+    });
+    for (var k = 0; k < modifiedCells.length; k += 1) {
+      ctx.formulaCache.execFunctionExist.push(modifiedCells[k]);
+    }
+    for (var _k = 0; _k < formulaCells.length; _k += 1) {
+      var fc = formulaCells[_k];
       var v = execfunction(ctx, fc.f, fc.r, fc.c, sheet.id, false, true);
       setCellValue(ctx, fc.r, fc.c, flowdata, {
         v: v[1],
         f: v[2]
       });
-      ctx.formulaCache.execFunctionExist.push({
-        r: fc.r,
-        c: fc.c,
-        i: sheet.id
-      });
     }
     ctx.formulaCache.execFunctionExist.reverse();
     execFunctionGroup(ctx, null, null, null, null, flowdata, false, true);
     groupValuesRefresh(ctx);
     updateFunctionGroup(ctx);
+    ctx.formulaCache.execFunctionGlobalData = null;
   }
 }
 function setCellValues(ctx, data, cellInput) {
@@ -56790,23 +56802,33 @@ function setCellValues(ctx, data, cellInput) {
       _v = _data$_j.v;
     setCellValueInBatch(ctx, sheet, _r, _c, _v, cellInput, formulaCells);
   }
-  if (formulaCells.length > 0) {
-    ctx.formulaCache.execFunctionExist = [];
-    for (var k = 0; k < formulaCells.length; k += 1) {
-      var fc = formulaCells[k];
-      var val = execfunction(ctx, fc.f, fc.r, fc.c, sheet.id, false, false);
-      setCellValue(ctx, fc.r, fc.c, flowdata, {
-        v: val[1],
-        f: val[2]
-      });
-      ctx.formulaCache.execFunctionExist.push({
-        r: fc.r,
-        c: fc.c,
-        i: sheet.id
-      });
-    }
-    ctx.formulaCache.execFunctionExist.reverse();
+  ctx.formulaCache.execFunctionExist = formulaCells.map(function (fc) {
+    return {
+      r: fc.r,
+      c: fc.c,
+      i: sheet.id
+    };
+  });
+  for (var _j2 = 0; _j2 < data.length; _j2 += 1) {
+    ctx.formulaCache.execFunctionExist.push({
+      r: data[_j2].r,
+      c: data[_j2].c,
+      i: sheet.id
+    });
+  }
+  for (var k = 0; k < formulaCells.length; k += 1) {
+    var fc = formulaCells[k];
+    var val = execfunction(ctx, fc.f, fc.r, fc.c, sheet.id, false, true);
+    setCellValue(ctx, fc.r, fc.c, flowdata, {
+      v: val[1],
+      f: val[2]
+    });
   }
+  ctx.formulaCache.execFunctionExist.reverse();
+  execFunctionGroup(ctx, null, null, null, null, flowdata);
+  groupValuesRefresh(ctx);
+  updateFunctionGroup(ctx);
+  ctx.formulaCache.execFunctionGlobalData = null;
 }
 function setCellFormatByRange(ctx, attr, value, range) {
   var options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};

package/package.json

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