@leankylin-sheet/core 5.2.33 → 5.2.34

package/dist/api/sheet.d.ts

@@ -9,7 +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, isrefresh: boolean): void;
-export declare function updateFunctionGroup(ctx: Context): void;
+export declare function updateFunctionGroupBySheetId(ctx: Context, id: string): void;
+export declare function updateFunctionGroup(ctx: Context, id?: string): void;
 export declare function calculateSheetByCells(ctx: Context, cells: {
     r: number;
     c: number;

package/dist/index.esm.js

@@ -36227,6 +36227,7 @@ function groupValuesRefresh(ctx) {
 function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
   var isForce = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
   var notInsertFunc = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : true;
+  console.time('execFunctionGroup-before');
   if (_.isNil(data)) {
     data = getFlowdata(ctx);
   }
@@ -36264,6 +36265,7 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
       updateValueOjects[_key] = 1;
     }
   }
+  console.time('arrayMatchCache');
   var arrayMatchCache = {};
   var arrayMatch = function arrayMatch(formulaArray, _formulaObjects, _updateValueOjects, func) {
     for (var a = 0; a < formulaArray.length; a += 1) {
@@ -36296,6 +36298,8 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
       }
     }
   };
+  console.timeEnd('arrayMatchCache');
+  console.time('cache1');
   var _loop = function _loop() {
     var formulaCell = calcChains[_i12];
     var key = "r".concat(formulaCell.r, "c").concat(formulaCell.c, "i").concat(formulaCell.id);
@@ -36398,6 +36402,8 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
   for (var _i12 = 0; _i12 < calcChains.length; _i12 += 1) {
     if (_loop()) continue;
   }
+  console.timeEnd('cache1');
+  console.time('cache2');
   Object.keys(formulaObjects).forEach(function (key) {
     var formulaObject = formulaObjects[key];
     arrayMatch(formulaObject.formulaArray, formulaObjects, updateValueOjects, function (childKey) {
@@ -36414,6 +36420,8 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
       updateValueArray.push(formulaObject);
     }
   });
+  console.timeEnd('cache2');
+  console.time('dev');
   var visited = {};
   var inStack = {};
   var circularNodes = {};
@@ -36476,6 +36484,7 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
       }
     });
   }
+  console.timeEnd('dev');
   var formulaRunList = [];
   var stack = updateValueArray;
   var existsFormulaRunList = {};
@@ -36511,7 +36520,9 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
     if (_ret === 0) continue;
   }
   formulaRunList.reverse();
+  console.timeEnd('execFunctionGroup-before');
   console.time('formulaRunList');
+  console.log('formulaRunList', formulaRunList);
   for (var _i14 = 0; _i14 < formulaRunList.length; _i14 += 1) {
     var formulaCell = formulaRunList[_i14];
     if (formulaCell.level === Math.max) {
@@ -42613,9 +42624,7 @@ function deepClear(ctx) {
           var _d$r2;
           var cell = d === null || d === void 0 ? void 0 : (_d$r2 = d[r]) === null || _d$r2 === void 0 ? void 0 : _d$r2[c];
           d[r][c] = null;
-          if ((cell === null || cell === void 0 ? void 0 : cell.f) != null) {
-            delFunctionGroup(ctx, r, c, ctx.currentSheetId);
-          }
+          if ((cell === null || cell === void 0 ? void 0 : cell.f) != null) ;
           if (hyperlinkMap && hyperlinkMap["".concat(r, "_").concat(c)]) {
             delete hyperlinkMap["".concat(r, "_").concat(c)];
           }
@@ -42623,6 +42632,7 @@ function deepClear(ctx) {
       }
     }
   }
+  updateFunctionGroup(ctx);
   return "success";
 }
 function deleteSelectedCellText(ctx, deep) {
@@ -42665,7 +42675,6 @@ function deleteSelectedCellText(ctx, deep) {
             delete cell.v;
             if (cell.f != null) {
               delete cell.f;
-              delFunctionGroup(ctx, r, c, ctx.currentSheetId);
               delete cell.spl;
             }
             if (cell.ct != null && cell.ct.t === "inlineStr") {
@@ -42680,6 +42689,9 @@ function deleteSelectedCellText(ctx, deep) {
         }
       }
     }
+    console.time('deleteSelectedCellText');
+    updateFunctionGroup(ctx);
+    console.timeEnd('deleteSelectedCellText');
   }
   return "success";
 }
