@leankylin-sheet/core 5.2.70 → 5.2.72

package/dist/api/sheet.d.ts

@@ -16,3 +16,4 @@ export declare function calculateSheetByCells(ctx: Context, cells: {
     c: number;
     id: string;
 }[]): void;
+export declare function recalculateVariableCells(ctx: Context, oldVariables: any, newVariables: any): void;

package/dist/index.esm.js

@@ -36328,10 +36328,14 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
     var key = "r".concat(origin_r, "c").concat(origin_c, "i").concat(id);
     updateValueOjects[key] = 1;
   } else {
+    if (!_.isNil(origin_r) && !_.isNil(origin_c)) {
+      var _key = "r".concat(origin_r, "c").concat(origin_c, "i").concat(id);
+      updateValueOjects[_key] = 1;
+    }
     for (var x = 0; x < ctx.formulaCache.execFunctionExist.length; x += 1) {
       var cell = ctx.formulaCache.execFunctionExist[x];
-      var _key = "r".concat(cell.r, "c").concat(cell.c, "i").concat(cell.i);
-      updateValueOjects[_key] = 1;
+      var _key2 = "r".concat(cell.r, "c").concat(cell.c, "i").concat(cell.i);
+      updateValueOjects[_key2] = 1;
     }
   }
   console.time('arrayMatchCache');
