@leankylin-sheet/core 4.0.59 → 4.0.61

package/dist/api/sheet.d.ts

@@ -9,3 +9,8 @@ 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, hooks: Hooks): void;
 export declare function calculateSheetFromula(ctx: Context, id: string): void;
+export declare function calculateSheetByCells(ctx: Context, cells: {
+    r: number;
+    c: number;
+    id: string;
+}[]): void;

package/dist/index.esm.js

@@ -46539,6 +46539,7 @@ 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];
@@ -46549,29 +46550,115 @@ function calculateSheetFromula(ctx, id) {
   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 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, undefined, true);
-      setCellValue$1(ctx, r, c, result[1], null, {
-        id: id
-      });
-      if (_.isNil(id)) {
-        id = ctx.currentSheetId;
-      }
       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;
+      }
+      setCellValue$1(ctx, r, c, result[1], null, {
+        id: id
+      });
     }
   }
   file.calcChain = uniqBy(calcChain, function (item) {
     return item.r + item.c + item.id;
   });
   ctx.luckysheetfile = luckysheetfile;
+  console.timeEnd("calcTime:".concat(id));
+}
+function parseCellReferences(expression) {
+  if (typeof expression !== "string" || expression.trim() === "") {
+    return [];
+  }
+  var cellRegex = /([A-Za-z0-9_]+!)?[A-Za-z]+\d+/g;
+  var matches = expression.match(cellRegex) || [];
+  var uniqueCells = matches.map(function (cell) {
+    return cell.trim().toUpperCase();
+  });
+  return uniqueCells;
+}
+function calculateSheetByCells(ctx, cells) {
+  console.time("calculateSheetByCellsTime");
+  var fileList = ctx.luckysheetfile;
+  var sheetIdNameMap = {};
+  for (var ffIndex = 0; ffIndex < fileList.length; ffIndex++) {
+    var _f$name;
+    var f = fileList[ffIndex];
+    sheetIdNameMap[f.id] = (_f$name = f.name) === null || _f$name === void 0 ? void 0 : _f$name.toLocaleUpperCase();
+  }
+  var needUpdateCell = [];
+  var updatedMap = {};
+  for (var index$1 = 0; index$1 < cells.length; index$1++) {
+    var _cells$index = cells[index$1],
+      r = _cells$index.r,
+      c = _cells$index.c,
+      id = _cells$index.id;
+    updatedMap["".concat(sheetIdNameMap[id], "!").concat(indexToColumnChar(c) + (r + 1))] = true;
+  }
+  var _loop = function _loop() {
+    var file = fileList[fIndex];
+    var sheetId = file.id;
+    var _file$calcChain = file.calcChain,
+      calcChain = _file$calcChain === void 0 ? [] : _file$calcChain;
+    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];
+      if (!(cell === null || cell === void 0 ? void 0 : cell.f)) {
+        continue;
+      }
+      var devCell = (_parseCellReferences = parseCellReferences(cell.f)) === null || _parseCellReferences === void 0 ? void 0 : _parseCellReferences.map(function (item) {
+        return item.includes("!") ? item : "".concat(sheetIdNameMap[sheetId], "!").concat(item);
+      });
+      var n = devCell === null || devCell === void 0 ? void 0 : devCell.some(function (item) {
+        return updatedMap["".concat(item)];
+      });
+      if (n) {
+        needUpdateCell.push({
+          r: _r2,
+          c: _c2,
+          id: sheetId,
+          f: cell.f,
+          v: cell.v
+        });
+      }
+    }
+  };
+  for (var fIndex = 0; fIndex < fileList.length; fIndex++) {
+    _loop();
+  }
+  needUpdateCell = uniqBy(needUpdateCell, function (item) {
+    return "".concat(item.r, "_").concat(item.c, "_").concat(item.id);
+  });
+  for (var nIndex = 0; nIndex < needUpdateCell.length; nIndex++) {
+    var _needUpdateCell$nInde = needUpdateCell[nIndex],
+      _r = _needUpdateCell$nInde.r,
+      _c = _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 newV = result[1];
+    if (newV === v) {
+      continue;
+    }
+    setCellValue$1(ctx, _r, _c, result[1], null, {
+      id: _id
+    });
+  }
+  console.timeEnd("calculateSheetByCellsTime");
 }
 
 function storeSheetParam(ctx) {
@@ -56230,6 +56317,7 @@ var index = /*#__PURE__*/Object.freeze({
   showSheet: showSheet,
   copySheet: copySheet,
   calculateSheetFromula: calculateSheetFromula,
+  calculateSheetByCells: calculateSheetByCells,
   addSheet: addSheet$1,
   deleteSheet: deleteSheet$1,
   updateSheet: updateSheet$1,

package/dist/index.js

@@ -46549,6 +46549,7 @@ 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];
@@ -46559,29 +46560,115 @@ function calculateSheetFromula(ctx, id) {
   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 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, undefined, true);
-      setCellValue$1(ctx, r, c, result[1], null, {
-        id: id
-      });
-      if (___default['default'].isNil(id)) {
-        id = ctx.currentSheetId;
-      }
       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;
+      }
+      setCellValue$1(ctx, r, c, result[1], null, {
+        id: id
+      });
     }
   }
   file.calcChain = _.uniqBy(calcChain, function (item) {
     return item.r + item.c + item.id;
   });
   ctx.luckysheetfile = luckysheetfile;