@@ -46736,29 +46748,39 @@ function calculateSheetFromula(ctx, id, isrefresh) {
   }
   console.timeEnd("calcTime:".concat(id));
 }
-function updateFunctionGroup(ctx) {
+function updateFunctionGroupBySheetId(ctx, id) {
+  var _ctx$luckysheetfile$i, _ctx$luckysheetfile$i2, _ctx$luckysheetfile$i3;
   var luckysheetfile = ctx.luckysheetfile;
-  for (var index = 0; index < luckysheetfile.length; index++) {
-    var _ctx$luckysheetfile$i, _ctx$luckysheetfile$i2, _ctx$luckysheetfile$i3;
-    var file = luckysheetfile[index];
-    var calcChain = [];
-    var rows = (_ctx$luckysheetfile$i = (_ctx$luckysheetfile$i2 = ctx.luckysheetfile[index]) === null || _ctx$luckysheetfile$i2 === void 0 ? void 0 : (_ctx$luckysheetfile$i3 = _ctx$luckysheetfile$i2.data) === null || _ctx$luckysheetfile$i3 === void 0 ? void 0 : _ctx$luckysheetfile$i3.length) !== null && _ctx$luckysheetfile$i !== void 0 ? _ctx$luckysheetfile$i : 0;
-    for (var r = 0; r < rows; r += 1) {
-      for (var c = 0; c < ctx.luckysheetfile[index].data[r].length; c += 1) {
-        var cell = ctx.luckysheetfile[index].data[r][c];
-        if (!(cell === null || cell === void 0 ? void 0 : cell.f)) {
-          continue;
-        }
-        var cc = {
-          r: r,
-          c: c,
-          id: file.id,
-          f: cell === null || cell === void 0 ? void 0 : cell.f
-        };
-        calcChain.push(cc);
+  var index = getSheetIndex(ctx, id);
+  var file = luckysheetfile[index];
+  var calcChain = [];
+  var rows = (_ctx$luckysheetfile$i = (_ctx$luckysheetfile$i2 = ctx.luckysheetfile[index]) === null || _ctx$luckysheetfile$i2 === void 0 ? void 0 : (_ctx$luckysheetfile$i3 = _ctx$luckysheetfile$i2.data) === null || _ctx$luckysheetfile$i3 === void 0 ? void 0 : _ctx$luckysheetfile$i3.length) !== null && _ctx$luckysheetfile$i !== void 0 ? _ctx$luckysheetfile$i : 0;
+  for (var r = 0; r < rows; r += 1) {
+    for (var c = 0; c < ctx.luckysheetfile[index].data[r].length; c += 1) {
+      var cell = ctx.luckysheetfile[index].data[r][c];
+      if (!(cell === null || cell === void 0 ? void 0 : cell.f)) {
+        continue;
       }
+      var cc = {
+        r: r,
+        c: c,
+        id: file.id,
+        f: cell === null || cell === void 0 ? void 0 : cell.f
+      };
+      calcChain.push(cc);
     }
-    file.calcChain = calcChain;
+  }
+  file.calcChain = calcChain;
+}
+function updateFunctionGroup(ctx, id) {
+  if (id) {
+    updateFunctionGroupBySheetId(ctx, id);
+    return;
+  }
+  var luckysheetfile = ctx.luckysheetfile;
+  for (var index = 0; index < luckysheetfile.length; index++) {
+    var file = luckysheetfile[index];
+    updateFunctionGroupBySheetId(ctx, file.id);
   }
 }
 function parseCellReferences(expression) {
@@ -47620,7 +47642,9 @@ function runExecFunction(ctx, range, index, data) {
     }
   }
   ctx.formulaCache.execFunctionExist.reverse();
+  console.time('execFunctionGroup');
   execFunctionGroup(ctx, null, null, null, null, data);
+  console.timeEnd('execFunctionGroup');
   ctx.formulaCache.execFunctionGlobalData = null;
   updateFunctionGroup(ctx);
 }
@@ -47633,6 +47657,7 @@ function jfrefreshgrid(ctx, data, range) {
     range = ctx.luckysheet_select_save;
     if (range == null) return;
   }
+  console.log('isRunExecFunction', isRunExecFunction);
   if (isRunExecFunction) {
     runExecFunction(ctx, range, ctx.currentSheetId, data);
   }
@@ -56821,6 +56846,7 @@ var index = /*#__PURE__*/Object.freeze({
   showSheet: showSheet,
   copySheet: copySheet,
   calculateSheetFromula: calculateSheetFromula,
+  updateFunctionGroupBySheetId: updateFunctionGroupBySheetId,
   updateFunctionGroup: updateFunctionGroup,
   calculateSheetByCells: calculateSheetByCells,
   addSheet: addSheet$1,

package/dist/index.js

@@ -36237,6 +36237,7 @@ function groupValuesRefresh(ctx) {
 function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
   var isForce = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
   var notInsertFunc = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : true;
+  console.time('execFunctionGroup-before');
   if (___default['default'].isNil(data)) {
     data = getFlowdata(ctx);
   }
@@ -36274,6 +36275,7 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
       updateValueOjects[_key] = 1;
     }
   }
+  console.time('arrayMatchCache');
   var arrayMatchCache = {};
   var arrayMatch = function arrayMatch(formulaArray, _formulaObjects, _updateValueOjects, func) {
     for (var a = 0; a < formulaArray.length; a += 1) {
@@ -36306,6 +36308,8 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
       }
     }
   };
+  console.timeEnd('arrayMatchCache');
+  console.time('cache1');
   var _loop = function _loop() {
     var formulaCell = calcChains[_i12];
     var key = "r".concat(formulaCell.r, "c").concat(formulaCell.c, "i").concat(formulaCell.id);
@@ -36408,6 +36412,8 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
   for (var _i12 = 0; _i12 < calcChains.length; _i12 += 1) {
     if (_loop()) continue;
   }
+  console.timeEnd('cache1');
+  console.time('cache2');
   Object.keys(formulaObjects).forEach(function (key) {
     var formulaObject = formulaObjects[key];
     arrayMatch(formulaObject.formulaArray, formulaObjects, updateValueOjects, function (childKey) {
@@ -36424,6 +36430,8 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
       updateValueArray.push(formulaObject);
     }
   });
+  console.timeEnd('cache2');
+  console.time('dev');
   var visited = {};
   var inStack = {};
   var circularNodes = {};
@@ -36486,6 +36494,7 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
       }
     });
   }
+  console.timeEnd('dev');
   var formulaRunList = [];
   var stack = updateValueArray;
   var existsFormulaRunList = {};
@@ -36521,7 +36530,9 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
     if (_ret === 0) continue;
   }
   formulaRunList.reverse();