@@ -36339,7 +36343,7 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
   var arrayMatch = function arrayMatch(formulaArray, _formulaObjects, _updateValueOjects, func) {
     for (var a = 0; a < formulaArray.length; a += 1) {
       var range = formulaArray[a];
-      var cacheKey = "r".concat(range.row[0]).concat(range.row[1], "c").concat(range.column[0]).concat(range.column[1], "id").concat(range.sheetId);
+      var cacheKey = "r".concat(range.row[0], "_").concat(range.row[1], "_c").concat(range.column[0], "_").concat(range.column[1], "_id_").concat(range.sheetId);
       if (cacheKey in arrayMatchCache) {
         var amc = arrayMatchCache[cacheKey];
         amc.forEach(function (item) {
@@ -36349,11 +36353,11 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
         var functionArr = [];
         for (var r = range.row[0]; r <= range.row[1]; r += 1) {
           for (var c = range.column[0]; c <= range.column[1]; c += 1) {
-            var _key2 = "r".concat(r, "c").concat(c, "i").concat(range.sheetId);
-            func(_key2, r, c, range.sheetId);
-            if (_formulaObjects && _key2 in _formulaObjects || _updateValueOjects && _key2 in _updateValueOjects) {
+            var _key3 = "r".concat(r, "c").concat(c, "i").concat(range.sheetId);
+            func(_key3, r, c, range.sheetId);
+            if (_formulaObjects && _key3 in _formulaObjects || _updateValueOjects && _key3 in _updateValueOjects) {
               functionArr.push({
-                key: _key2,
+                key: _key3,
                 r: r,
                 c: c,
                 sheetId: range.sheetId
@@ -46794,11 +46798,11 @@ 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, isrefresh) {
-  console.time("calcTime:all}");
+  console.time("calcTime:all");
   execFunctionGroup(ctx, null, null, null, undefined, [], true);
   groupValuesRefresh(ctx);
   ctx.formulaCache.execFunctionGlobalData = null;
-  console.timeEnd("calcTime:".concat(id));
+  console.timeEnd("calcTime:all");
 }
 function updateFunctionGroupBySheetId(ctx, id) {
   var _ctx$luckysheetfile$i, _ctx$luckysheetfile$i2, _ctx$luckysheetfile$i3;
@@ -46919,6 +46923,79 @@ function calculateSheetByCells(ctx, cells) {
   }
   console.timeEnd("calculateSheetByCellsTime");
 }
+function getVariableValue(variables, sheetId, name) {
+  var _variables$sheetId;
+  if (sheetId != null && (variables === null || variables === void 0 ? void 0 : (_variables$sheetId = variables[sheetId]) === null || _variables$sheetId === void 0 ? void 0 : _variables$sheetId[name]) !== undefined) {
+    return variables[sheetId][name];
+  }
+  return variables === null || variables === void 0 ? void 0 : variables[name];
+}
+function recalculateVariableCells(ctx, oldVariables, newVariables) {
+  var fileList = ctx.luckysheetfile;
+  var needUpdateCells = [];
+  var _loop2 = function _loop2() {
+    var file = fileList[fIndex];
+    var sheetId = file.id;
+    var _file$calcChain2 = file.calcChain,
+      calcChain = _file$calcChain2 === void 0 ? [] : _file$calcChain2;
+    for (var index = 0; index < calcChain.length; index += 1) {
+      var _file$data2, _file$data2$_r;
+      var _calcChain$index = calcChain[index],
+        _r3 = _calcChain$index.r,
+        _c3 = _calcChain$index.c;
+      var _cell = (_file$data2 = file.data) === null || _file$data2 === void 0 ? void 0 : (_file$data2$_r = _file$data2[_r3]) === null || _file$data2$_r === void 0 ? void 0 : _file$data2$_r[_c3];
+      if (!(_cell === null || _cell === void 0 ? void 0 : _cell.f)) {
+        continue;
+      }
+      var varNames = _cell.f.match(/\{\{.*?\}\}/g);
+      if (!varNames) {
+        continue;
+      }
+      var changed = varNames.some(function (name) {
+        return !_.isEqual(getVariableValue(oldVariables, sheetId, name), getVariableValue(newVariables, sheetId, name));
+      });
+      if (changed) {
+        needUpdateCells.push({
+          r: _r3,
+          c: _c3,
+          i: sheetId
+        });
+      }
+    }
+  };
+  for (var fIndex = 0; fIndex < fileList.length; fIndex += 1) {
+    _loop2();
+  }
+  if (needUpdateCells.length === 0) {
+    return;
+  }
+  for (var k = 0; k < needUpdateCells.length; k += 1) {
+    var _file$data, _file$data$r;
+    var _needUpdateCells$k = needUpdateCells[k],
+      r = _needUpdateCells$k.r,
+      c = _needUpdateCells$k.c,
+      id = _needUpdateCells$k.i;
+    var fileIndex = getSheetIndex(ctx, id);
+    if (fileIndex == null) {
+      continue;
+    }
+    var file = ctx.luckysheetfile[fileIndex];
+    var cell = (_file$data = file.data) === null || _file$data === void 0 ? void 0 : (_file$data$r = _file$data[r]) === null || _file$data$r === void 0 ? void 0 : _file$data$r[c];
+    if (!(cell === null || cell === void 0 ? void 0 : cell.f)) {
+      continue;
+    }
+    var result = execfunction(ctx, cell.f, r, c, id, false, true);
+    setCellValue(ctx, r, c, file.data, {
+      v: result[1],
+      f: result[2]
+    });
+  }
+  ctx.formulaCache.execFunctionExist = needUpdateCells;
+  ctx.formulaCache.execFunctionExist.reverse();
+  execFunctionGroup(ctx, null, null, null, null, undefined, false, true);
+  groupValuesRefresh(ctx);
+  ctx.formulaCache.execFunctionGlobalData = null;
+}
 
 var imageProps = {
   defaultWidth: 144,
@@ -48981,6 +49058,8 @@ function autoSelectionFormula(ctx, cellInput, fxInput, formula, cache) {
     execFunctionGroup(ctx, null, null, null, null, flowdata, false, false);
     ctx.formulaCache.execFunctionGlobalData = null;
     updateFunctionGroup(ctx);
+  } else {
+    ctx.formulaCache.execFunctionExist = undefined;
   }
 }
 function cancelPaintModel(ctx) {
@@ -56338,6 +56417,7 @@ function setCellValue$1(ctx, row, column, value, cellInput) {
   var formatList = FORMAT_LIST;
   if (value == null || value.toString().length === 0) {
     delFunctionGroup(ctx, row, column);
+    execFunctionGroup(ctx, row, column, value, sheet.id, data, false, false);
     setCellValue(ctx, row, column, data, value);
   } else if (value instanceof Object) {
     var _data$row;
@@ -56408,6 +56488,7 @@ function setCellValue$1(ctx, row, column, value, cellInput) {
       updateCell(ctx, row, column, cellInput, value);
     } else {
       delFunctionGroup(ctx, row, column);
+      execFunctionGroup(ctx, row, column, value, sheet.id, data, false, false);
       setCellValue(ctx, row, column, data, value);
     }
   }
@@ -57235,6 +57316,7 @@ var index = /*#__PURE__*/Object.freeze({
   updateFunctionGroupBySheetId: updateFunctionGroupBySheetId,
   updateFunctionGroup: updateFunctionGroup,
   calculateSheetByCells: calculateSheetByCells,
+  recalculateVariableCells: recalculateVariableCells,
   addSheet: addSheet$1,
   deleteSheet: deleteSheet$1,
   updateSheet: updateSheet$1,

package/dist/index.js

@@ -36338,10 +36338,14 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
     var key = "r".concat(origin_r, "c").concat(origin_c, "i").concat(id);
     updateValueOjects[key] = 1;
   } else {
+    if (!___default['default'].isNil(origin_r) && !___default['default'].isNil(origin_c)) {
+      var _key = "r".concat(origin_r, "c").concat(origin_c, "i").concat(id);
+      updateValueOjects[_key] = 1;
+    }
     for (var x = 0; x < ctx.formulaCache.execFunctionExist.length; x += 1) {
       var cell = ctx.formulaCache.execFunctionExist[x];
-      var _key = "r".concat(cell.r, "c").concat(cell.c, "i").concat(cell.i);
-      updateValueOjects[_key] = 1;
+      var _key2 = "r".concat(cell.r, "c").concat(cell.c, "i").concat(cell.i);
+      updateValueOjects[_key2] = 1;
     }
   }
   console.time('arrayMatchCache');
@@ -36349,7 +36353,7 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
   var arrayMatch = function arrayMatch(formulaArray, _formulaObjects, _updateValueOjects, func) {
     for (var a = 0; a < formulaArray.length; a += 1) {
       var range = formulaArray[a];
-      var cacheKey = "r".concat(range.row[0]).concat(range.row[1], "c").concat(range.column[0]).concat(range.column[1], "id").concat(range.sheetId);
+      var cacheKey = "r".concat(range.row[0], "_").concat(range.row[1], "_c").concat(range.column[0], "_").concat(range.column[1], "_id_").concat(range.sheetId);
       if (cacheKey in arrayMatchCache) {
         var amc = arrayMatchCache[cacheKey];
         amc.forEach(function (item) {
@@ -36359,11 +36363,11 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
         var functionArr = [];
         for (var r = range.row[0]; r <= range.row[1]; r += 1) {
           for (var c = range.column[0]; c <= range.column[1]; c += 1) {
-            var _key2 = "r".concat(r, "c").concat(c, "i").concat(range.sheetId);
-            func(_key2, r, c, range.sheetId);
-            if (_formulaObjects && _key2 in _formulaObjects || _updateValueOjects && _key2 in _updateValueOjects) {
+            var _key3 = "r".concat(r, "c").concat(c, "i").concat(range.sheetId);
+            func(_key3, r, c, range.sheetId);
+            if (_formulaObjects && _key3 in _formulaObjects || _updateValueOjects && _key3 in _updateValueOjects) {
               functionArr.push({
-                key: _key2,
+                key: _key3,
                 r: r,
                 c: c,
                 sheetId: range.sheetId
@@ -46804,11 +46808,11 @@ 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, isrefresh) {
-  console.time("calcTime:all}");
+  console.time("calcTime:all");
   execFunctionGroup(ctx, null, null, null, undefined, [], true);
   groupValuesRefresh(ctx);
   ctx.formulaCache.execFunctionGlobalData = null;
-  console.timeEnd("calcTime:".concat(id));
+  console.timeEnd("calcTime:all");
 }
 function updateFunctionGroupBySheetId(ctx, id) {
   var _ctx$luckysheetfile$i, _ctx$luckysheetfile$i2, _ctx$luckysheetfile$i3;
@@ -46929,6 +46933,79 @@ function calculateSheetByCells(ctx, cells) {
   }
   console.timeEnd("calculateSheetByCellsTime");
 }
+function getVariableValue(variables, sheetId, name) {
+  var _variables$sheetId;
+  if (sheetId != null && (variables === null || variables === void 0 ? void 0 : (_variables$sheetId = variables[sheetId]) === null || _variables$sheetId === void 0 ? void 0 : _variables$sheetId[name]) !== undefined) {
+    return variables[sheetId][name];
+  }
+  return variables === null || variables === void 0 ? void 0 : variables[name];
+}
+function recalculateVariableCells(ctx, oldVariables, newVariables) {
+  var fileList = ctx.luckysheetfile;
+  var needUpdateCells = [];
+  var _loop2 = function _loop2() {
+    var file = fileList[fIndex];
+    var sheetId = file.id;
+    var _file$calcChain2 = file.calcChain,
+      calcChain = _file$calcChain2 === void 0 ? [] : _file$calcChain2;
+    for (var index = 0; index < calcChain.length; index += 1) {
+      var _file$data2, _file$data2$_r;
+      var _calcChain$index = calcChain[index],
+        _r3 = _calcChain$index.r,
+        _c3 = _calcChain$index.c;
+      var _cell = (_file$data2 = file.data) === null || _file$data2 === void 0 ? void 0 : (_file$data2$_r = _file$data2[_r3]) === null || _file$data2$_r === void 0 ? void 0 : _file$data2$_r[_c3];
+      if (!(_cell === null || _cell === void 0 ? void 0 : _cell.f)) {
+        continue;
+      }
+      var varNames = _cell.f.match(/\{\{.*?\}\}/g);
+      if (!varNames) {
+        continue;
+      }
+      var changed = varNames.some(function (name) {
+        return !___default['default'].isEqual(getVariableValue(oldVariables, sheetId, name), getVariableValue(newVariables, sheetId, name));
+      });
+      if (changed) {
+        needUpdateCells.push({
+          r: _r3,
+          c: _c3,
+          i: sheetId
+        });
+      }
+    }
+  };
+  for (var fIndex = 0; fIndex < fileList.length; fIndex += 1) {
+    _loop2();
+  }
+  if (needUpdateCells.length === 0) {
+    return;
+  }
+  for (var k = 0; k < needUpdateCells.length; k += 1) {
+    var _file$data, _file$data$r;
+    var _needUpdateCells$k = needUpdateCells[k],
+      r = _needUpdateCells$k.r,
+      c = _needUpdateCells$k.c,
+      id = _needUpdateCells$k.i;
+    var fileIndex = getSheetIndex(ctx, id);
+    if (fileIndex == null) {
+      continue;
+    }
+    var file = ctx.luckysheetfile[fileIndex];
+    var cell = (_file$data = file.data) === null || _file$data === void 0 ? void 0 : (_file$data$r = _file$data[r]) === null || _file$data$r === void 0 ? void 0 : _file$data$r[c];
+    if (!(cell === null || cell === void 0 ? void 0 : cell.f)) {
+      continue;
+    }
+    var result = execfunction(ctx, cell.f, r, c, id, false, true);
+    setCellValue(ctx, r, c, file.data, {
+      v: result[1],
+      f: result[2]
+    });
+  }
+  ctx.formulaCache.execFunctionExist = needUpdateCells;
+  ctx.formulaCache.execFunctionExist.reverse();
+  execFunctionGroup(ctx, null, null, null, null, undefined, false, true);
+  groupValuesRefresh(ctx);
+  ctx.formulaCache.execFunctionGlobalData = null;
+}
 
 var imageProps = {
   defaultWidth: 144,
@@ -48991,6 +49068,8 @@ function autoSelectionFormula(ctx, cellInput, fxInput, formula, cache) {
     execFunctionGroup(ctx, null, null, null, null, flowdata, false, false);
     ctx.formulaCache.execFunctionGlobalData = null;
     updateFunctionGroup(ctx);
+  } else {
+    ctx.formulaCache.execFunctionExist = undefined;
   }
 }
 function cancelPaintModel(ctx) {
@@ -56348,6 +56427,7 @@ function setCellValue$1(ctx, row, column, value, cellInput) {
   var formatList = FORMAT_LIST;
   if (value == null || value.toString().length === 0) {
     delFunctionGroup(ctx, row, column);
+    execFunctionGroup(ctx, row, column, value, sheet.id, data, false, false);
     setCellValue(ctx, row, column, data, value);
   } else if (value instanceof Object) {
     var _data$row;
@@ -56418,6 +56498,7 @@ function setCellValue$1(ctx, row, column, value, cellInput) {
       updateCell(ctx, row, column, cellInput, value);
     } else {
       delFunctionGroup(ctx, row, column);
+      execFunctionGroup(ctx, row, column, value, sheet.id, data, false, false);
       setCellValue(ctx, row, column, data, value);
     }
   }
@@ -57245,6 +57326,7 @@ var index = /*#__PURE__*/Object.freeze({
   updateFunctionGroupBySheetId: updateFunctionGroupBySheetId,
   updateFunctionGroup: updateFunctionGroup,
   calculateSheetByCells: calculateSheetByCells,
+  recalculateVariableCells: recalculateVariableCells,
   addSheet: addSheet$1,
   deleteSheet: deleteSheet$1,
   updateSheet: updateSheet$1,

package/package.json

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