@leankylin-sheet/core 6.0.3 → 6.0.4

package/dist/index.esm.js

@@ -35581,6 +35581,7 @@ var FormulaCache = /*#__PURE__*/function () {
     this.functionlistMap = void 0;
     this.execFunctionExist = void 0;
     this.execFunctionGlobalData = void 0;
+    this._lastDataRowCache = null;
     var that = this;
     this.data_parm_index = 0;
     this.selectingRangeIndex = -1;
@@ -35614,8 +35615,13 @@ var FormulaCache = /*#__PURE__*/function () {
         startRow = 0;
       }
       if (endRow === -1) {
-        var _flowdata$length;
-        endRow = (_flowdata$length = flowdata === null || flowdata === void 0 ? void 0 : flowdata.length) !== null && _flowdata$length !== void 0 ? _flowdata$length : 0;
+        var sheetCache = that._lastDataRowCache;
+        if (sheetCache && sheetCache[id] !== undefined) {
+          endRow = sheetCache[id];
+        } else {
+          var _flowdata$length;
+          endRow = (_flowdata$length = flowdata === null || flowdata === void 0 ? void 0 : flowdata.length) !== null && _flowdata$length !== void 0 ? _flowdata$length : 0;
+        }
       }
       if (startCol === -1) {
         startCol = 0;
@@ -36594,17 +36600,31 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
   }
   formulaRunList.reverse();
   console.timeEnd('execFunctionGroup-before');
+  var lastDataRowSheets = Object.create(null);
+  for (var _i14 = 0; _i14 < formulaRunList.length; _i14++) {
+    var sheetId = formulaRunList[_i14].id;
+    if (lastDataRowSheets[sheetId] !== undefined) continue;
+    var fd = getFlowdata(ctx, sheetId);
+    var lastDataRow = 0;
+    if (fd) {
+      for (var r = fd.length - 1; r >= 0; r--) {
+        if (fd[r] && fd[r].join('')) {
+          lastDataRow = r;
+          break;
+        }
+      }
+    }
+    lastDataRowSheets[sheetId] = lastDataRow;
+  }
+  ctx.formulaCache._lastDataRowCache = lastDataRowSheets;
   console.time('formulaRunList');
   console.log('formulaRunList', formulaRunList);
-  var map = {};
-  var ssTime = +new Date();
-  for (var _i14 = 0; _i14 < formulaRunList.length; _i14 += 1) {
-    var formulaCell = formulaRunList[_i14];
+  for (var _i15 = 0; _i15 < formulaRunList.length; _i15 += 1) {
+    var formulaCell = formulaRunList[_i15];
     if (formulaCell.level === Math.max) {
       continue;
     }
     var calc_funcStr = formulaCell.calc_funcStr;
-    var sTime = +new Date();
     var v = execfunction(ctx, calc_funcStr, formulaCell.r, formulaCell.c, formulaCell.id, false, notInsertFunc);
     ctx.groupValuesRefreshData.push({
       r: formulaCell.r,
@@ -36618,12 +36638,9 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
       v: v[1],
       f: v[2]
     };
-    var eTime = +new Date();
-    map[calc_funcStr] = eTime - sTime;
   }
-  var eeTime = +new Date();
-  console.log('map', map, eeTime - ssTime);
   console.timeEnd('formulaRunList');
+  ctx.formulaCache._lastDataRowCache = null;
   ctx.formulaCache.execFunctionExist = undefined;
 }
 function findrangeindex(ctx, v, vp) {
@@ -36637,26 +36654,26 @@ function findrangeindex(ctx, v, vp) {
   var vplen = vp_a.length;
   var vlen = v_a.length;
   if (vplen === vlen) {
-    var _i15 = pfri[0];
-    var p = vp_a[_i15];
-    var n = v_a[_i15];
+    var _i16 = pfri[0];
+    var p = vp_a[_i16];
+    var n = v_a[_i16];
     if (_.isNil(p)) {
-      if (vp_a.length <= _i15) {
+      if (vp_a.length <= _i16) {
         pfri = [vp_a.length - 1, vp_a.length - 1];
-      } else if (v_a.length <= _i15) {
+      } else if (v_a.length <= _i16) {
         pfri = [v_a.length - 1, v_a.length - 1];
       }
       return pfri;
     }
     if (p.length === n.length) {
-      if (!_.isNil(vp_a[_i15 + 1]) && !_.isNil(v_a[_i15 + 1]) && vp_a[_i15 + 1].length < v_a[_i15 + 1].length) {
+      if (!_.isNil(vp_a[_i16 + 1]) && !_.isNil(v_a[_i16 + 1]) && vp_a[_i16 + 1].length < v_a[_i16 + 1].length) {
         pfri[0] += 1;
         pfri[1] = 1;
       }
       return pfri;
     }
     if (p.length > n.length) {
-      if (!_.isNil(p) && !_.isNil(v_a[_i15 + 1]) && v_a[_i15 + 1].substring(0, 1) === '"' && (p.indexOf("{") > -1 || p.indexOf("}") > -1)) {
+      if (!_.isNil(p) && !_.isNil(v_a[_i16 + 1]) && v_a[_i16 + 1].substring(0, 1) === '"' && (p.indexOf("{") > -1 || p.indexOf("}") > -1)) {
         pfri[0] += 1;
         pfri[1] = 1;
       }
@@ -36669,34 +36686,34 @@ function findrangeindex(ctx, v, vp) {
       return pfri;
     }
   } else if (vplen > vlen) {
-    var _i16 = pfri[0];
-    var _p = vp_a[_i16];
-    var _n = v_a[_i16];
+    var _i17 = pfri[0];
+    var _p = vp_a[_i17];
+    var _n = v_a[_i17];
     if (_.isNil(_n)) {
-      if (v_a[_i16 - 1].indexOf("{") > -1) {
+      if (v_a[_i17 - 1].indexOf("{") > -1) {
         pfri[0] -= 1;
-        var start = v_a[_i16 - 1].search("{");
+        var start = v_a[_i17 - 1].search("{");
         pfri[1] += start;
       } else {
         pfri[0] = 0;
         pfri[1] = 0;
       }
     } else if (_p.length === _n.length) {
-      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) === "}")) {
+      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(_p) && _p.length > 2 && _p.substring(0, 1) === '"' && _p.substring(_p.length - 1, 1) === '"') ; else if (!_.isNil(v_a[_i16]) && v_a[_i16] === '")') {
+      } else if (!_.isNil(_p) && _p.length > 2 && _p.substring(0, 1) === '"' && _p.substring(_p.length - 1, 1) === '"') ; else if (!_.isNil(v_a[_i17]) && v_a[_i17] === '")') {
         pfri[1] = 1;
-      } else if (!_.isNil(v_a[_i16]) && v_a[_i16] === '"}') {
+      } else if (!_.isNil(v_a[_i17]) && v_a[_i17] === '"}') {
         pfri[1] = 1;
-      } else if (!_.isNil(v_a[_i16]) && v_a[_i16] === "{)") {
+      } else if (!_.isNil(v_a[_i17]) && v_a[_i17] === "{)") {
         pfri[1] = 1;
       } else {
         pfri[1] = _n.length;
       }
       return pfri;
     } else if (_p.length > _n.length) {
-      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) === "}")) {
+      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;
       }
@@ -36706,17 +36723,17 @@ function findrangeindex(ctx, v, vp) {
     }
     return pfri;
   } else if (vplen < vlen) {
-    var _i17 = pfri[0];
-    var _p2 = vp_a[_i17];
-    var _n2 = v_a[_i17];
+    var _i18 = pfri[0];
+    var _p2 = vp_a[_i18];
+    var _n2 = v_a[_i18];
     if (_.isNil(_p2)) {
       pfri[0] = v_a.length - 1;
       var last = v_a[pfri[0]];
       pfri[1] = _.isNil(last) ? 1 : last.length;
     } else if (_p2.length === _n2.length) {
-      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) === "}")) {
+      if (vp_a[_i18 + 1] != null && (vp_a[_i18 + 1].substring(0, 1) === '"' || vp_a[_i18 + 1].substring(0, 1) === "{" || vp_a[_i18 + 1].substring(0, 1) === "}")) {
         pfri[1] = _n2.length;
-      } 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) === "}")) {
+      } else if (!_.isNil(v_a[_i18 + 1]) && v_a[_i18 + 1].substring(0, 1) === '"' && (v_a[_i18 + 1].substring(0, 1) === "{" || v_a[_i18 + 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) === ")") {
@@ -36726,7 +36743,7 @@ function findrangeindex(ctx, v, vp) {
       } else {
         pfri[0] = pfri[0] + vlen - vplen;
         if (v_a.length > vp_a.length) {
-          pfri[1] = v_a[_i17 + 1].length;
+          pfri[1] = v_a[_i18 + 1].length;
         } else {
           pfri[1] = 1;
         }
@@ -36735,17 +36752,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[_i17 + 1]) && /{.*?}/.test(v_a[_i17 + 1])) {
+      } else if (_.isNil(v_a[_i18 + 1]) && /{.*?}/.test(v_a[_i18 + 1])) {
         pfri[0] += 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[1] = v_a[_i18 + 1].length;
+      } else if (!_.isNil(_p2) && v_a[_i18 + 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[(_i17 || 1) - 1].length;
+        pfri[1] = v_a[(_i18 || 1) - 1].length;
       }
       return pfri;
     } else if (_p2.length < _n2.length) {
@@ -36792,9 +36809,9 @@ function locateTextOffset(node, offset) {
     text = walker.nextNode();
   }
   var acc = 0;
-  for (var _i18 = 0; _i18 < texts.length; _i18 += 1) {
+  for (var _i19 = 0; _i19 < texts.length; _i19 += 1) {
     var _item$textContent$len, _item$textContent;
-    var item = texts[_i18];
+    var item = texts[_i19];
     var len = (_item$textContent$len = (_item$textContent = item.textContent) === null || _item$textContent === void 0 ? void 0 : _item$textContent.length) !== null && _item$textContent$len !== void 0 ? _item$textContent$len : 0;
     if (offset <= acc + len) {
       return [item, Math.max(0, offset - acc)];
@@ -36880,8 +36897,8 @@ function searchFunction(ctx, searchtxt) {
   var f = [];
   var s = [];
   var t = [];
-  for (var _i19 = 0; _i19 < functionlist.length; _i19 += 1) {
-    var item = functionlist[_i19];
+  for (var _i20 = 0; _i20 < functionlist.length; _i20 += 1) {
+    var item = functionlist[_i20];
     var n = item.n;
     if (n === searchtxt) {
       f.unshift(item);
@@ -36937,8 +36954,8 @@ function helpFunctionExe($editer, currSelection, ctx) {
   var _locale2 = locale(ctx),
     functionlist = _locale2.functionlist;
   if (_.isEmpty(ctx.formulaCache.functionlistMap)) {
-    for (var _i20 = 0; _i20 < functionlist.length; _i20 += 1) {
-      ctx.formulaCache.functionlistMap[functionlist[_i20].n] = functionlist[_i20];
+    for (var _i21 = 0; _i21 < functionlist.length; _i21 += 1) {
+      ctx.formulaCache.functionlistMap[functionlist[_i21].n] = functionlist[_i21];
     }
   }
   if (!currSelection) {

package/dist/index.js

@@ -35591,6 +35591,7 @@ var FormulaCache = /*#__PURE__*/function () {
     this.functionlistMap = void 0;
     this.execFunctionExist = void 0;
     this.execFunctionGlobalData = void 0;
+    this._lastDataRowCache = null;
     var that = this;
     this.data_parm_index = 0;
     this.selectingRangeIndex = -1;
@@ -35624,8 +35625,13 @@ var FormulaCache = /*#__PURE__*/function () {
         startRow = 0;
       }
       if (endRow === -1) {
-        var _flowdata$length;
-        endRow = (_flowdata$length = flowdata === null || flowdata === void 0 ? void 0 : flowdata.length) !== null && _flowdata$length !== void 0 ? _flowdata$length : 0;
+        var sheetCache = that._lastDataRowCache;
+        if (sheetCache && sheetCache[id] !== undefined) {
+          endRow = sheetCache[id];
+        } else {
+          var _flowdata$length;
+          endRow = (_flowdata$length = flowdata === null || flowdata === void 0 ? void 0 : flowdata.length) !== null && _flowdata$length !== void 0 ? _flowdata$length : 0;
+        }
       }
       if (startCol === -1) {
         startCol = 0;
@@ -36604,17 +36610,31 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
   }
   formulaRunList.reverse();
   console.timeEnd('execFunctionGroup-before');
+  var lastDataRowSheets = Object.create(null);
+  for (var _i14 = 0; _i14 < formulaRunList.length; _i14++) {
+    var sheetId = formulaRunList[_i14].id;
+    if (lastDataRowSheets[sheetId] !== undefined) continue;
+    var fd = getFlowdata(ctx, sheetId);
+    var lastDataRow = 0;
+    if (fd) {
+      for (var r = fd.length - 1; r >= 0; r--) {
+        if (fd[r] && fd[r].join('')) {
+          lastDataRow = r;
+          break;
+        }
+      }
+    }
+    lastDataRowSheets[sheetId] = lastDataRow;
+  }
+  ctx.formulaCache._lastDataRowCache = lastDataRowSheets;
   console.time('formulaRunList');
   console.log('formulaRunList', formulaRunList);
-  var map = {};
-  var ssTime = +new Date();
-  for (var _i14 = 0; _i14 < formulaRunList.length; _i14 += 1) {
-    var formulaCell = formulaRunList[_i14];
+  for (var _i15 = 0; _i15 < formulaRunList.length; _i15 += 1) {
+    var formulaCell = formulaRunList[_i15];
     if (formulaCell.level === Math.max) {
       continue;
     }
     var calc_funcStr = formulaCell.calc_funcStr;
-    var sTime = +new Date();
     var v = execfunction(ctx, calc_funcStr, formulaCell.r, formulaCell.c, formulaCell.id, false, notInsertFunc);
     ctx.groupValuesRefreshData.push({
       r: formulaCell.r,
@@ -36628,12 +36648,9 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
       v: v[1],
       f: v[2]
     };
-    var eTime = +new Date();
-    map[calc_funcStr] = eTime - sTime;
   }
-  var eeTime = +new Date();
-  console.log('map', map, eeTime - ssTime);
   console.timeEnd('formulaRunList');
+  ctx.formulaCache._lastDataRowCache = null;
   ctx.formulaCache.execFunctionExist = undefined;
 }
 function findrangeindex(ctx, v, vp) {
@@ -36647,26 +36664,26 @@ function findrangeindex(ctx, v, vp) {
   var vplen = vp_a.length;
   var vlen = v_a.length;
   if (vplen === vlen) {
-    var _i15 = pfri[0];
-    var p = vp_a[_i15];
-    var n = v_a[_i15];
+    var _i16 = pfri[0];
+    var p = vp_a[_i16];
+    var n = v_a[_i16];
     if (___default['default'].isNil(p)) {
-      if (vp_a.length <= _i15) {
+      if (vp_a.length <= _i16) {
         pfri = [vp_a.length - 1, vp_a.length - 1];
-      } else if (v_a.length <= _i15) {
+      } else if (v_a.length <= _i16) {
         pfri = [v_a.length - 1, v_a.length - 1];
       }
       return pfri;
     }
     if (p.length === n.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) {
+      if (!___default['default'].isNil(vp_a[_i16 + 1]) && !___default['default'].isNil(v_a[_i16 + 1]) && vp_a[_i16 + 1].length < v_a[_i16 + 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[_i15 + 1]) && v_a[_i15 + 1].substring(0, 1) === '"' && (p.indexOf("{") > -1 || p.indexOf("}") > -1)) {
+      if (!___default['default'].isNil(p) && !___default['default'].isNil(v_a[_i16 + 1]) && v_a[_i16 + 1].substring(0, 1) === '"' && (p.indexOf("{") > -1 || p.indexOf("}") > -1)) {
         pfri[0] += 1;
         pfri[1] = 1;
       }
@@ -36679,34 +36696,34 @@ function findrangeindex(ctx, v, vp) {
       return pfri;
     }
   } else if (vplen > vlen) {
-    var _i16 = pfri[0];
-    var _p = vp_a[_i16];
-    var _n = v_a[_i16];
+    var _i17 = pfri[0];
+    var _p = vp_a[_i17];
+    var _n = v_a[_i17];
     if (___default['default'].isNil(_n)) {
-      if (v_a[_i16 - 1].indexOf("{") > -1) {
+      if (v_a[_i17 - 1].indexOf("{") > -1) {
         pfri[0] -= 1;
-        var start = v_a[_i16 - 1].search("{");
+        var start = v_a[_i17 - 1].search("{");
         pfri[1] += start;
       } else {
         pfri[0] = 0;
         pfri[1] = 0;
       }
     } else if (_p.length === _n.length) {
-      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) === "}")) {
+      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(_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] === '")') {
+      } 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[_i17]) && v_a[_i17] === '")') {
         pfri[1] = 1;
-      } else if (!___default['default'].isNil(v_a[_i16]) && v_a[_i16] === '"}') {
+      } else if (!___default['default'].isNil(v_a[_i17]) && v_a[_i17] === '"}') {
         pfri[1] = 1;
-      } else if (!___default['default'].isNil(v_a[_i16]) && v_a[_i16] === "{)") {
+      } else if (!___default['default'].isNil(v_a[_i17]) && v_a[_i17] === "{)") {
         pfri[1] = 1;
       } else {
         pfri[1] = _n.length;
       }
       return pfri;
     } else if (_p.length > _n.length) {
-      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) === "}")) {
+      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;
       }
@@ -36716,17 +36733,17 @@ function findrangeindex(ctx, v, vp) {
     }
     return pfri;
   } else if (vplen < vlen) {
-    var _i17 = pfri[0];
-    var _p2 = vp_a[_i17];
-    var _n2 = v_a[_i17];
+    var _i18 = pfri[0];
+    var _p2 = vp_a[_i18];
+    var _n2 = v_a[_i18];
     if (___default['default'].isNil(_p2)) {
       pfri[0] = v_a.length - 1;
       var last = v_a[pfri[0]];
       pfri[1] = ___default['default'].isNil(last) ? 1 : last.length;
     } else if (_p2.length === _n2.length) {
-      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) === "}")) {
+      if (vp_a[_i18 + 1] != null && (vp_a[_i18 + 1].substring(0, 1) === '"' || vp_a[_i18 + 1].substring(0, 1) === "{" || vp_a[_i18 + 1].substring(0, 1) === "}")) {
         pfri[1] = _n2.length;
-      } 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) === "}")) {
+      } else if (!___default['default'].isNil(v_a[_i18 + 1]) && v_a[_i18 + 1].substring(0, 1) === '"' && (v_a[_i18 + 1].substring(0, 1) === "{" || v_a[_i18 + 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) === ")") {
@@ -36736,7 +36753,7 @@ function findrangeindex(ctx, v, vp) {
       } else {
         pfri[0] = pfri[0] + vlen - vplen;
         if (v_a.length > vp_a.length) {
-          pfri[1] = v_a[_i17 + 1].length;
+          pfri[1] = v_a[_i18 + 1].length;
         } else {
           pfri[1] = 1;
         }
@@ -36745,17 +36762,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[_i17 + 1]) && /{.*?}/.test(v_a[_i17 + 1])) {
+      } else if (___default['default'].isNil(v_a[_i18 + 1]) && /{.*?}/.test(v_a[_i18 + 1])) {
         pfri[0] += 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[1] = v_a[_i18 + 1].length;
+      } else if (!___default['default'].isNil(_p2) && v_a[_i18 + 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[(_i17 || 1) - 1].length;
+        pfri[1] = v_a[(_i18 || 1) - 1].length;
       }
       return pfri;
     } else if (_p2.length < _n2.length) {
@@ -36802,9 +36819,9 @@ function locateTextOffset(node, offset) {
     text = walker.nextNode();
   }
   var acc = 0;
-  for (var _i18 = 0; _i18 < texts.length; _i18 += 1) {
+  for (var _i19 = 0; _i19 < texts.length; _i19 += 1) {
     var _item$textContent$len, _item$textContent;
-    var item = texts[_i18];
+    var item = texts[_i19];
     var len = (_item$textContent$len = (_item$textContent = item.textContent) === null || _item$textContent === void 0 ? void 0 : _item$textContent.length) !== null && _item$textContent$len !== void 0 ? _item$textContent$len : 0;
     if (offset <= acc + len) {
       return [item, Math.max(0, offset - acc)];
@@ -36890,8 +36907,8 @@ function searchFunction(ctx, searchtxt) {
   var f = [];
   var s = [];
   var t = [];
-  for (var _i19 = 0; _i19 < functionlist.length; _i19 += 1) {
-    var item = functionlist[_i19];
+  for (var _i20 = 0; _i20 < functionlist.length; _i20 += 1) {
+    var item = functionlist[_i20];
     var n = item.n;
     if (n === searchtxt) {
       f.unshift(item);
@@ -36947,8 +36964,8 @@ function helpFunctionExe($editer, currSelection, ctx) {
   var _locale2 = locale(ctx),
     functionlist = _locale2.functionlist;
   if (___default['default'].isEmpty(ctx.formulaCache.functionlistMap)) {
-    for (var _i20 = 0; _i20 < functionlist.length; _i20 += 1) {
-      ctx.formulaCache.functionlistMap[functionlist[_i20].n] = functionlist[_i20];
+    for (var _i21 = 0; _i21 < functionlist.length; _i21 += 1) {
+      ctx.formulaCache.functionlistMap[functionlist[_i21].n] = functionlist[_i21];
     }
   }
   if (!currSelection) {

package/dist/modules/formula.d.ts

@@ -24,6 +24,7 @@ export declare class FormulaCache {
     functionlistMap: any;
     execFunctionExist?: any[];
     execFunctionGlobalData: any;
+    _lastDataRowCache: Record<string, number> | null;
     constructor();
     tryGetCellAsNumber(cell: Cell): string | number | boolean | null;
 }

package/package.json

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