+  console.timeEnd('execFunctionGroup-before');
   console.time('formulaRunList');
+  console.log('formulaRunList', formulaRunList);
   for (var _i14 = 0; _i14 < formulaRunList.length; _i14 += 1) {
     var formulaCell = formulaRunList[_i14];
     if (formulaCell.level === Math.max) {
@@ -42623,9 +42634,7 @@ function deepClear(ctx) {
           var _d$r2;
           var cell = d === null || d === void 0 ? void 0 : (_d$r2 = d[r]) === null || _d$r2 === void 0 ? void 0 : _d$r2[c];
           d[r][c] = null;
-          if ((cell === null || cell === void 0 ? void 0 : cell.f) != null) {
-            delFunctionGroup(ctx, r, c, ctx.currentSheetId);
-          }
+          if ((cell === null || cell === void 0 ? void 0 : cell.f) != null) ;
           if (hyperlinkMap && hyperlinkMap["".concat(r, "_").concat(c)]) {
             delete hyperlinkMap["".concat(r, "_").concat(c)];
           }
@@ -42633,6 +42642,7 @@ function deepClear(ctx) {
       }
     }
   }
+  updateFunctionGroup(ctx);
   return "success";
 }
 function deleteSelectedCellText(ctx, deep) {
@@ -42675,7 +42685,6 @@ function deleteSelectedCellText(ctx, deep) {
             delete cell.v;
             if (cell.f != null) {
               delete cell.f;
-              delFunctionGroup(ctx, r, c, ctx.currentSheetId);
               delete cell.spl;
             }
             if (cell.ct != null && cell.ct.t === "inlineStr") {
@@ -42690,6 +42699,9 @@ function deleteSelectedCellText(ctx, deep) {
         }
       }
     }
+    console.time('deleteSelectedCellText');
+    updateFunctionGroup(ctx);
+    console.timeEnd('deleteSelectedCellText');
   }
   return "success";
 }
@@ -46746,29 +46758,39 @@ function calculateSheetFromula(ctx, id, isrefresh) {
   }
   console.timeEnd("calcTime:".concat(id));
 }