+  console.timeEnd("calcTime:".concat(id));
+}
+function parseCellReferences(expression) {
+  if (typeof expression !== "string" || expression.trim() === "") {
+    return [];
+  }
+  var cellRegex = /([A-Za-z0-9_]+!)?[A-Za-z]+\d+/g;
+  var matches = expression.match(cellRegex) || [];
+  var uniqueCells = matches.map(function (cell) {
+    return cell.trim().toUpperCase();
+  });
+  return uniqueCells;
+}
+function calculateSheetByCells(ctx, cells) {
+  console.time("calculateSheetByCellsTime");
+  var fileList = ctx.luckysheetfile;
+  var sheetIdNameMap = {};
+  for (var ffIndex = 0; ffIndex < fileList.length; ffIndex++) {
+    var _f$name;
+    var f = fileList[ffIndex];
+    sheetIdNameMap[f.id] = (_f$name = f.name) === null || _f$name === void 0 ? void 0 : _f$name.toLocaleUpperCase();
+  }
+  var needUpdateCell = [];
+  var updatedMap = {};
+  for (var index$1 = 0; index$1 < cells.length; index$1++) {
+    var _cells$index = cells[index$1],
+      r = _cells$index.r,
+      c = _cells$index.c,
+      id = _cells$index.id;
+    updatedMap["".concat(sheetIdNameMap[id], "!").concat(indexToColumnChar(c) + (r + 1))] = true;
+  }
+  var _loop = function _loop() {
+    var file = fileList[fIndex];
+    var sheetId = file.id;
+    var _file$calcChain = file.calcChain,
+      calcChain = _file$calcChain === void 0 ? [] : _file$calcChain;
+    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];
+      if (!(cell === null || cell === void 0 ? void 0 : cell.f)) {
+        continue;
+      }
+      var devCell = (_parseCellReferences = parseCellReferences(cell.f)) === null || _parseCellReferences === void 0 ? void 0 : _parseCellReferences.map(function (item) {
+        return item.includes("!") ? item : "".concat(sheetIdNameMap[sheetId], "!").concat(item);
+      });
+      var n = devCell === null || devCell === void 0 ? void 0 : devCell.some(function (item) {
+        return updatedMap["".concat(item)];
+      });
+      if (n) {
+        needUpdateCell.push({
+          r: _r2,
+          c: _c2,
+          id: sheetId,
+          f: cell.f,
+          v: cell.v
+        });
+      }
+    }
+  };
+  for (var fIndex = 0; fIndex < fileList.length; fIndex++) {
+    _loop();
+  }
+  needUpdateCell = _.uniqBy(needUpdateCell, function (item) {
+    return "".concat(item.r, "_").concat(item.c, "_").concat(item.id);
+  });
+  for (var nIndex = 0; nIndex < needUpdateCell.length; nIndex++) {
+    var _needUpdateCell$nInde = needUpdateCell[nIndex],
+      _r = _needUpdateCell$nInde.r,
+      _c = _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 newV = result[1];
+    if (newV === v) {
+      continue;
+    }
+    setCellValue$1(ctx, _r, _c, result[1], null, {
+      id: _id
+    });
+  }
+  console.timeEnd("calculateSheetByCellsTime");
 }
 
 function storeSheetParam(ctx) {
@@ -56240,6 +56327,7 @@ var index = /*#__PURE__*/Object.freeze({
   showSheet: showSheet,
   copySheet: copySheet,
   calculateSheetFromula: calculateSheetFromula,
+  calculateSheetByCells: calculateSheetByCells,
   addSheet: addSheet$1,
   deleteSheet: deleteSheet$1,
   updateSheet: updateSheet$1,

package/package.json

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