@leankylin-sheet/core 5.2.44 → 5.2.45

package/dist/index.esm.js

@@ -36089,91 +36089,35 @@ function delFunctionGroup(ctx, r, c, id) {
   var calcChain = file.calcChain;
   if (!_.isNil(calcChain)) {
     var modified = false;
-    var nextCalcChain = [];
-    for (var _i4 = 0; _i4 < calcChain.length; _i4 += 1) {
-      var calc = calcChain[_i4];
+    var calcChainClone = _.cloneDeep(calcChain);
+    for (var _i4 = 0; _i4 < calcChainClone.length; _i4 += 1) {
+      var calc = calcChainClone[_i4];
       if (calc.r === r && calc.c === c && calc.id === id) {
+        calcChainClone.splice(_i4, 1);
         modified = true;
-        continue;
+        break;
       }
-      nextCalcChain.push(calc);
     }
     if (modified) {
-      file.calcChain = nextCalcChain;
+      file.calcChain = calcChainClone;
     }
   }
   var dynamicArray = file.dynamicArray;
   if (!_.isNil(dynamicArray)) {
     var _modified = false;
-    var nextDynamicArray = [];
-    for (var _i5 = 0; _i5 < dynamicArray.length; _i5 += 1) {
-      var _calc = dynamicArray[_i5];
+    var dynamicArrayClone = _.cloneDeep(dynamicArray);
+    for (var _i5 = 0; _i5 < dynamicArrayClone.length; _i5 += 1) {
+      var _calc = dynamicArrayClone[_i5];
       if (_calc.r === r && _calc.c === c && (_.isNil(_calc.id) || _calc.id === id)) {
+        dynamicArrayClone.splice(_i5, 1);
         _modified = true;
-        continue;
+        break;
       }
-      nextDynamicArray.push(_calc);
     }
     if (_modified) {
-      file.dynamicArray = nextDynamicArray;
-    }
-  }
-}
-function delFunctionGroups(ctx, cells, id) {
-  if (cells.length === 0) return;
-  if (_.isNil(id)) {
-    id = ctx.currentSheetId;
-  }
-  var toDeleteMap = new Map();
-  for (var _i6 = 0; _i6 < cells.length; _i6 += 1) {
-    var _cell$id;
-    var cell = cells[_i6];
-    var cellId = (_cell$id = cell.id) !== null && _cell$id !== void 0 ? _cell$id : id;
-    var keys = toDeleteMap.get(cellId);
-    if (keys == null) {
-      keys = new Set();
-      toDeleteMap.set(cellId, keys);
+      file.dynamicArray = dynamicArrayClone;
     }
-    keys.add("".concat(cell.r, "_").concat(cell.c));
   }
-  toDeleteMap.forEach(function (keys, sheetId) {
-    var idx = getSheetIndex(ctx, sheetId);
-    if (idx == null) return;
-    var file = ctx.luckysheetfile[idx];
-    if (file == null) return;
-    var calcChain = file.calcChain;
-    if (!_.isNil(calcChain)) {
-      var modified = false;
-      var nextCalcChain = [];
-      for (var _i7 = 0; _i7 < calcChain.length; _i7 += 1) {
-        var calc = calcChain[_i7];
-        if (calc.id === sheetId && keys.has("".concat(calc.r, "_").concat(calc.c))) {
-          modified = true;
-          continue;
-        }
-        nextCalcChain.push(calc);
-      }
-      if (modified) {
-        file.calcChain = nextCalcChain;
-      }
-    }
-    var dynamicArray = file.dynamicArray;
-    if (!_.isNil(dynamicArray)) {
-      var _modified2 = false;
-      var nextDynamicArray = [];
-      for (var _i8 = 0; _i8 < dynamicArray.length; _i8 += 1) {
-        var _calc2 = dynamicArray[_i8];
-        if ((_.isNil(_calc2.id) || _calc2.id === sheetId) && keys.has("".concat(_calc2.r, "_").concat(_calc2.c))) {
-          _modified2 = true;
-          continue;
-        }
-        nextDynamicArray.push(_calc2);
-      }
-      if (_modified2) {
-        file.dynamicArray = nextDynamicArray;
-      }
-    }
-  });
 }
 function checkBracketNum(fp) {
   var bra_l = fp.match(/\(/g);
@@ -36191,16 +36135,16 @@ function checkBracketNum(fp) {
   var bra_tl_len = 0;
   var bra_tr_len = 0;
   if (!_.isNil(bra_tl_txt)) {
-    for (var _i9 = 0; _i9 < bra_tl_txt.length; _i9 += 1) {
-      var bra_tl = bra_tl_txt[_i9].match(/\(/g);
+    for (var _i6 = 0; _i6 < bra_tl_txt.length; _i6 += 1) {
+      var bra_tl = bra_tl_txt[_i6].match(/\(/g);
       if (!_.isNil(bra_tl)) {
         bra_tl_len += bra_tl.length;
       }
     }
   }
   if (!_.isNil(bra_tr_txt)) {
-    for (var _i10 = 0; _i10 < bra_tr_txt.length; _i10 += 1) {
-      var bra_tr = bra_tr_txt[_i10].match(/\)/g);
+    for (var _i7 = 0; _i7 < bra_tr_txt.length; _i7 += 1) {
+      var bra_tr = bra_tr_txt[_i7].match(/\)/g);
       if (!_.isNil(bra_tr)) {
         bra_tr_len += bra_tr.length;
       }
@@ -36227,8 +36171,8 @@ function insertUpdateFunctionGroup(ctx, r, c, id) {
   if (_.isNil(calcChain)) {
     calcChain = [];
   }
-  for (var _i11 = 0; _i11 < calcChain.length; _i11 += 1) {
-    var calc = calcChain[_i11];
+  for (var _i8 = 0; _i8 < calcChain.length; _i8 += 1) {
+    var calc = calcChain[_i8];
     if (calc.r === r && calc.c === c && calc.id === id) {
       return;
     }
@@ -36299,8 +36243,8 @@ function insertUpdateDynamicArray(ctx, dynamicArrayItem) {
   if (_.isNil(dynamicArray)) {
     dynamicArray = [];
   }
-  for (var _i12 = 0; _i12 < dynamicArray.length; _i12 += 1) {
-    var calc = dynamicArray[_i12];
+  for (var _i9 = 0; _i9 < dynamicArray.length; _i9 += 1) {
+    var calc = dynamicArray[_i9];
     if (calc.r === r && calc.c === c && calc.id === id) {
       calc.data = dynamicArrayItem.data;
       calc.f = dynamicArrayItem.f;
@@ -36313,8 +36257,8 @@ function insertUpdateDynamicArray(ctx, dynamicArrayItem) {
 function groupValuesRefresh(ctx) {
   var luckysheetfile = ctx.luckysheetfile;
   if (ctx.groupValuesRefreshData.length > 0) {
-    for (var _i13 = 0; _i13 < ctx.groupValuesRefreshData.length; _i13 += 1) {
-      var item = ctx.groupValuesRefreshData[_i13];
+    for (var _i10 = 0; _i10 < ctx.groupValuesRefreshData.length; _i10 += 1) {
+      var item = ctx.groupValuesRefreshData[_i10];
       var idx = getSheetIndex(ctx, item.id);
       if (idx == null) continue;
       var file = luckysheetfile[idx];
@@ -36340,6 +36284,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);
   }
@@ -36361,8 +36306,8 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
   var formulaObjects = {};
   var sheets = ctx.luckysheetfile;
   var sheetData = {};
-  for (var _i14 = 0; _i14 < sheets.length; _i14 += 1) {
-    var sheet = sheets[_i14];
+  for (var _i11 = 0; _i11 < sheets.length; _i11 += 1) {
+    var sheet = sheets[_i11];
     sheetData[sheet.id] = sheet.data;
   }
   var updateValueOjects = {};
@@ -36377,6 +36322,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) {
@@ -36409,8 +36355,10 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
       }
     }
   };
+  console.timeEnd('arrayMatchCache');
+  console.time('cache1');
   var _loop = function _loop() {
-    var formulaCell = calcChains[_i15];
+    var formulaCell = calcChains[_i12];
     var key = "r".concat(formulaCell.r, "c").concat(formulaCell.c, "i").concat(formulaCell.id);
     var calc_funcStr = getcellFormula(ctx, formulaCell.r, formulaCell.c, formulaCell.id);
     if (_.isNil(calc_funcStr)) {
@@ -36508,9 +36456,11 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
     };
     formulaObjects[key] = item;
   };
-  for (var _i15 = 0; _i15 < calcChains.length; _i15 += 1) {
+  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) {
@@ -36527,6 +36477,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 = {};
@@ -36536,8 +36488,8 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
     var node = formulaObjects[nodeKey];
     if (!node) return false;
     var children = Object.keys(node.chidren);
-    for (var _i16 = 0; _i16 < children.length; _i16 += 1) {
-      var childKey = children[_i16];
+    for (var _i13 = 0; _i13 < children.length; _i13 += 1) {
+      var childKey = children[_i13];
       if (inStack[childKey]) {
         Object.keys(inStack).forEach(function (key) {
           if (inStack[key]) {
@@ -36589,6 +36541,7 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
       }
     });
   }
+  console.timeEnd('dev');
   var formulaRunList = [];
   var stack = updateValueArray;
   var existsFormulaRunList = {};
@@ -36624,8 +36577,11 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
     if (_ret === 0) continue;
   }
   formulaRunList.reverse();
-  for (var _i17 = 0; _i17 < formulaRunList.length; _i17 += 1) {
-    var formulaCell = formulaRunList[_i17];
+  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) {
       continue;
     }
@@ -36644,6 +36600,7 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
       f: v[2]
     };
   }
+  console.timeEnd('formulaRunList');
   ctx.formulaCache.execFunctionExist = undefined;
 }
 function findrangeindex(ctx, v, vp) {
@@ -36657,26 +36614,26 @@ function findrangeindex(ctx, v, vp) {
   var vplen = vp_a.length;
   var vlen = v_a.length;
   if (vplen === vlen) {
-    var _i18 = pfri[0];
-    var p = vp_a[_i18];
-    var n = v_a[_i18];
+    var _i15 = pfri[0];
+    var p = vp_a[_i15];
+    var n = v_a[_i15];
     if (_.isNil(p)) {
-      if (vp_a.length <= _i18) {
+      if (vp_a.length <= _i15) {
         pfri = [vp_a.length - 1, vp_a.length - 1];
-      } else if (v_a.length <= _i18) {
+      } else if (v_a.length <= _i15) {
         pfri = [v_a.length - 1, v_a.length - 1];
       }
       return pfri;
     }
     if (p.length === n.length) {
-      if (!_.isNil(vp_a[_i18 + 1]) && !_.isNil(v_a[_i18 + 1]) && vp_a[_i18 + 1].length < v_a[_i18 + 1].length) {
+      if (!_.isNil(vp_a[_i15 + 1]) && !_.isNil(v_a[_i15 + 1]) && vp_a[_i15 + 1].length < v_a[_i15 + 1].length) {
         pfri[0] += 1;
         pfri[1] = 1;
       }
       return pfri;
     }
     if (p.length > n.length) {
-      if (!_.isNil(p) && !_.isNil(v_a[_i18 + 1]) && v_a[_i18 + 1].substring(0, 1) === '"' && (p.indexOf("{") > -1 || p.indexOf("}") > -1)) {
+      if (!_.isNil(p) && !_.isNil(v_a[_i15 + 1]) && v_a[_i15 + 1].substring(0, 1) === '"' && (p.indexOf("{") > -1 || p.indexOf("}") > -1)) {
         pfri[0] += 1;
         pfri[1] = 1;
       }
@@ -36689,34 +36646,34 @@ function findrangeindex(ctx, v, vp) {
       return pfri;
     }
   } else if (vplen > vlen) {
-    var _i19 = pfri[0];
-    var _p = vp_a[_i19];
-    var _n = v_a[_i19];
+    var _i16 = pfri[0];
+    var _p = vp_a[_i16];
+    var _n = v_a[_i16];
     if (_.isNil(_n)) {
-      if (v_a[_i19 - 1].indexOf("{") > -1) {
+      if (v_a[_i16 - 1].indexOf("{") > -1) {
         pfri[0] -= 1;
-        var start = v_a[_i19 - 1].search("{");
+        var start = v_a[_i16 - 1].search("{");
         pfri[1] += start;
       } else {
         pfri[0] = 0;
         pfri[1] = 0;
       }
     } else if (_p.length === _n.length) {
-      if (!_.isNil(v_a[_i19 + 1]) && (v_a[_i19 + 1].substring(0, 1) === '"' || v_a[_i19 + 1].substring(0, 1) === "{" || v_a[_i19 + 1].substring(0, 1) === "}")) {
+      if (!_.isNil(v_a[_i16 + 1]) && (v_a[_i16 + 1].substring(0, 1) === '"' || v_a[_i16 + 1].substring(0, 1) === "{" || v_a[_i16 + 1].substring(0, 1) === "}")) {
         pfri[0] += 1;
         pfri[1] = 1;
-      } else if (!_.isNil(_p) && _p.length > 2 && _p.substring(0, 1) === '"' && _p.substring(_p.length - 1, 1) === '"') ; else if (!_.isNil(v_a[_i19]) && v_a[_i19] === '")') {
+      } else if (!_.isNil(_p) && _p.length > 2 && _p.substring(0, 1) === '"' && _p.substring(_p.length - 1, 1) === '"') ; else if (!_.isNil(v_a[_i16]) && v_a[_i16] === '")') {
         pfri[1] = 1;
-      } else if (!_.isNil(v_a[_i19]) && v_a[_i19] === '"}') {
+      } else if (!_.isNil(v_a[_i16]) && v_a[_i16] === '"}') {
         pfri[1] = 1;
-      } else if (!_.isNil(v_a[_i19]) && v_a[_i19] === "{)") {
+      } else if (!_.isNil(v_a[_i16]) && v_a[_i16] === "{)") {
         pfri[1] = 1;
       } else {
         pfri[1] = _n.length;
       }
       return pfri;
     } else if (_p.length > _n.length) {
-      if (!_.isNil(v_a[_i19 + 1]) && (v_a[_i19 + 1].substring(0, 1) === '"' || v_a[_i19 + 1].substring(0, 1) === "{" || v_a[_i19 + 1].substring(0, 1) === "}")) {
+      if (!_.isNil(v_a[_i16 + 1]) && (v_a[_i16 + 1].substring(0, 1) === '"' || v_a[_i16 + 1].substring(0, 1) === "{" || v_a[_i16 + 1].substring(0, 1) === "}")) {
         pfri[0] += 1;
         pfri[1] = 1;
       }
@@ -36726,9 +36683,9 @@ function findrangeindex(ctx, v, vp) {
     }
     return pfri;
   } else if (vplen < vlen) {
-    var _i20 = pfri[0];
-    var _p2 = vp_a[_i20];
-    var _n2 = v_a[_i20];
+    var _i17 = pfri[0];
+    var _p2 = vp_a[_i17];
+    var _n2 = v_a[_i17];
     if (_.isNil(_p2)) {
       pfri[0] = v_a.length - 1;
       if (!_.isNil(_n2)) {
@@ -36737,9 +36694,9 @@ function findrangeindex(ctx, v, vp) {
         pfri[1] = 1;
       }
     } else if (_p2.length === _n2.length) {
-      if (vp_a[_i20 + 1] != null && (vp_a[_i20 + 1].substring(0, 1) === '"' || vp_a[_i20 + 1].substring(0, 1) === "{" || vp_a[_i20 + 1].substring(0, 1) === "}")) {
+      if (vp_a[_i17 + 1] != null && (vp_a[_i17 + 1].substring(0, 1) === '"' || vp_a[_i17 + 1].substring(0, 1) === "{" || vp_a[_i17 + 1].substring(0, 1) === "}")) {
         pfri[1] = _n2.length;
-      } else if (!_.isNil(v_a[_i20 + 1]) && v_a[_i20 + 1].substring(0, 1) === '"' && (v_a[_i20 + 1].substring(0, 1) === "{" || v_a[_i20 + 1].substring(0, 1) === "}")) {
+      } else if (!_.isNil(v_a[_i17 + 1]) && v_a[_i17 + 1].substring(0, 1) === '"' && (v_a[_i17 + 1].substring(0, 1) === "{" || v_a[_i17 + 1].substring(0, 1) === "}")) {
         pfri[0] += 1;
         pfri[1] = 1;
       } else if (!_.isNil(_n2) && _n2.substring(0, 1) === '"' && _n2.substring(_n2.length - 1, 1) === '"' && _p2.substring(0, 1) === '"' && _p2.substring(_p2.length - 1, 1) === ")") {
@@ -36749,7 +36706,7 @@ function findrangeindex(ctx, v, vp) {
       } else {
         pfri[0] = pfri[0] + vlen - vplen;
         if (v_a.length > vp_a.length) {
-          pfri[1] = v_a[_i20 + 1].length;
+          pfri[1] = v_a[_i17 + 1].length;
         } else {
           pfri[1] = 1;
         }
@@ -36758,17 +36715,17 @@ function findrangeindex(ctx, v, vp) {
     } else if (_p2.length > _n2.length) {
       if (!_.isNil(_p2) && _p2.substring(0, 1) === '"') {
         pfri[1] = _n2.length;
-      } else if (_.isNil(v_a[_i20 + 1]) && /{.*?}/.test(v_a[_i20 + 1])) {
+      } else if (_.isNil(v_a[_i17 + 1]) && /{.*?}/.test(v_a[_i17 + 1])) {
         pfri[0] += 1;
-        pfri[1] = v_a[_i20 + 1].length;
-      } else if (!_.isNil(_p2) && v_a[_i20 + 1].substring(0, 1) === '"' && (_p2.indexOf("{") > -1 || _p2.indexOf("}") > -1)) {
+        pfri[1] = v_a[_i17 + 1].length;
+      } else if (!_.isNil(_p2) && v_a[_i17 + 1].substring(0, 1) === '"' && (_p2.indexOf("{") > -1 || _p2.indexOf("}") > -1)) {
         pfri[0] += 1;
         pfri[1] = 1;
       } else if (!_.isNil(_p2) && (_p2.indexOf("{") > -1 || _p2.indexOf("}") > -1)) ; else if (!_.isNil(_p2) && !_.startsWith(_p2[0], "=") && _.startsWith(_n2, "=")) {
         return [vlen - 1, v_a[vlen - 1].length];
       } else {
         pfri[0] = pfri[0] + vlen - vplen - 1;
-        pfri[1] = v_a[(_i20 || 1) - 1].length;
+        pfri[1] = v_a[(_i17 || 1) - 1].length;
       }
       return pfri;
     } else if (_p2.length < _n2.length) {
@@ -36842,8 +36799,8 @@ function searchFunction(ctx, searchtxt) {
   var f = [];
   var s = [];
   var t = [];
-  for (var _i21 = 0; _i21 < functionlist.length; _i21 += 1) {
-    var item = functionlist[_i21];
+  for (var _i18 = 0; _i18 < functionlist.length; _i18 += 1) {
+    var item = functionlist[_i18];
     var n = item.n;
     if (n === searchtxt) {
       f.unshift(item);
@@ -36899,8 +36856,8 @@ function helpFunctionExe($editer, currSelection, ctx) {
   var _locale2 = locale(ctx),
     functionlist = _locale2.functionlist;
   if (_.isEmpty(ctx.formulaCache.functionlistMap)) {
-    for (var _i22 = 0; _i22 < functionlist.length; _i22 += 1) {
-      ctx.formulaCache.functionlistMap[functionlist[_i22].n] = functionlist[_i22];
+    for (var _i19 = 0; _i19 < functionlist.length; _i19 += 1) {
+      ctx.formulaCache.functionlistMap[functionlist[_i19].n] = functionlist[_i19];
     }
   }
   if (!currSelection) {
@@ -42714,7 +42671,6 @@ function deepClear(ctx) {
   if (selection && !_.isEmpty(selection)) {
     var d = getFlowdata(ctx);
     var hyperlinkMap = ctx.luckysheetfile[getSheetIndex(ctx, ctx.currentSheetId)].hyperlink;
-    var deletedFormulas = [];
     for (var s = 0; s < selection.length; s += 1) {
       var r1 = selection[s].row[0];
       var r2 = selection[s].row[1];
@@ -42725,22 +42681,15 @@ 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) {
-            deletedFormulas.push({
-              r: r,
-              c: c
-            });
-          }
+          if ((cell === null || cell === void 0 ? void 0 : cell.f) != null) ;
           if (hyperlinkMap && hyperlinkMap["".concat(r, "_").concat(c)]) {
             delete hyperlinkMap["".concat(r, "_").concat(c)];
           }
         }
       }
     }
-    if (deletedFormulas.length > 0) {
-      delFunctionGroups(ctx, deletedFormulas, ctx.currentSheetId);
-    }
   }
+  updateFunctionGroup(ctx);
   return "success";
 }
 function deleteSelectedCellText(ctx, deep) {
@@ -42770,8 +42719,6 @@ function deleteSelectedCellText(ctx, deep) {
       return "partMC";
     }
     var hyperlinkMap = ctx.luckysheetfile[getSheetIndex(ctx, ctx.currentSheetId)].hyperlink;
-    var hasChanged = false;
-    var deletedFormulas = [];
     for (var _s = 0; _s < selection.length; _s += 1) {
       var _r3 = selection[_s].row[0];
       var _r4 = selection[_s].row[1];
@@ -42781,39 +42728,27 @@ function deleteSelectedCellText(ctx, deep) {
         for (var c = _c3; c <= _c4; c += 1) {
           if (_.isPlainObject(d[r][c])) {
             var cell = d[r][c];
-            if (cell.m != null || cell.v != null || cell.f != null || cell.ct != null && cell.ct.t === "inlineStr") {
-              hasChanged = true;
-            }
             delete cell.m;
             delete cell.v;
             if (cell.f != null) {
-              deletedFormulas.push({
-                r: r,
-                c: c
-              });
               delete cell.f;
               delete cell.spl;
             }
             if (cell.ct != null && cell.ct.t === "inlineStr") {
               delete cell.ct;
             }
-          } else if (d[r][c] != null) {
+          } else {
             d[r][c] = null;
-            hasChanged = true;
           }
           if (hyperlinkMap && hyperlinkMap["".concat(r, "_").concat(c)]) {
             delete hyperlinkMap["".concat(r, "_").concat(c)];
-            hasChanged = true;
           }
         }
       }
     }
-    if (deletedFormulas.length > 0) {
-      delFunctionGroups(ctx, deletedFormulas, ctx.currentSheetId);
-    }
-    if (!hasChanged) {
-      return "noChange";
-    }
+    console.time('deleteSelectedCellText');
+    updateFunctionGroup(ctx);
+    console.timeEnd('deleteSelectedCellText');
   }
   return "success";
 }
@@ -47728,8 +47663,9 @@ function runExecFunction(ctx, range, index, data) {
     }
   }
   ctx.formulaCache.execFunctionExist.reverse();
+  console.time('execFunctionGroup');
   execFunctionGroup(ctx, null, null, null, null, data);
-  groupValuesRefresh(ctx);
+  console.timeEnd('execFunctionGroup');
   ctx.formulaCache.execFunctionGlobalData = null;
   updateFunctionGroup(ctx);
 }
@@ -47742,6 +47678,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);
   }
@@ -57389,10 +57326,7 @@ function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, hand
       if (ctx.activeImg != null) {
         removeActiveImage(ctx);
       } else {
-        if (deleteSelectedCellText(ctx) === "noChange") {
-          e.preventDefault();
-          return;
-        }
+        deleteSelectedCellText(ctx);
       }
       jfrefreshgrid(ctx, null, undefined);
       e.preventDefault();
@@ -60963,4 +60897,4 @@ function handlePasteByClick(ctx, triggerType) {
   } else if (data.indexOf("leankylin-copy-action-image") > -1) ; else ;
 }
 
-export { CFSplitRange, Canvas, FormulaCache, MAX_ZOOM_RATIO, MIN_ZOOM_RATIO, addSheet, index as api, applyLocation, attrToCssName, autoSelectionFormula, calcSelectionInfo, cancelActiveImgItem, cancelFunctionrangeSelected, cancelNormalSelected, cancelPaintModel, cellFocus, cfSplitRange, changeSheet, chatatABC, checkCF, checkCellIsLocked, checkProtectionAllSelected, checkProtectionFormatCells, checkProtectionSelectLockedOrUnLockedCells, checkboxChange, clearFilter, clearMeasureTextCache, colHasMerged, colLocation, colLocationByIndex, colors, columnCharToIndex, commentBoxProps, compute, computeRowlenArr, confirmMessage, convertCssToStyleList, convertSpanToShareString, copy, copy2, createDropCellRange, createFilter, createFilterOptions, createFormulaRangeSelect, createRangeHightlight, dataRangeSelection, datenum_local, defaultContext, defaultFont, defaultSettings, defaultStyle, delFunctionGroup, delFunctionGroups, deleteCellInSave, deleteComment, deleteRowCol, deleteSelectedCellText, deleteSheet, diff, drawArrow, drawLineInfo, dropCellCache, editComment, editSheetName, ensureSheetIndex, error, escapeHTMLTag, escapeRegExpStr, escapeScriptTag, execFunctionGroup, execfunction, expandRowsAndColumns, extractFormulaCellOps, filterPatch, fixColumnStyleOverflowInFreeze, fixPositionOnFrozenCells, fixRowStyleOverflowInFreeze, functionCopy, functionHTMLGenerate, functionStrChange, genarate, generateRandomId, generateRandomSheetName, getAllFunctionGroup, getArrowCanvasSize, getBorderInfoCompute, getBorderInfoComputeRange, getCellHyperlink, getCellRowColumn, getCellTextInfo, getCellTopRightPostion, getCellValue, getClipboardContent, getColMerge, getColorGradation, getCommentBoxByRC, getCommentBoxPosition, getComputeMap, getCurrentRules, getDataArr, getDataBySelectionNoCopy, getDropdownList, getFailureText, getFilterColumnColors, getFilterColumnValues, getFlattenedRange, getFlowdata, getFontSet, getFontStyleByCell, getFrozenHandleLeft, getFrozenHandleTop, getHLColor, getHintText, getHistoryRules, getInlineStringHTML, getInlineStringNoStyle, getMeasureText, getNowDateTime, getNullData, getOptionValue, getOrigincell, getQKBorder, getRange, getRangeArr, getRangeByTxt, getRangetxt, getRealCellValue, getRegExpStr, getRegStr, getRowMerge, getSearchIndexArr, getSelectRange, getSheetByIndex, getSheetIdByName, getSheetIndex, getStyleByCell, getTypeItemHide, getcellFormula, getcellrange, getdatabyselection, getrangeseleciton, goToLink, groupValuesRefresh, handleArrowKey, handleBold, handleBorder, handleCellAreaDoubleClick, handleCellAreaDragOver, handleCellAreaMouseDown, handleCellAreaMouseMove, handleCellDrop, handleClearFormat, handleColFreezeHandleMouseDown, handleColSizeHandleMouseDown, handleColumnHeaderMouseDown, handleContextMenu, handleCopy, handleCurrencyFormat, handleFormatPainter, handleFormulaInput, handleFreeze, handleGlobalEnter, handleGlobalKeyDown, handleGlobalWheel, handleHorizontalAlign, handleItalic, handleKeydownForZoom, handleLink, handleMerge, handleNumberDecrease, handleNumberIncrease, handleOverlayMouseMove, handleOverlayMouseUp, handleOverlayTouchEnd, handleOverlayTouchMove, handleOverlayTouchStart, handlePaste, handlePasteByClick, handlePasteByLeanklin, handlePercentageFormat, handleRowFreezeHandleMouseDown, handleRowHeaderMouseDown, handleRowSizeHandleMouseDown, handleScreenShot, handleSort, handleStrikeThrough, handleSum, handleTextBackground, handleTextColor, handleTextSize, handleUnderline, handleVerticalAlign, handleWithCtrlOrMetaKey, hasChinaword, hasPartMC, hideCRCount, hideDropCellSelection, hideSelected, imageProps, indexToColumnChar, initFreeze, initSheetIndex, inlineStyleAffectAttribute, inlineStyleAffectCssName, insertImage, insertRowCol, insertUpdateFunctionGroup, inverseRowColOptions, isAllSelectedCellsInStatus, isAllowEdit, isInlineStringCT, isInlineStringCell, isLinkValid, isRealNull, isRealNum, isShowHidenCR, isSupportBoundingBox, is_date, iscelldata, isdatatype, isdatatypemulti, isdatetime, israngeseleciton, jfrefreshgrid, labelFilterOptionState, locale, luckysheetUpdateCell, mergeBorder, mergeCells, mergeMoveMain, mousePosition, moveHighlightCell, moveHighlightRange, moveToEnd, newComment, normalizeSelection, normalizedAttr, normalizedCellAttr, onCellsMove, onCellsMoveEnd, onCellsMoveStart, onCommentBoxMove, onCommentBoxMoveEnd, onCommentBoxMoveStart, onCommentBoxResize, onCommentBoxResizeEnd, onCommentBoxResizeStart, onDropCellSelect, onDropCellSelectEnd, onFormulaRangeDragEnd, onImageMove, onImageMoveEnd, onImageMoveStart, onImageResize, onImageResizeEnd, onImageResizeStart, onRangeSelectionModalMove, onRangeSelectionModalMoveEnd, onRangeSelectionModalMoveStart, onSearchDialogMove, onSearchDialogMoveEnd, onSearchDialogMoveStart, opToPatch, orderbydata, orderbydatafiler, overShowComment, pasteHandlerOfPaintModel, patchToOp, rangeDrag, rangeDragColumn, rangeDragRow, rangeHightlightselected, rangeSetValue, rangeValueToHtml, removeActiveImage, removeEditingComment, removeHyperlink, replace, replaceAll, replaceHtml, rgbToHex, rowHasMerged, rowLocation, rowLocationByIndex, saveFilter, saveHyperlink, saveImage, scrollToFrozenRowCol, scrollToHighlightCell, searchAll, searchNext, selectAll, selectIsOverlap, selectTextContent, selectTextContentCross, selectTitlesMap, selectTitlesRange, selectionCache, selectionCopyShow, seletedHighlistByindex, setCaretPosition, setCellValue, setConditionRules, setDropcownValue, setEditingComment, setNextSheet, showComments, showDropCellSelection, showHideAllComments, showHideComment, showImgChooser, showLinkCard, showSelected, sortDataRange, sortSelection, storeSheetParamALL, toolbarItemClickHandler, toolbarItemSelectedFunc, update, updateCell, updateContextWithCanvas, updateContextWithSheetData, updateDropCell, updateFormat, updateFormatCell, updateInlineStringFormat, updateInlineStringFormatOutside, updateItem, updateMoreCell, updateSheet, validateCellData, validateIdCard, valueIsError, valueShowEs };
+export { CFSplitRange, Canvas, FormulaCache, MAX_ZOOM_RATIO, MIN_ZOOM_RATIO, addSheet, index as api, applyLocation, attrToCssName, autoSelectionFormula, calcSelectionInfo, cancelActiveImgItem, cancelFunctionrangeSelected, cancelNormalSelected, cancelPaintModel, cellFocus, cfSplitRange, changeSheet, chatatABC, checkCF, checkCellIsLocked, checkProtectionAllSelected, checkProtectionFormatCells, checkProtectionSelectLockedOrUnLockedCells, checkboxChange, clearFilter, clearMeasureTextCache, colHasMerged, colLocation, colLocationByIndex, colors, columnCharToIndex, commentBoxProps, compute, computeRowlenArr, confirmMessage, convertCssToStyleList, convertSpanToShareString, copy, copy2, createDropCellRange, createFilter, createFilterOptions, createFormulaRangeSelect, createRangeHightlight, dataRangeSelection, datenum_local, defaultContext, defaultFont, defaultSettings, defaultStyle, delFunctionGroup, deleteCellInSave, deleteComment, deleteRowCol, deleteSelectedCellText, deleteSheet, diff, drawArrow, drawLineInfo, dropCellCache, editComment, editSheetName, ensureSheetIndex, error, escapeHTMLTag, escapeRegExpStr, escapeScriptTag, execFunctionGroup, execfunction, expandRowsAndColumns, extractFormulaCellOps, filterPatch, fixColumnStyleOverflowInFreeze, fixPositionOnFrozenCells, fixRowStyleOverflowInFreeze, functionCopy, functionHTMLGenerate, functionStrChange, genarate, generateRandomId, generateRandomSheetName, getAllFunctionGroup, getArrowCanvasSize, getBorderInfoCompute, getBorderInfoComputeRange, getCellHyperlink, getCellRowColumn, getCellTextInfo, getCellTopRightPostion, getCellValue, getClipboardContent, getColMerge, getColorGradation, getCommentBoxByRC, getCommentBoxPosition, getComputeMap, getCurrentRules, getDataArr, getDataBySelectionNoCopy, getDropdownList, getFailureText, getFilterColumnColors, getFilterColumnValues, getFlattenedRange, getFlowdata, getFontSet, getFontStyleByCell, getFrozenHandleLeft, getFrozenHandleTop, getHLColor, getHintText, getHistoryRules, getInlineStringHTML, getInlineStringNoStyle, getMeasureText, getNowDateTime, getNullData, getOptionValue, getOrigincell, getQKBorder, getRange, getRangeArr, getRangeByTxt, getRangetxt, getRealCellValue, getRegExpStr, getRegStr, getRowMerge, getSearchIndexArr, getSelectRange, getSheetByIndex, getSheetIdByName, getSheetIndex, getStyleByCell, getTypeItemHide, getcellFormula, getcellrange, getdatabyselection, getrangeseleciton, goToLink, groupValuesRefresh, handleArrowKey, handleBold, handleBorder, handleCellAreaDoubleClick, handleCellAreaDragOver, handleCellAreaMouseDown, handleCellAreaMouseMove, handleCellDrop, handleClearFormat, handleColFreezeHandleMouseDown, handleColSizeHandleMouseDown, handleColumnHeaderMouseDown, handleContextMenu, handleCopy, handleCurrencyFormat, handleFormatPainter, handleFormulaInput, handleFreeze, handleGlobalEnter, handleGlobalKeyDown, handleGlobalWheel, handleHorizontalAlign, handleItalic, handleKeydownForZoom, handleLink, handleMerge, handleNumberDecrease, handleNumberIncrease, handleOverlayMouseMove, handleOverlayMouseUp, handleOverlayTouchEnd, handleOverlayTouchMove, handleOverlayTouchStart, handlePaste, handlePasteByClick, handlePasteByLeanklin, handlePercentageFormat, handleRowFreezeHandleMouseDown, handleRowHeaderMouseDown, handleRowSizeHandleMouseDown, handleScreenShot, handleSort, handleStrikeThrough, handleSum, handleTextBackground, handleTextColor, handleTextSize, handleUnderline, handleVerticalAlign, handleWithCtrlOrMetaKey, hasChinaword, hasPartMC, hideCRCount, hideDropCellSelection, hideSelected, imageProps, indexToColumnChar, initFreeze, initSheetIndex, inlineStyleAffectAttribute, inlineStyleAffectCssName, insertImage, insertRowCol, insertUpdateFunctionGroup, inverseRowColOptions, isAllSelectedCellsInStatus, isAllowEdit, isInlineStringCT, isInlineStringCell, isLinkValid, isRealNull, isRealNum, isShowHidenCR, isSupportBoundingBox, is_date, iscelldata, isdatatype, isdatatypemulti, isdatetime, israngeseleciton, jfrefreshgrid, labelFilterOptionState, locale, luckysheetUpdateCell, mergeBorder, mergeCells, mergeMoveMain, mousePosition, moveHighlightCell, moveHighlightRange, moveToEnd, newComment, normalizeSelection, normalizedAttr, normalizedCellAttr, onCellsMove, onCellsMoveEnd, onCellsMoveStart, onCommentBoxMove, onCommentBoxMoveEnd, onCommentBoxMoveStart, onCommentBoxResize, onCommentBoxResizeEnd, onCommentBoxResizeStart, onDropCellSelect, onDropCellSelectEnd, onFormulaRangeDragEnd, onImageMove, onImageMoveEnd, onImageMoveStart, onImageResize, onImageResizeEnd, onImageResizeStart, onRangeSelectionModalMove, onRangeSelectionModalMoveEnd, onRangeSelectionModalMoveStart, onSearchDialogMove, onSearchDialogMoveEnd, onSearchDialogMoveStart, opToPatch, orderbydata, orderbydatafiler, overShowComment, pasteHandlerOfPaintModel, patchToOp, rangeDrag, rangeDragColumn, rangeDragRow, rangeHightlightselected, rangeSetValue, rangeValueToHtml, removeActiveImage, removeEditingComment, removeHyperlink, replace, replaceAll, replaceHtml, rgbToHex, rowHasMerged, rowLocation, rowLocationByIndex, saveFilter, saveHyperlink, saveImage, scrollToFrozenRowCol, scrollToHighlightCell, searchAll, searchNext, selectAll, selectIsOverlap, selectTextContent, selectTextContentCross, selectTitlesMap, selectTitlesRange, selectionCache, selectionCopyShow, seletedHighlistByindex, setCaretPosition, setCellValue, setConditionRules, setDropcownValue, setEditingComment, setNextSheet, showComments, showDropCellSelection, showHideAllComments, showHideComment, showImgChooser, showLinkCard, showSelected, sortDataRange, sortSelection, storeSheetParamALL, toolbarItemClickHandler, toolbarItemSelectedFunc, update, updateCell, updateContextWithCanvas, updateContextWithSheetData, updateDropCell, updateFormat, updateFormatCell, updateInlineStringFormat, updateInlineStringFormatOutside, updateItem, updateMoreCell, updateSheet, validateCellData, validateIdCard, valueIsError, valueShowEs };

package/dist/index.js

@@ -36099,91 +36099,35 @@ function delFunctionGroup(ctx, r, c, id) {
   var calcChain = file.calcChain;
   if (!___default['default'].isNil(calcChain)) {
     var modified = false;
-    var nextCalcChain = [];
-    for (var _i4 = 0; _i4 < calcChain.length; _i4 += 1) {
-      var calc = calcChain[_i4];
+    var calcChainClone = ___default['default'].cloneDeep(calcChain);
+    for (var _i4 = 0; _i4 < calcChainClone.length; _i4 += 1) {
+      var calc = calcChainClone[_i4];
       if (calc.r === r && calc.c === c && calc.id === id) {
+        calcChainClone.splice(_i4, 1);
         modified = true;
-        continue;
+        break;
       }
-      nextCalcChain.push(calc);
     }
     if (modified) {
-      file.calcChain = nextCalcChain;
+      file.calcChain = calcChainClone;
     }
   }
   var dynamicArray = file.dynamicArray;
   if (!___default['default'].isNil(dynamicArray)) {
     var _modified = false;
-    var nextDynamicArray = [];
-    for (var _i5 = 0; _i5 < dynamicArray.length; _i5 += 1) {
-      var _calc = dynamicArray[_i5];
+    var dynamicArrayClone = ___default['default'].cloneDeep(dynamicArray);
+    for (var _i5 = 0; _i5 < dynamicArrayClone.length; _i5 += 1) {
+      var _calc = dynamicArrayClone[_i5];
       if (_calc.r === r && _calc.c === c && (___default['default'].isNil(_calc.id) || _calc.id === id)) {
+        dynamicArrayClone.splice(_i5, 1);
         _modified = true;
-        continue;
+        break;
       }
-      nextDynamicArray.push(_calc);
     }
     if (_modified) {
-      file.dynamicArray = nextDynamicArray;
-    }
-  }
-}
-function delFunctionGroups(ctx, cells, id) {
-  if (cells.length === 0) return;
-  if (___default['default'].isNil(id)) {
-    id = ctx.currentSheetId;
-  }
-  var toDeleteMap = new Map();
-  for (var _i6 = 0; _i6 < cells.length; _i6 += 1) {
-    var _cell$id;
-    var cell = cells[_i6];
-    var cellId = (_cell$id = cell.id) !== null && _cell$id !== void 0 ? _cell$id : id;
-    var keys = toDeleteMap.get(cellId);
-    if (keys == null) {
-      keys = new Set();
-      toDeleteMap.set(cellId, keys);
+      file.dynamicArray = dynamicArrayClone;
     }
-    keys.add("".concat(cell.r, "_").concat(cell.c));
   }
-  toDeleteMap.forEach(function (keys, sheetId) {
-    var idx = getSheetIndex(ctx, sheetId);
-    if (idx == null) return;
-    var file = ctx.luckysheetfile[idx];
-    if (file == null) return;
-    var calcChain = file.calcChain;
-    if (!___default['default'].isNil(calcChain)) {
-      var modified = false;
-      var nextCalcChain = [];
-      for (var _i7 = 0; _i7 < calcChain.length; _i7 += 1) {
-        var calc = calcChain[_i7];
-        if (calc.id === sheetId && keys.has("".concat(calc.r, "_").concat(calc.c))) {
-          modified = true;
-          continue;
-        }
-        nextCalcChain.push(calc);
-      }
-      if (modified) {
-        file.calcChain = nextCalcChain;
-      }
-    }
-    var dynamicArray = file.dynamicArray;
-    if (!___default['default'].isNil(dynamicArray)) {
-      var _modified2 = false;
-      var nextDynamicArray = [];
-      for (var _i8 = 0; _i8 < dynamicArray.length; _i8 += 1) {
-        var _calc2 = dynamicArray[_i8];
-        if ((___default['default'].isNil(_calc2.id) || _calc2.id === sheetId) && keys.has("".concat(_calc2.r, "_").concat(_calc2.c))) {
-          _modified2 = true;
-          continue;
-        }
-        nextDynamicArray.push(_calc2);
-      }
-      if (_modified2) {
-        file.dynamicArray = nextDynamicArray;
-      }
-    }
-  });
 }
 function checkBracketNum(fp) {
   var bra_l = fp.match(/\(/g);
@@ -36201,16 +36145,16 @@ function checkBracketNum(fp) {
   var bra_tl_len = 0;
   var bra_tr_len = 0;
   if (!___default['default'].isNil(bra_tl_txt)) {
-    for (var _i9 = 0; _i9 < bra_tl_txt.length; _i9 += 1) {
-      var bra_tl = bra_tl_txt[_i9].match(/\(/g);
+    for (var _i6 = 0; _i6 < bra_tl_txt.length; _i6 += 1) {
+      var bra_tl = bra_tl_txt[_i6].match(/\(/g);
       if (!___default['default'].isNil(bra_tl)) {
         bra_tl_len += bra_tl.length;
       }
     }
   }
   if (!___default['default'].isNil(bra_tr_txt)) {
-    for (var _i10 = 0; _i10 < bra_tr_txt.length; _i10 += 1) {
-      var bra_tr = bra_tr_txt[_i10].match(/\)/g);
+    for (var _i7 = 0; _i7 < bra_tr_txt.length; _i7 += 1) {
+      var bra_tr = bra_tr_txt[_i7].match(/\)/g);
       if (!___default['default'].isNil(bra_tr)) {
         bra_tr_len += bra_tr.length;
       }
@@ -36237,8 +36181,8 @@ function insertUpdateFunctionGroup(ctx, r, c, id) {
   if (___default['default'].isNil(calcChain)) {
     calcChain = [];
   }
-  for (var _i11 = 0; _i11 < calcChain.length; _i11 += 1) {
-    var calc = calcChain[_i11];
+  for (var _i8 = 0; _i8 < calcChain.length; _i8 += 1) {
+    var calc = calcChain[_i8];
     if (calc.r === r && calc.c === c && calc.id === id) {
       return;
     }
@@ -36309,8 +36253,8 @@ function insertUpdateDynamicArray(ctx, dynamicArrayItem) {
   if (___default['default'].isNil(dynamicArray)) {
     dynamicArray = [];
   }
-  for (var _i12 = 0; _i12 < dynamicArray.length; _i12 += 1) {
-    var calc = dynamicArray[_i12];
+  for (var _i9 = 0; _i9 < dynamicArray.length; _i9 += 1) {
+    var calc = dynamicArray[_i9];
     if (calc.r === r && calc.c === c && calc.id === id) {
       calc.data = dynamicArrayItem.data;
       calc.f = dynamicArrayItem.f;
@@ -36323,8 +36267,8 @@ function insertUpdateDynamicArray(ctx, dynamicArrayItem) {
 function groupValuesRefresh(ctx) {
   var luckysheetfile = ctx.luckysheetfile;
   if (ctx.groupValuesRefreshData.length > 0) {
-    for (var _i13 = 0; _i13 < ctx.groupValuesRefreshData.length; _i13 += 1) {
-      var item = ctx.groupValuesRefreshData[_i13];
+    for (var _i10 = 0; _i10 < ctx.groupValuesRefreshData.length; _i10 += 1) {
+      var item = ctx.groupValuesRefreshData[_i10];
       var idx = getSheetIndex(ctx, item.id);
       if (idx == null) continue;
       var file = luckysheetfile[idx];
@@ -36350,6 +36294,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);
   }
@@ -36371,8 +36316,8 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
   var formulaObjects = {};
   var sheets = ctx.luckysheetfile;
   var sheetData = {};
-  for (var _i14 = 0; _i14 < sheets.length; _i14 += 1) {
-    var sheet = sheets[_i14];
+  for (var _i11 = 0; _i11 < sheets.length; _i11 += 1) {
+    var sheet = sheets[_i11];
     sheetData[sheet.id] = sheet.data;
   }
   var updateValueOjects = {};
@@ -36387,6 +36332,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) {
@@ -36419,8 +36365,10 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
       }
     }
   };
+  console.timeEnd('arrayMatchCache');
+  console.time('cache1');
   var _loop = function _loop() {
-    var formulaCell = calcChains[_i15];
+    var formulaCell = calcChains[_i12];
     var key = "r".concat(formulaCell.r, "c").concat(formulaCell.c, "i").concat(formulaCell.id);
     var calc_funcStr = getcellFormula(ctx, formulaCell.r, formulaCell.c, formulaCell.id);
     if (___default['default'].isNil(calc_funcStr)) {
@@ -36518,9 +36466,11 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
     };
     formulaObjects[key] = item;
   };
-  for (var _i15 = 0; _i15 < calcChains.length; _i15 += 1) {
+  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) {
@@ -36537,6 +36487,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 = {};
@@ -36546,8 +36498,8 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
     var node = formulaObjects[nodeKey];
     if (!node) return false;
     var children = Object.keys(node.chidren);
-    for (var _i16 = 0; _i16 < children.length; _i16 += 1) {
-      var childKey = children[_i16];
+    for (var _i13 = 0; _i13 < children.length; _i13 += 1) {
+      var childKey = children[_i13];
       if (inStack[childKey]) {
         Object.keys(inStack).forEach(function (key) {
           if (inStack[key]) {
@@ -36599,6 +36551,7 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
       }
     });
   }
+  console.timeEnd('dev');
   var formulaRunList = [];
   var stack = updateValueArray;
   var existsFormulaRunList = {};
@@ -36634,8 +36587,11 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
     if (_ret === 0) continue;
   }
   formulaRunList.reverse();
-  for (var _i17 = 0; _i17 < formulaRunList.length; _i17 += 1) {
-    var formulaCell = formulaRunList[_i17];
+  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) {
       continue;
     }
@@ -36654,6 +36610,7 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
       f: v[2]
     };
   }
+  console.timeEnd('formulaRunList');
   ctx.formulaCache.execFunctionExist = undefined;
 }
 function findrangeindex(ctx, v, vp) {
@@ -36667,26 +36624,26 @@ function findrangeindex(ctx, v, vp) {
   var vplen = vp_a.length;
   var vlen = v_a.length;
   if (vplen === vlen) {
-    var _i18 = pfri[0];
-    var p = vp_a[_i18];
-    var n = v_a[_i18];
+    var _i15 = pfri[0];
+    var p = vp_a[_i15];
+    var n = v_a[_i15];
     if (___default['default'].isNil(p)) {
-      if (vp_a.length <= _i18) {
+      if (vp_a.length <= _i15) {
         pfri = [vp_a.length - 1, vp_a.length - 1];
-      } else if (v_a.length <= _i18) {
+      } else if (v_a.length <= _i15) {
         pfri = [v_a.length - 1, v_a.length - 1];
       }
       return pfri;
     }
     if (p.length === n.length) {
-      if (!___default['default'].isNil(vp_a[_i18 + 1]) && !___default['default'].isNil(v_a[_i18 + 1]) && vp_a[_i18 + 1].length < v_a[_i18 + 1].length) {
+      if (!___default['default'].isNil(vp_a[_i15 + 1]) && !___default['default'].isNil(v_a[_i15 + 1]) && vp_a[_i15 + 1].length < v_a[_i15 + 1].length) {
         pfri[0] += 1;
         pfri[1] = 1;
       }
       return pfri;
     }
     if (p.length > n.length) {
-      if (!___default['default'].isNil(p) && !___default['default'].isNil(v_a[_i18 + 1]) && v_a[_i18 + 1].substring(0, 1) === '"' && (p.indexOf("{") > -1 || p.indexOf("}") > -1)) {
+      if (!___default['default'].isNil(p) && !___default['default'].isNil(v_a[_i15 + 1]) && v_a[_i15 + 1].substring(0, 1) === '"' && (p.indexOf("{") > -1 || p.indexOf("}") > -1)) {
         pfri[0] += 1;
         pfri[1] = 1;
       }
@@ -36699,34 +36656,34 @@ function findrangeindex(ctx, v, vp) {
       return pfri;
     }
   } else if (vplen > vlen) {
-    var _i19 = pfri[0];
-    var _p = vp_a[_i19];
-    var _n = v_a[_i19];
+    var _i16 = pfri[0];
+    var _p = vp_a[_i16];
+    var _n = v_a[_i16];
     if (___default['default'].isNil(_n)) {
-      if (v_a[_i19 - 1].indexOf("{") > -1) {
+      if (v_a[_i16 - 1].indexOf("{") > -1) {
         pfri[0] -= 1;
-        var start = v_a[_i19 - 1].search("{");
+        var start = v_a[_i16 - 1].search("{");
         pfri[1] += start;
       } else {
         pfri[0] = 0;
         pfri[1] = 0;
       }
     } else if (_p.length === _n.length) {
-      if (!___default['default'].isNil(v_a[_i19 + 1]) && (v_a[_i19 + 1].substring(0, 1) === '"' || v_a[_i19 + 1].substring(0, 1) === "{" || v_a[_i19 + 1].substring(0, 1) === "}")) {
+      if (!___default['default'].isNil(v_a[_i16 + 1]) && (v_a[_i16 + 1].substring(0, 1) === '"' || v_a[_i16 + 1].substring(0, 1) === "{" || v_a[_i16 + 1].substring(0, 1) === "}")) {
         pfri[0] += 1;
         pfri[1] = 1;
-      } else if (!___default['default'].isNil(_p) && _p.length > 2 && _p.substring(0, 1) === '"' && _p.substring(_p.length - 1, 1) === '"') ; else if (!___default['default'].isNil(v_a[_i19]) && v_a[_i19] === '")') {
+      } else if (!___default['default'].isNil(_p) && _p.length > 2 && _p.substring(0, 1) === '"' && _p.substring(_p.length - 1, 1) === '"') ; else if (!___default['default'].isNil(v_a[_i16]) && v_a[_i16] === '")') {
         pfri[1] = 1;
-      } else if (!___default['default'].isNil(v_a[_i19]) && v_a[_i19] === '"}') {
+      } else if (!___default['default'].isNil(v_a[_i16]) && v_a[_i16] === '"}') {
         pfri[1] = 1;
-      } else if (!___default['default'].isNil(v_a[_i19]) && v_a[_i19] === "{)") {
+      } else if (!___default['default'].isNil(v_a[_i16]) && v_a[_i16] === "{)") {
         pfri[1] = 1;
       } else {
         pfri[1] = _n.length;
       }
       return pfri;
     } else if (_p.length > _n.length) {
-      if (!___default['default'].isNil(v_a[_i19 + 1]) && (v_a[_i19 + 1].substring(0, 1) === '"' || v_a[_i19 + 1].substring(0, 1) === "{" || v_a[_i19 + 1].substring(0, 1) === "}")) {
+      if (!___default['default'].isNil(v_a[_i16 + 1]) && (v_a[_i16 + 1].substring(0, 1) === '"' || v_a[_i16 + 1].substring(0, 1) === "{" || v_a[_i16 + 1].substring(0, 1) === "}")) {
         pfri[0] += 1;
         pfri[1] = 1;
       }
@@ -36736,9 +36693,9 @@ function findrangeindex(ctx, v, vp) {
     }
     return pfri;
   } else if (vplen < vlen) {
-    var _i20 = pfri[0];
-    var _p2 = vp_a[_i20];
-    var _n2 = v_a[_i20];
+    var _i17 = pfri[0];
+    var _p2 = vp_a[_i17];
+    var _n2 = v_a[_i17];
     if (___default['default'].isNil(_p2)) {
       pfri[0] = v_a.length - 1;
       if (!___default['default'].isNil(_n2)) {
@@ -36747,9 +36704,9 @@ function findrangeindex(ctx, v, vp) {
         pfri[1] = 1;
       }
     } else if (_p2.length === _n2.length) {
-      if (vp_a[_i20 + 1] != null && (vp_a[_i20 + 1].substring(0, 1) === '"' || vp_a[_i20 + 1].substring(0, 1) === "{" || vp_a[_i20 + 1].substring(0, 1) === "}")) {
+      if (vp_a[_i17 + 1] != null && (vp_a[_i17 + 1].substring(0, 1) === '"' || vp_a[_i17 + 1].substring(0, 1) === "{" || vp_a[_i17 + 1].substring(0, 1) === "}")) {
         pfri[1] = _n2.length;
-      } else if (!___default['default'].isNil(v_a[_i20 + 1]) && v_a[_i20 + 1].substring(0, 1) === '"' && (v_a[_i20 + 1].substring(0, 1) === "{" || v_a[_i20 + 1].substring(0, 1) === "}")) {
+      } else if (!___default['default'].isNil(v_a[_i17 + 1]) && v_a[_i17 + 1].substring(0, 1) === '"' && (v_a[_i17 + 1].substring(0, 1) === "{" || v_a[_i17 + 1].substring(0, 1) === "}")) {
         pfri[0] += 1;
         pfri[1] = 1;
       } else if (!___default['default'].isNil(_n2) && _n2.substring(0, 1) === '"' && _n2.substring(_n2.length - 1, 1) === '"' && _p2.substring(0, 1) === '"' && _p2.substring(_p2.length - 1, 1) === ")") {
@@ -36759,7 +36716,7 @@ function findrangeindex(ctx, v, vp) {
       } else {
         pfri[0] = pfri[0] + vlen - vplen;
         if (v_a.length > vp_a.length) {
-          pfri[1] = v_a[_i20 + 1].length;
+          pfri[1] = v_a[_i17 + 1].length;
         } else {
           pfri[1] = 1;
         }
@@ -36768,17 +36725,17 @@ function findrangeindex(ctx, v, vp) {
     } else if (_p2.length > _n2.length) {
       if (!___default['default'].isNil(_p2) && _p2.substring(0, 1) === '"') {
         pfri[1] = _n2.length;
-      } else if (___default['default'].isNil(v_a[_i20 + 1]) && /{.*?}/.test(v_a[_i20 + 1])) {
+      } else if (___default['default'].isNil(v_a[_i17 + 1]) && /{.*?}/.test(v_a[_i17 + 1])) {
         pfri[0] += 1;
-        pfri[1] = v_a[_i20 + 1].length;
-      } else if (!___default['default'].isNil(_p2) && v_a[_i20 + 1].substring(0, 1) === '"' && (_p2.indexOf("{") > -1 || _p2.indexOf("}") > -1)) {
+        pfri[1] = v_a[_i17 + 1].length;
+      } else if (!___default['default'].isNil(_p2) && v_a[_i17 + 1].substring(0, 1) === '"' && (_p2.indexOf("{") > -1 || _p2.indexOf("}") > -1)) {
         pfri[0] += 1;
         pfri[1] = 1;
       } else if (!___default['default'].isNil(_p2) && (_p2.indexOf("{") > -1 || _p2.indexOf("}") > -1)) ; else if (!___default['default'].isNil(_p2) && !___default['default'].startsWith(_p2[0], "=") && ___default['default'].startsWith(_n2, "=")) {
         return [vlen - 1, v_a[vlen - 1].length];
       } else {
         pfri[0] = pfri[0] + vlen - vplen - 1;
-        pfri[1] = v_a[(_i20 || 1) - 1].length;
+        pfri[1] = v_a[(_i17 || 1) - 1].length;
       }
       return pfri;
     } else if (_p2.length < _n2.length) {
@@ -36852,8 +36809,8 @@ function searchFunction(ctx, searchtxt) {
   var f = [];
   var s = [];
   var t = [];
-  for (var _i21 = 0; _i21 < functionlist.length; _i21 += 1) {
-    var item = functionlist[_i21];
+  for (var _i18 = 0; _i18 < functionlist.length; _i18 += 1) {
+    var item = functionlist[_i18];
     var n = item.n;
     if (n === searchtxt) {
       f.unshift(item);
@@ -36909,8 +36866,8 @@ function helpFunctionExe($editer, currSelection, ctx) {
   var _locale2 = locale(ctx),
     functionlist = _locale2.functionlist;
   if (___default['default'].isEmpty(ctx.formulaCache.functionlistMap)) {
-    for (var _i22 = 0; _i22 < functionlist.length; _i22 += 1) {
-      ctx.formulaCache.functionlistMap[functionlist[_i22].n] = functionlist[_i22];
+    for (var _i19 = 0; _i19 < functionlist.length; _i19 += 1) {
+      ctx.formulaCache.functionlistMap[functionlist[_i19].n] = functionlist[_i19];
     }
   }
   if (!currSelection) {
@@ -42724,7 +42681,6 @@ function deepClear(ctx) {
   if (selection && !___default['default'].isEmpty(selection)) {
     var d = getFlowdata(ctx);
     var hyperlinkMap = ctx.luckysheetfile[getSheetIndex(ctx, ctx.currentSheetId)].hyperlink;
-    var deletedFormulas = [];
     for (var s = 0; s < selection.length; s += 1) {
       var r1 = selection[s].row[0];
       var r2 = selection[s].row[1];
@@ -42735,22 +42691,15 @@ 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) {
-            deletedFormulas.push({
-              r: r,
-              c: c
-            });
-          }
+          if ((cell === null || cell === void 0 ? void 0 : cell.f) != null) ;
           if (hyperlinkMap && hyperlinkMap["".concat(r, "_").concat(c)]) {
             delete hyperlinkMap["".concat(r, "_").concat(c)];
           }
         }
       }
     }
-    if (deletedFormulas.length > 0) {
-      delFunctionGroups(ctx, deletedFormulas, ctx.currentSheetId);
-    }
   }
+  updateFunctionGroup(ctx);
   return "success";
 }
 function deleteSelectedCellText(ctx, deep) {
@@ -42780,8 +42729,6 @@ function deleteSelectedCellText(ctx, deep) {
       return "partMC";
     }
     var hyperlinkMap = ctx.luckysheetfile[getSheetIndex(ctx, ctx.currentSheetId)].hyperlink;
-    var hasChanged = false;
-    var deletedFormulas = [];
     for (var _s = 0; _s < selection.length; _s += 1) {
       var _r3 = selection[_s].row[0];
       var _r4 = selection[_s].row[1];
@@ -42791,39 +42738,27 @@ function deleteSelectedCellText(ctx, deep) {
         for (var c = _c3; c <= _c4; c += 1) {
           if (___default['default'].isPlainObject(d[r][c])) {
             var cell = d[r][c];
-            if (cell.m != null || cell.v != null || cell.f != null || cell.ct != null && cell.ct.t === "inlineStr") {
-              hasChanged = true;
-            }
             delete cell.m;
             delete cell.v;
             if (cell.f != null) {
-              deletedFormulas.push({
-                r: r,
-                c: c
-              });
               delete cell.f;
               delete cell.spl;
             }
             if (cell.ct != null && cell.ct.t === "inlineStr") {
               delete cell.ct;
             }
-          } else if (d[r][c] != null) {
+          } else {
             d[r][c] = null;
-            hasChanged = true;
           }
           if (hyperlinkMap && hyperlinkMap["".concat(r, "_").concat(c)]) {
             delete hyperlinkMap["".concat(r, "_").concat(c)];
-            hasChanged = true;
           }
         }
       }
     }
-    if (deletedFormulas.length > 0) {
-      delFunctionGroups(ctx, deletedFormulas, ctx.currentSheetId);
-    }
-    if (!hasChanged) {
-      return "noChange";
-    }
+    console.time('deleteSelectedCellText');
+    updateFunctionGroup(ctx);
+    console.timeEnd('deleteSelectedCellText');
   }
   return "success";
 }
@@ -47738,8 +47673,9 @@ function runExecFunction(ctx, range, index, data) {
     }
   }
   ctx.formulaCache.execFunctionExist.reverse();
+  console.time('execFunctionGroup');
   execFunctionGroup(ctx, null, null, null, null, data);
-  groupValuesRefresh(ctx);
+  console.timeEnd('execFunctionGroup');
   ctx.formulaCache.execFunctionGlobalData = null;
   updateFunctionGroup(ctx);
 }
@@ -47752,6 +47688,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);
   }
@@ -57399,10 +57336,7 @@ function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, hand
       if (ctx.activeImg != null) {
         removeActiveImage(ctx);
       } else {
-        if (deleteSelectedCellText(ctx) === "noChange") {
-          e.preventDefault();
-          return;
-        }
+        deleteSelectedCellText(ctx);
       }
       jfrefreshgrid(ctx, null, undefined);
       e.preventDefault();
@@ -61025,7 +60959,6 @@ exports.defaultFont = defaultFont;
 exports.defaultSettings = defaultSettings;
 exports.defaultStyle = defaultStyle;
 exports.delFunctionGroup = delFunctionGroup;
-exports.delFunctionGroups = delFunctionGroups;
 exports.deleteCellInSave = deleteCellInSave;
 exports.deleteComment = deleteComment;
 exports.deleteRowCol = deleteRowCol;

package/dist/modules/formula.d.ts

@@ -31,11 +31,6 @@ export declare function iscelldata(txt: string): boolean;
 export declare function getcellrange(ctx: Context, txt: string, formulaId?: string): any;
 export declare function getAllFunctionGroup(ctx: Context): any[];
 export declare function delFunctionGroup(ctx: Context, r: number, c: number, id?: string): void;
-export declare function delFunctionGroups(ctx: Context, cells: {
-    r: number;
-    c: number;
-    id?: string;
-}[], id?: string): void;
 export declare function insertUpdateFunctionGroup(ctx: Context, r: number, c: number, id?: string): void;
 export declare function execfunction(ctx: Context, txt: string, r: number, c: number, id?: string, isrefresh?: boolean, notInsertFunc?: boolean): any[];
 export declare function groupValuesRefresh(ctx: Context): void;

package/package.json

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