-function updateFunctionGroup(ctx) {
+function updateFunctionGroupBySheetId(ctx, id) {
+  var _ctx$luckysheetfile$i, _ctx$luckysheetfile$i2, _ctx$luckysheetfile$i3;
   var luckysheetfile = ctx.luckysheetfile;
-  for (var index = 0; index < luckysheetfile.length; index++) {
-    var _ctx$luckysheetfile$i, _ctx$luckysheetfile$i2, _ctx$luckysheetfile$i3;
-    var file = luckysheetfile[index];
-    var calcChain = [];
-    var rows = (_ctx$luckysheetfile$i = (_ctx$luckysheetfile$i2 = ctx.luckysheetfile[index]) === null || _ctx$luckysheetfile$i2 === void 0 ? void 0 : (_ctx$luckysheetfile$i3 = _ctx$luckysheetfile$i2.data) === null || _ctx$luckysheetfile$i3 === void 0 ? void 0 : _ctx$luckysheetfile$i3.length) !== null && _ctx$luckysheetfile$i !== void 0 ? _ctx$luckysheetfile$i : 0;
-    for (var r = 0; r < rows; r += 1) {
-      for (var c = 0; c < ctx.luckysheetfile[index].data[r].length; c += 1) {
-        var cell = ctx.luckysheetfile[index].data[r][c];
-        if (!(cell === null || cell === void 0 ? void 0 : cell.f)) {
-          continue;
-        }
-        var cc = {
-          r: r,
-          c: c,
-          id: file.id,
-          f: cell === null || cell === void 0 ? void 0 : cell.f
-        };
-        calcChain.push(cc);
+  var index = getSheetIndex(ctx, id);
+  var file = luckysheetfile[index];
+  var calcChain = [];
+  var rows = (_ctx$luckysheetfile$i = (_ctx$luckysheetfile$i2 = ctx.luckysheetfile[index]) === null || _ctx$luckysheetfile$i2 === void 0 ? void 0 : (_ctx$luckysheetfile$i3 = _ctx$luckysheetfile$i2.data) === null || _ctx$luckysheetfile$i3 === void 0 ? void 0 : _ctx$luckysheetfile$i3.length) !== null && _ctx$luckysheetfile$i !== void 0 ? _ctx$luckysheetfile$i : 0;
+  for (var r = 0; r < rows; r += 1) {
+    for (var c = 0; c < ctx.luckysheetfile[index].data[r].length; c += 1) {
+      var cell = ctx.luckysheetfile[index].data[r][c];
+      if (!(cell === null || cell === void 0 ? void 0 : cell.f)) {
+        continue;
       }
+      var cc = {
+        r: r,
+        c: c,
+        id: file.id,
+        f: cell === null || cell === void 0 ? void 0 : cell.f
+      };
+      calcChain.push(cc);
     }
-    file.calcChain = calcChain;
+  }
+  file.calcChain = calcChain;
+}
+function updateFunctionGroup(ctx, id) {
+  if (id) {
+    updateFunctionGroupBySheetId(ctx, id);
+    return;
+  }
+  var luckysheetfile = ctx.luckysheetfile;
+  for (var index = 0; index < luckysheetfile.length; index++) {
+    var file = luckysheetfile[index];
+    updateFunctionGroupBySheetId(ctx, file.id);
   }
 }
 function parseCellReferences(expression) {
@@ -47630,7 +47652,9 @@ function runExecFunction(ctx, range, index, data) {
     }
   }
   ctx.formulaCache.execFunctionExist.reverse();
+  console.time('execFunctionGroup');
   execFunctionGroup(ctx, null, null, null, null, data);
+  console.timeEnd('execFunctionGroup');
   ctx.formulaCache.execFunctionGlobalData = null;
   updateFunctionGroup(ctx);
 }
@@ -47643,6 +47667,7 @@ function jfrefreshgrid(ctx, data, range) {
     range = ctx.luckysheet_select_save;
     if (range == null) return;
   }
+  console.log('isRunExecFunction', isRunExecFunction);
   if (isRunExecFunction) {
     runExecFunction(ctx, range, ctx.currentSheetId, data);
   }
@@ -56831,6 +56856,7 @@ var index = /*#__PURE__*/Object.freeze({
   showSheet: showSheet,
   copySheet: copySheet,
   calculateSheetFromula: calculateSheetFromula,
+  updateFunctionGroupBySheetId: updateFunctionGroupBySheetId,
   updateFunctionGroup: updateFunctionGroup,
   calculateSheetByCells: calculateSheetByCells,
   addSheet: addSheet$1,

package/package.json

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