@leankylin-sheet/core 7.0.39 → 7.0.41

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.js CHANGED
@@ -36946,6 +36946,8 @@ var FormulaCache = /*#__PURE__*/function () {
36946
36946
  this.execFunctionExist = void 0;
36947
36947
  this.execFunctionGlobalData = void 0;
36948
36948
  this._lastDataRowCache = null;
36949
+ this.formulaParseCache = null;
36950
+ this.formulaParseCacheSignature = null;
36949
36951
  var that = this;
36950
36952
  this.data_parm_index = 0;
36951
36953
  this.selectingRangeIndex = -1;
@@ -37452,9 +37454,11 @@ function getAllFunctionGroup(ctx) {
37452
37454
  if (___default['default'].isNil(dynamicArray_compute)) {
37453
37455
  dynamicArray_compute = [];
37454
37456
  }
37455
- ret = ret.concat(calcChain);
37457
+ for (var k = 0; k < calcChain.length; k += 1) {
37458
+ ret.push(calcChain[k]);
37459
+ }
37456
37460
  for (var j = 0; j < dynamicArray_compute.length; j += 1) {
37457
- var d = dynamicArray_compute[0];
37461
+ var d = dynamicArray_compute[j];
37458
37462
  ret.push({
37459
37463
  r: d.r,
37460
37464
  c: d.c,
@@ -37471,33 +37475,23 @@ function delFunctionGroup(ctx, r, c, id) {
37471
37475
  var file = ctx.luckysheetfile[getSheetIndex(ctx, id)];
37472
37476
  var calcChain = file.calcChain;
37473
37477
  if (!___default['default'].isNil(calcChain)) {
37474
- var modified = false;
37475
- var calcChainClone = ___default['default'].cloneDeep(calcChain);
37476
- for (var _i4 = 0; _i4 < calcChainClone.length; _i4 += 1) {
37477
- var calc = calcChainClone[_i4];
37478
- if (calc.r === r && calc.c === c && calc.id === id) {
37479
- calcChainClone.splice(_i4, 1);
37480
- modified = true;
37481
- break;
37482
- }
37483
- }
37484
- if (modified) {
37478
+ var pos = calcChain.findIndex(function (calc) {
37479
+ return calc.r === r && calc.c === c && calc.id === id;
37480
+ });
37481
+ if (pos > -1) {
37482
+ var calcChainClone = calcChain.slice();
37483
+ calcChainClone.splice(pos, 1);
37485
37484
  file.calcChain = calcChainClone;
37486
37485
  }
37487
37486
  }
37488
37487
  var dynamicArray = file.dynamicArray;
37489
37488
  if (!___default['default'].isNil(dynamicArray)) {
37490
- var _modified = false;
37491
- var dynamicArrayClone = ___default['default'].cloneDeep(dynamicArray);
37492
- for (var _i5 = 0; _i5 < dynamicArrayClone.length; _i5 += 1) {
37493
- var _calc = dynamicArrayClone[_i5];
37494
- if (_calc.r === r && _calc.c === c && (___default['default'].isNil(_calc.id) || _calc.id === id)) {
37495
- dynamicArrayClone.splice(_i5, 1);
37496
- _modified = true;
37497
- break;
37498
- }
37499
- }
37500
- if (_modified) {
37489
+ var _pos = dynamicArray.findIndex(function (calc) {
37490
+ return calc.r === r && calc.c === c && (___default['default'].isNil(calc.id) || calc.id === id);
37491
+ });
37492
+ if (_pos > -1) {
37493
+ var dynamicArrayClone = dynamicArray.slice();
37494
+ dynamicArrayClone.splice(_pos, 1);
37501
37495
  file.dynamicArray = dynamicArrayClone;
37502
37496
  }
37503
37497
  }
@@ -37518,16 +37512,16 @@ function checkBracketNum(fp) {
37518
37512
  var bra_tl_len = 0;
37519
37513
  var bra_tr_len = 0;
37520
37514
  if (!___default['default'].isNil(bra_tl_txt)) {
37521
- for (var _i6 = 0; _i6 < bra_tl_txt.length; _i6 += 1) {
37522
- var bra_tl = bra_tl_txt[_i6].match(/\(/g);
37515
+ for (var _i4 = 0; _i4 < bra_tl_txt.length; _i4 += 1) {
37516
+ var bra_tl = bra_tl_txt[_i4].match(/\(/g);
37523
37517
  if (!___default['default'].isNil(bra_tl)) {
37524
37518
  bra_tl_len += bra_tl.length;
37525
37519
  }
37526
37520
  }
37527
37521
  }
37528
37522
  if (!___default['default'].isNil(bra_tr_txt)) {
37529
- for (var _i7 = 0; _i7 < bra_tr_txt.length; _i7 += 1) {
37530
- var bra_tr = bra_tr_txt[_i7].match(/\)/g);
37523
+ for (var _i5 = 0; _i5 < bra_tr_txt.length; _i5 += 1) {
37524
+ var bra_tr = bra_tr_txt[_i5].match(/\)/g);
37531
37525
  if (!___default['default'].isNil(bra_tr)) {
37532
37526
  bra_tr_len += bra_tr.length;
37533
37527
  }
@@ -37554,8 +37548,8 @@ function insertUpdateFunctionGroup(ctx, r, c, id) {
37554
37548
  if (___default['default'].isNil(calcChain)) {
37555
37549
  calcChain = [];
37556
37550
  }
37557
- for (var _i8 = 0; _i8 < calcChain.length; _i8 += 1) {
37558
- var calc = calcChain[_i8];
37551
+ for (var _i6 = 0; _i6 < calcChain.length; _i6 += 1) {
37552
+ var calc = calcChain[_i6];
37559
37553
  if (calc.r === r && calc.c === c && calc.id === id) {
37560
37554
  return;
37561
37555
  }
@@ -37626,8 +37620,8 @@ function insertUpdateDynamicArray(ctx, dynamicArrayItem) {
37626
37620
  if (___default['default'].isNil(dynamicArray)) {
37627
37621
  dynamicArray = [];
37628
37622
  }
37629
- for (var _i9 = 0; _i9 < dynamicArray.length; _i9 += 1) {
37630
- var calc = dynamicArray[_i9];
37623
+ for (var _i7 = 0; _i7 < dynamicArray.length; _i7 += 1) {
37624
+ var calc = dynamicArray[_i7];
37631
37625
  if (calc.r === r && calc.c === c && calc.id === id) {
37632
37626
  calc.data = dynamicArrayItem.data;
37633
37627
  calc.f = dynamicArrayItem.f;
@@ -37640,9 +37634,16 @@ function insertUpdateDynamicArray(ctx, dynamicArrayItem) {
37640
37634
  function groupValuesRefresh(ctx) {
37641
37635
  var luckysheetfile = ctx.luckysheetfile;
37642
37636
  if (ctx.groupValuesRefreshData.length > 0) {
37643
- for (var _i10 = 0; _i10 < ctx.groupValuesRefreshData.length; _i10 += 1) {
37644
- var item = ctx.groupValuesRefreshData[_i10];
37645
- var idx = getSheetIndex(ctx, item.id);
37637
+ var indexById = Object.create(null);
37638
+ for (var _i8 = 0; _i8 < ctx.groupValuesRefreshData.length; _i8 += 1) {
37639
+ var item = ctx.groupValuesRefreshData[_i8];
37640
+ var idx = void 0;
37641
+ if (item.id in indexById) {
37642
+ idx = indexById[item.id];
37643
+ } else {
37644
+ idx = getSheetIndex(ctx, item.id);
37645
+ indexById[item.id] = idx;
37646
+ }
37646
37647
  if (idx == null) continue;
37647
37648
  var file = luckysheetfile[idx];
37648
37649
  var data = file.data;
@@ -37664,6 +37665,118 @@ function groupValuesRefresh(ctx) {
37664
37665
  ctx.groupValuesRefreshData = [];
37665
37666
  }
37666
37667
  }
37668
+ function getStructureSignature(ctx) {
37669
+ var _ctx$active_f2;
37670
+ var signature = ((_ctx$active_f2 = ctx.active_f) === null || _ctx$active_f2 === void 0 ? void 0 : _ctx$active_f2.sheetId) ? "f:".concat(ctx.active_f.sheetId) : "";
37671
+ var luckysheetfile = ctx.luckysheetfile;
37672
+ for (var _i9 = 0; _i9 < luckysheetfile.length; _i9 += 1) {
37673
+ var _data$length, _data$0$length, _data$;
37674
+ var _luckysheetfile$_i = luckysheetfile[_i9],
37675
+ id = _luckysheetfile$_i.id,
37676
+ name = _luckysheetfile$_i.name,
37677
+ data = _luckysheetfile$_i.data;
37678
+ signature += ";".concat(id, "|").concat(name, "|").concat((_data$length = data === null || data === void 0 ? void 0 : data.length) !== null && _data$length !== void 0 ? _data$length : 0, "|").concat((_data$0$length = data === null || data === void 0 ? void 0 : (_data$ = data[0]) === null || _data$ === void 0 ? void 0 : _data$.length) !== null && _data$0$length !== void 0 ? _data$0$length : 0);
37679
+ }
37680
+ return signature;
37681
+ }
37682
+ function ensureFormulaParseCache(ctx) {
37683
+ var signature = getStructureSignature(ctx);
37684
+ if (ctx.formulaCache.formulaParseCacheSignature !== signature || ___default['default'].isNil(ctx.formulaCache.formulaParseCache)) {
37685
+ ctx.formulaCache.formulaParseCacheSignature = signature;
37686
+ ctx.formulaCache.formulaParseCache = Object.create(null);
37687
+ }
37688
+ return ctx.formulaCache.formulaParseCache;
37689
+ }
37690
+ function getSheetParseCache(cache, sheetId) {
37691
+ var sheetCache = cache[sheetId];
37692
+ if (___default['default'].isNil(sheetCache)) {
37693
+ sheetCache = Object.create(null);
37694
+ cache[sheetId] = sheetCache;
37695
+ }
37696
+ return sheetCache;
37697
+ }
37698
+ function parseFormulaRanges(ctx, calc_funcStr, fId) {
37699
+ var formulaArray = [];
37700
+ var txt1 = calc_funcStr.toUpperCase();
37701
+ var isOffsetFunc = txt1.indexOf("INDIRECT(") > -1 || txt1.indexOf("OFFSET(") > -1 || txt1.indexOf("INDEX(") > -1;
37702
+ if (isOffsetFunc) {
37703
+ isFunctionRange(ctx, calc_funcStr, null, null, fId, null, function (str_nb) {
37704
+ var range = getcellrange(ctx, ___default['default'].trim(str_nb), fId);
37705
+ if (!___default['default'].isNil(range)) {
37706
+ formulaArray.push(range);
37707
+ }
37708
+ });
37709
+ } else if (!(calc_funcStr.substring(0, 2) === '="' && calc_funcStr.substring(calc_funcStr.length - 1, 1) === '"')) {
37710
+ var point = 0;
37711
+ var squote = -1;
37712
+ var dquote = -1;
37713
+ var formulaTextArray = [];
37714
+ var sq_end_array = [];
37715
+ var calc_funcStr_length = calc_funcStr.length;
37716
+ for (var j = 0; j < calc_funcStr_length; j += 1) {
37717
+ var char = calc_funcStr.charAt(j);
37718
+ if (char === "'" && dquote === -1) {
37719
+ if (squote === -1) {
37720
+ if (point !== j) {
37721
+ formulaTextArray.push.apply(formulaTextArray, _toConsumableArray(calc_funcStr.substring(point, j).split(/==|!=|<>|<=|>=|[,()=+-/*%&^><]/)));
37722
+ }
37723
+ squote = j;
37724
+ point = j;
37725
+ } else {
37726
+ if (j < calc_funcStr_length - 1 && calc_funcStr.charAt(j + 1) === "'") {
37727
+ j += 1;
37728
+ } else {
37729
+ point = j + 1;
37730
+ formulaTextArray.push(calc_funcStr.substring(squote, point));
37731
+ sq_end_array.push(formulaTextArray.length - 1);
37732
+ squote = -1;
37733
+ }
37734
+ }
37735
+ }
37736
+ if (char === '"' && squote === -1) {
37737
+ if (dquote === -1) {
37738
+ if (point !== j) {
37739
+ formulaTextArray.push.apply(formulaTextArray, _toConsumableArray(calc_funcStr.substring(point, j).split(/==|!=|<>|<=|>=|[,()=+-/*%&^><]/)));
37740
+ }
37741
+ dquote = j;
37742
+ point = j;
37743
+ } else {
37744
+ if (j < calc_funcStr_length - 1 && calc_funcStr.charAt(j + 1) === '"') {
37745
+ j += 1;
37746
+ } else {
37747
+ point = j + 1;
37748
+ formulaTextArray.push(calc_funcStr.substring(dquote, point));
37749
+ dquote = -1;
37750
+ }
37751
+ }
37752
+ }
37753
+ }
37754
+ if (point !== calc_funcStr_length) {
37755
+ formulaTextArray.push.apply(formulaTextArray, _toConsumableArray(calc_funcStr.substring(point, calc_funcStr_length).split(/==|!=|<>|<=|>=|[,()=+-/*%&^><]/)));
37756
+ }
37757
+ for (var _j = sq_end_array.length - 1; _j >= 0; _j -= 1) {
37758
+ if (sq_end_array[_j] !== formulaTextArray.length - 1) {
37759
+ formulaTextArray[sq_end_array[_j]] += formulaTextArray[sq_end_array[_j] + 1];
37760
+ formulaTextArray.splice(sq_end_array[_j] + 1, 1);
37761
+ }
37762
+ }
37763
+ for (var _j2 = 0; _j2 < formulaTextArray.length; _j2 += 1) {
37764
+ var t = ___default['default'].trim(formulaTextArray[_j2]);
37765
+ if (t.length <= 1) {
37766
+ continue;
37767
+ }
37768
+ if (t.substring(0, 1) === '"' && t.substring(t.length - 1, 1) === '"' || !iscelldata(t)) {
37769
+ continue;
37770
+ }
37771
+ var range = getcellrange(ctx, t, fId);
37772
+ if (___default['default'].isNil(range)) {
37773
+ continue;
37774
+ }
37775
+ formulaArray.push(range);
37776
+ }
37777
+ }
37778
+ return formulaArray;
37779
+ }
37667
37780
  function execFunctionGroup(ctx, origin_r, origin_c, value, id, data, isForce, notInsertFunc, originFormula) {
37668
37781
  console.time('execFunctionGroup-1');
37669
37782
  isForce = !___default['default'].isNil(isForce) ? isForce : false;
@@ -37689,8 +37802,8 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data, isForce, no
37689
37802
  var formulaObjects = {};
37690
37803
  var sheets = ctx.luckysheetfile;
37691
37804
  var sheetData = {};
37692
- for (var _i11 = 0; _i11 < sheets.length; _i11 += 1) {
37693
- var sheet = sheets[_i11];
37805
+ for (var _i10 = 0; _i10 < sheets.length; _i10 += 1) {
37806
+ var sheet = sheets[_i10];
37694
37807
  sheetData[sheet.id] = sheet.data;
37695
37808
  }
37696
37809
  var updateValueOjects = {};
@@ -37741,119 +37854,57 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data, isForce, no
37741
37854
  }
37742
37855
  }
37743
37856
  };
37744
- var _loop = function _loop() {
37745
- var formulaCell = calcChains[_i12];
37746
- var fR = formulaCell.r;
37747
- var fC = formulaCell.c;
37748
- var fId = formulaCell.id;
37749
- var key = "r".concat(fR, "c").concat(fC, "i").concat(fId);
37750
- var calc_funcStr = getcellFormula(ctx, fR, fC, fId);
37751
- var isOriginCell = !___default['default'].isNil(origin_r) && !___default['default'].isNil(origin_c) && fR === origin_r && fC === origin_c && fId === id;
37752
- if (isOriginCell && !___default['default'].isNil(originFormula)) {
37753
- if (originFormula === "") {
37754
- return 0; // continue
37755
- }
37756
- calc_funcStr = originFormula;
37857
+ var parseCache = ensureFormulaParseCache(ctx);
37858
+ for (var _i11 = 0; _i11 < calcChains.length; _i11 += 1) {
37859
+ var formulaCell = calcChains[_i11];
37860
+ var fR = formulaCell.r;
37861
+ var fC = formulaCell.c;
37862
+ var fId = formulaCell.id;
37863
+ var _key4 = "r".concat(fR, "c").concat(fC, "i").concat(fId);
37864
+ var sheetId = ___default['default'].isNil(fId) ? ctx.currentSheetId : fId;
37865
+ var sheetParseCache = getSheetParseCache(parseCache, sheetId);
37866
+ var posKey = "".concat(fR, "_").concat(fC);
37867
+ var isOriginCell = !___default['default'].isNil(origin_r) && !___default['default'].isNil(origin_c) && fR === origin_r && fC === origin_c && fId === id;
37868
+ var calc_funcStr = null;
37869
+ if (isOriginCell && !___default['default'].isNil(originFormula)) {
37870
+ if (originFormula === "") {
37871
+ delete sheetParseCache[posKey];
37872
+ continue;
37757
37873
  }
37874
+ calc_funcStr = originFormula;
37875
+ } else {
37876
+ var _sheetData$sheetId, _originCell$f;
37877
+ var rowData = (_sheetData$sheetId = sheetData[sheetId]) === null || _sheetData$sheetId === void 0 ? void 0 : _sheetData$sheetId[fR];
37878
+ var originCell = ___default['default'].isNil(rowData) ? null : rowData[fC];
37879
+ calc_funcStr = ___default['default'].isNil(originCell) ? null : (_originCell$f = originCell.f) !== null && _originCell$f !== void 0 ? _originCell$f : null;
37758
37880
  if (___default['default'].isNil(calc_funcStr)) {
37759
- return 0; // continue
37760
- }
37761
- var txt1 = calc_funcStr.toUpperCase();
37762
- var isOffsetFunc = txt1.indexOf("INDIRECT(") > -1 || txt1.indexOf("OFFSET(") > -1 || txt1.indexOf("INDEX(") > -1;
37763
- var formulaArray = [];
37764
- if (isOffsetFunc) {
37765
- isFunctionRange(ctx, calc_funcStr, null, null, fId, null, function (str_nb) {
37766
- var range = getcellrange(ctx, ___default['default'].trim(str_nb), fId);
37767
- if (!___default['default'].isNil(range)) {
37768
- formulaArray.push(range);
37769
- }
37770
- });
37771
- } else if (!(calc_funcStr.substring(0, 2) === '="' && calc_funcStr.substring(calc_funcStr.length - 1, 1) === '"')) {
37772
- var point = 0;
37773
- var squote = -1;
37774
- var dquote = -1;
37775
- var formulaTextArray = [];
37776
- var sq_end_array = [];
37777
- var calc_funcStr_length = calc_funcStr.length;
37778
- for (var j = 0; j < calc_funcStr_length; j += 1) {
37779
- var char = calc_funcStr.charAt(j);
37780
- if (char === "'" && dquote === -1) {
37781
- if (squote === -1) {
37782
- if (point !== j) {
37783
- formulaTextArray.push.apply(formulaTextArray, _toConsumableArray(calc_funcStr.substring(point, j).split(/==|!=|<>|<=|>=|[,()=+-/*%&^><]/)));
37784
- }
37785
- squote = j;
37786
- point = j;
37787
- } else {
37788
- if (j < calc_funcStr_length - 1 && calc_funcStr.charAt(j + 1) === "'") {
37789
- j += 1;
37790
- } else {
37791
- point = j + 1;
37792
- formulaTextArray.push(calc_funcStr.substring(squote, point));
37793
- sq_end_array.push(formulaTextArray.length - 1);
37794
- squote = -1;
37795
- }
37796
- }
37797
- }
37798
- if (char === '"' && squote === -1) {
37799
- if (dquote === -1) {
37800
- if (point !== j) {
37801
- formulaTextArray.push.apply(formulaTextArray, _toConsumableArray(calc_funcStr.substring(point, j).split(/==|!=|<>|<=|>=|[,()=+-/*%&^><]/)));
37802
- }
37803
- dquote = j;
37804
- point = j;
37805
- } else {
37806
- if (j < calc_funcStr_length - 1 && calc_funcStr.charAt(j + 1) === '"') {
37807
- j += 1;
37808
- } else {
37809
- point = j + 1;
37810
- formulaTextArray.push(calc_funcStr.substring(dquote, point));
37811
- dquote = -1;
37812
- }
37813
- }
37814
- }
37815
- }
37816
- if (point !== calc_funcStr_length) {
37817
- formulaTextArray.push.apply(formulaTextArray, _toConsumableArray(calc_funcStr.substring(point, calc_funcStr_length).split(/==|!=|<>|<=|>=|[,()=+-/*%&^><]/)));
37818
- }
37819
- for (var _j = sq_end_array.length - 1; _j >= 0; _j -= 1) {
37820
- if (sq_end_array[_j] !== formulaTextArray.length - 1) {
37821
- formulaTextArray[sq_end_array[_j]] += formulaTextArray[sq_end_array[_j] + 1];
37822
- formulaTextArray.splice(sq_end_array[_j] + 1, 1);
37823
- }
37824
- }
37825
- for (var _j2 = 0; _j2 < formulaTextArray.length; _j2 += 1) {
37826
- var t = ___default['default'].trim(formulaTextArray[_j2]);
37827
- if (t.length <= 1) {
37828
- continue;
37829
- }
37830
- if (t.substring(0, 1) === '"' && t.substring(t.length - 1, 1) === '"' || !iscelldata(t)) {
37831
- continue;
37832
- }
37833
- var range = getcellrange(ctx, t, fId);
37834
- if (___default['default'].isNil(range)) {
37835
- continue;
37836
- }
37837
- formulaArray.push(range);
37838
- }
37881
+ delete sheetParseCache[posKey];
37882
+ continue;
37839
37883
  }
37840
- var item = {
37841
- formulaArray: formulaArray,
37842
- calc_funcStr: calc_funcStr,
37843
- key: key,
37844
- r: fR,
37845
- c: fC,
37846
- id: fId,
37847
- parents: {},
37848
- chidren: {},
37849
- color: "w"
37884
+ }
37885
+ var formulaArray = void 0;
37886
+ var cachedEntry = sheetParseCache[posKey];
37887
+ if (!___default['default'].isNil(cachedEntry) && cachedEntry.f === calc_funcStr) {
37888
+ formulaArray = cachedEntry.ranges;
37889
+ } else {
37890
+ formulaArray = parseFormulaRanges(ctx, calc_funcStr, fId);
37891
+ sheetParseCache[posKey] = {
37892
+ f: calc_funcStr,
37893
+ ranges: formulaArray
37850
37894
  };
37851
- formulaObjects[key] = item;
37852
- },
37853
- _ret;
37854
- for (var _i12 = 0; _i12 < calcChains.length; _i12 += 1) {
37855
- _ret = _loop();
37856
- if (_ret === 0) continue;
37895
+ }
37896
+ var item = {
37897
+ formulaArray: formulaArray,
37898
+ calc_funcStr: calc_funcStr,
37899
+ key: _key4,
37900
+ r: fR,
37901
+ c: fC,
37902
+ id: fId,
37903
+ parents: {},
37904
+ chidren: {},
37905
+ color: "w"
37906
+ };
37907
+ formulaObjects[_key4] = item;
37857
37908
  }
37858
37909
  Object.keys(formulaObjects).forEach(function (key) {
37859
37910
  var formulaObject = formulaObjects[key];
@@ -37882,8 +37933,8 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data, isForce, no
37882
37933
  var node = formulaObjects[nodeKey];
37883
37934
  if (node) {
37884
37935
  var children = Object.keys(node.chidren);
37885
- for (var _i13 = 0; _i13 < children.length; _i13 += 1) {
37886
- var childKey = children[_i13];
37936
+ for (var _i12 = 0; _i12 < children.length; _i12 += 1) {
37937
+ var childKey = children[_i12];
37887
37938
  if (inStack[childKey]) {
37888
37939
  var cycleStart = dfsPath.indexOf(childKey);
37889
37940
  if (cycleStart > -1) {
@@ -37907,7 +37958,7 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data, isForce, no
37907
37958
  var formulaRunList = [];
37908
37959
  var stack = updateValueArray;
37909
37960
  var existsFormulaRunList = {};
37910
- var _loop2 = function _loop2() {
37961
+ var _loop = function _loop() {
37911
37962
  var formulaObject = stack.pop();
37912
37963
  if (___default['default'].isNil(formulaObject) || formulaObject.key in existsFormulaRunList) {
37913
37964
  return 0; // continue
@@ -37933,10 +37984,10 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data, isForce, no
37933
37984
  stack = stack.concat(cacheStack);
37934
37985
  }
37935
37986
  },
37936
- _ret2;
37987
+ _ret;
37937
37988
  while (stack.length > 0) {
37938
- _ret2 = _loop2();
37939
- if (_ret2 === 0) continue;
37989
+ _ret = _loop();
37990
+ if (_ret === 0) continue;
37940
37991
  }
37941
37992
  formulaRunList.reverse();
37942
37993
  var formulaRunListKeys = {};
@@ -37983,10 +38034,10 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data, isForce, no
37983
38034
  });
37984
38035
  }
37985
38036
  var lastDataRowSheets = Object.create(null);
37986
- for (var _i14 = 0; _i14 < formulaRunList.length; _i14++) {
37987
- var sheetId = formulaRunList[_i14].id;
37988
- if (lastDataRowSheets[sheetId] !== undefined) continue;
37989
- var fd = getFlowdata(ctx, sheetId);
38037
+ for (var _i13 = 0; _i13 < formulaRunList.length; _i13++) {
38038
+ var _sheetId = formulaRunList[_i13].id;
38039
+ if (lastDataRowSheets[_sheetId] !== undefined) continue;
38040
+ var fd = getFlowdata(ctx, _sheetId);
37990
38041
  var lastDataRow = 0;
37991
38042
  if (fd) {
37992
38043
  for (var r = fd.length - 1; r >= 0; r--) {
@@ -37996,27 +38047,27 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data, isForce, no
37996
38047
  }
37997
38048
  }
37998
38049
  }
37999
- lastDataRowSheets[sheetId] = lastDataRow;
38050
+ lastDataRowSheets[_sheetId] = lastDataRow;
38000
38051
  }
38001
38052
  ctx.formulaCache._lastDataRowCache = lastDataRowSheets;
38002
38053
  console.time('execFunctionGroup-formulaRunList');
38003
38054
  console.log('formulaRunList', formulaRunList);
38004
- for (var _i15 = 0; _i15 < formulaRunList.length; _i15 += 1) {
38005
- var formulaCell = formulaRunList[_i15];
38006
- if (formulaCell.level === Math.max) {
38055
+ for (var _i14 = 0; _i14 < formulaRunList.length; _i14 += 1) {
38056
+ var _formulaCell = formulaRunList[_i14];
38057
+ if (_formulaCell.level === Math.max) {
38007
38058
  continue;
38008
38059
  }
38009
- var calc_funcStr = formulaCell.calc_funcStr;
38010
- var v = execfunction(ctx, calc_funcStr, formulaCell.r, formulaCell.c, formulaCell.id, false, notInsertFunc);
38060
+ var _calc_funcStr = _formulaCell.calc_funcStr;
38061
+ var v = execfunction(ctx, _calc_funcStr, _formulaCell.r, _formulaCell.c, _formulaCell.id, false, notInsertFunc);
38011
38062
  ctx.groupValuesRefreshData.push({
38012
- r: formulaCell.r,
38013
- c: formulaCell.c,
38063
+ r: _formulaCell.r,
38064
+ c: _formulaCell.c,
38014
38065
  v: v[1],
38015
38066
  f: v[2],
38016
38067
  spe: v[3],
38017
- id: formulaCell.id
38068
+ id: _formulaCell.id
38018
38069
  });
38019
- ctx.formulaCache.execFunctionGlobalData["".concat(formulaCell.r, "_").concat(formulaCell.c, "_").concat(formulaCell.id)] = {
38070
+ ctx.formulaCache.execFunctionGlobalData["".concat(_formulaCell.r, "_").concat(_formulaCell.c, "_").concat(_formulaCell.id)] = {
38020
38071
  v: v[1],
38021
38072
  f: v[2]
38022
38073
  };
@@ -38037,26 +38088,26 @@ function findrangeindex(ctx, v, vp) {
38037
38088
  var vplen = vp_a.length;
38038
38089
  var vlen = v_a.length;
38039
38090
  if (vplen === vlen) {
38040
- var _i16 = pfri[0];
38041
- var p = vp_a[_i16];
38042
- var n = v_a[_i16];
38091
+ var _i15 = pfri[0];
38092
+ var p = vp_a[_i15];
38093
+ var n = v_a[_i15];
38043
38094
  if (___default['default'].isNil(p)) {
38044
- if (vp_a.length <= _i16) {
38095
+ if (vp_a.length <= _i15) {
38045
38096
  pfri = [vp_a.length - 1, vp_a.length - 1];
38046
- } else if (v_a.length <= _i16) {
38097
+ } else if (v_a.length <= _i15) {
38047
38098
  pfri = [v_a.length - 1, v_a.length - 1];
38048
38099
  }
38049
38100
  return pfri;
38050
38101
  }
38051
38102
  if (p.length === n.length) {
38052
- 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) {
38103
+ 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) {
38053
38104
  pfri[0] += 1;
38054
38105
  pfri[1] = 1;
38055
38106
  }
38056
38107
  return pfri;
38057
38108
  }
38058
38109
  if (p.length > n.length) {
38059
- 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)) {
38110
+ 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)) {
38060
38111
  pfri[0] += 1;
38061
38112
  pfri[1] = 1;
38062
38113
  }
@@ -38069,34 +38120,34 @@ function findrangeindex(ctx, v, vp) {
38069
38120
  return pfri;
38070
38121
  }
38071
38122
  } else if (vplen > vlen) {
38072
- var _i17 = pfri[0];
38073
- var _p = vp_a[_i17];
38074
- var _n = v_a[_i17];
38123
+ var _i16 = pfri[0];
38124
+ var _p = vp_a[_i16];
38125
+ var _n = v_a[_i16];
38075
38126
  if (___default['default'].isNil(_n)) {
38076
- if (v_a[_i17 - 1].indexOf("{") > -1) {
38127
+ if (v_a[_i16 - 1].indexOf("{") > -1) {
38077
38128
  pfri[0] -= 1;
38078
- var start = v_a[_i17 - 1].search("{");
38129
+ var start = v_a[_i16 - 1].search("{");
38079
38130
  pfri[1] += start;
38080
38131
  } else {
38081
38132
  pfri[0] = 0;
38082
38133
  pfri[1] = 0;
38083
38134
  }
38084
38135
  } else if (_p.length === _n.length) {
38085
- 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) === "}")) {
38136
+ 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) === "}")) {
38086
38137
  pfri[0] += 1;
38087
38138
  pfri[1] = 1;
38088
- } 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] === '")') {
38139
+ } 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] === '")') {
38089
38140
  pfri[1] = 1;
38090
- } else if (!___default['default'].isNil(v_a[_i17]) && v_a[_i17] === '"}') {
38141
+ } else if (!___default['default'].isNil(v_a[_i16]) && v_a[_i16] === '"}') {
38091
38142
  pfri[1] = 1;
38092
- } else if (!___default['default'].isNil(v_a[_i17]) && v_a[_i17] === "{)") {
38143
+ } else if (!___default['default'].isNil(v_a[_i16]) && v_a[_i16] === "{)") {
38093
38144
  pfri[1] = 1;
38094
38145
  } else {
38095
38146
  pfri[1] = _n.length;
38096
38147
  }
38097
38148
  return pfri;
38098
38149
  } else if (_p.length > _n.length) {
38099
- 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) === "}")) {
38150
+ 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) === "}")) {
38100
38151
  pfri[0] += 1;
38101
38152
  pfri[1] = 1;
38102
38153
  }
@@ -38106,17 +38157,17 @@ function findrangeindex(ctx, v, vp) {
38106
38157
  }
38107
38158
  return pfri;
38108
38159
  } else if (vplen < vlen) {
38109
- var _i18 = pfri[0];
38110
- var _p2 = vp_a[_i18];
38111
- var _n2 = v_a[_i18];
38160
+ var _i17 = pfri[0];
38161
+ var _p2 = vp_a[_i17];
38162
+ var _n2 = v_a[_i17];
38112
38163
  if (___default['default'].isNil(_p2)) {
38113
38164
  pfri[0] = v_a.length - 1;
38114
38165
  var last = v_a[pfri[0]];
38115
38166
  pfri[1] = ___default['default'].isNil(last) ? 1 : last.length;
38116
38167
  } else if (_p2.length === _n2.length) {
38117
- 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) === "}")) {
38168
+ 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) === "}")) {
38118
38169
  pfri[1] = _n2.length;
38119
- } 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) === "}")) {
38170
+ } 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) === "}")) {
38120
38171
  pfri[0] += 1;
38121
38172
  pfri[1] = 1;
38122
38173
  } 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) === ")") {
@@ -38126,7 +38177,7 @@ function findrangeindex(ctx, v, vp) {
38126
38177
  } else {
38127
38178
  pfri[0] = pfri[0] + vlen - vplen;
38128
38179
  if (v_a.length > vp_a.length) {
38129
- pfri[1] = v_a[_i18 + 1].length;
38180
+ pfri[1] = v_a[_i17 + 1].length;
38130
38181
  } else {
38131
38182
  pfri[1] = 1;
38132
38183
  }
@@ -38135,17 +38186,17 @@ function findrangeindex(ctx, v, vp) {
38135
38186
  } else if (_p2.length > _n2.length) {
38136
38187
  if (!___default['default'].isNil(_p2) && _p2.substring(0, 1) === '"') {
38137
38188
  pfri[1] = _n2.length;
38138
- } else if (___default['default'].isNil(v_a[_i18 + 1]) && /{.*?}/.test(v_a[_i18 + 1])) {
38189
+ } else if (___default['default'].isNil(v_a[_i17 + 1]) && /{.*?}/.test(v_a[_i17 + 1])) {
38139
38190
  pfri[0] += 1;
38140
- pfri[1] = v_a[_i18 + 1].length;
38141
- } else if (!___default['default'].isNil(_p2) && v_a[_i18 + 1].substring(0, 1) === '"' && (_p2.indexOf("{") > -1 || _p2.indexOf("}") > -1)) {
38191
+ pfri[1] = v_a[_i17 + 1].length;
38192
+ } else if (!___default['default'].isNil(_p2) && v_a[_i17 + 1].substring(0, 1) === '"' && (_p2.indexOf("{") > -1 || _p2.indexOf("}") > -1)) {
38142
38193
  pfri[0] += 1;
38143
38194
  pfri[1] = 1;
38144
38195
  } 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, "=")) {
38145
38196
  return [vlen - 1, v_a[vlen - 1].length];
38146
38197
  } else {
38147
38198
  pfri[0] = pfri[0] + vlen - vplen - 1;
38148
- pfri[1] = v_a[(_i18 || 1) - 1].length;
38199
+ pfri[1] = v_a[(_i17 || 1) - 1].length;
38149
38200
  }
38150
38201
  return pfri;
38151
38202
  } else if (_p2.length < _n2.length) {
@@ -38192,9 +38243,9 @@ function locateTextOffset(node, offset) {
38192
38243
  text = walker.nextNode();
38193
38244
  }
38194
38245
  var acc = 0;
38195
- for (var _i19 = 0; _i19 < texts.length; _i19 += 1) {
38246
+ for (var _i18 = 0; _i18 < texts.length; _i18 += 1) {
38196
38247
  var _item$textContent$len, _item$textContent;
38197
- var item = texts[_i19];
38248
+ var item = texts[_i18];
38198
38249
  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;
38199
38250
  if (offset <= acc + len) {
38200
38251
  return [item, Math.max(0, offset - acc)];
@@ -38280,8 +38331,8 @@ function searchFunction(ctx, searchtxt) {
38280
38331
  var f = [];
38281
38332
  var s = [];
38282
38333
  var t = [];
38283
- for (var _i20 = 0; _i20 < functionlist.length; _i20 += 1) {
38284
- var item = functionlist[_i20];
38334
+ for (var _i19 = 0; _i19 < functionlist.length; _i19 += 1) {
38335
+ var item = functionlist[_i19];
38285
38336
  var n = item.n;
38286
38337
  if (n === searchtxt) {
38287
38338
  f.unshift(item);
@@ -38337,8 +38388,8 @@ function helpFunctionExe($editer, currSelection, ctx) {
38337
38388
  var _locale2 = locale(ctx),
38338
38389
  functionlist = _locale2.functionlist;
38339
38390
  if (___default['default'].isEmpty(ctx.formulaCache.functionlistMap)) {
38340
- for (var _i21 = 0; _i21 < functionlist.length; _i21 += 1) {
38341
- ctx.formulaCache.functionlistMap[functionlist[_i21].n] = functionlist[_i21];
38391
+ for (var _i20 = 0; _i20 < functionlist.length; _i20 += 1) {
38392
+ ctx.formulaCache.functionlistMap[functionlist[_i20].n] = functionlist[_i20];
38342
38393
  }
38343
38394
  }
38344
38395
  if (!currSelection) {
@@ -38971,7 +39022,7 @@ function functionStrChange(txt, type, rc, orient, stindex, step, sheetName, isCu
38971
39022
  return function_str;
38972
39023
  }
38973
39024
  function rangeSetValue(ctx, cellInput, selected, fxInput) {
38974
- var _document$activeEleme, _ctx$active_f2;
39025
+ var _document$activeEleme, _ctx$active_f3;
38975
39026
  var $editor = cellInput;
38976
39027
  var $copyTo = fxInput;
38977
39028
  if (((_document$activeEleme = document.activeElement) === null || _document$activeEleme === void 0 ? void 0 : _document$activeEleme.id) === "luckysheet-functionbox-cell") {
@@ -38985,7 +39036,7 @@ function rangeSetValue(ctx, cellInput, selected, fxInput) {
38985
39036
  var range = "";
38986
39037
  var rf = selected.row[0];
38987
39038
  var cf = selected.column[0];
38988
- var sheetId = ((_ctx$active_f2 = ctx.active_f) === null || _ctx$active_f2 === void 0 ? void 0 : _ctx$active_f2.sheetId) || ctx.formulaCache.rangetosheet;
39039
+ var sheetId = ((_ctx$active_f3 = ctx.active_f) === null || _ctx$active_f3 === void 0 ? void 0 : _ctx$active_f3.sheetId) || ctx.formulaCache.rangetosheet;
38989
39040
  if (ctx.config.merge != null && "".concat(rf, "_").concat(cf) in ctx.config.merge) {
38990
39041
  range = getRangetxt(ctx, ctx.currentSheetId, {
38991
39042
  column: [cf, cf],
@@ -39346,7 +39397,7 @@ function functionCopy(ctx, txt, mode, step) {
39346
39397
  squote: 0,
39347
39398
  dquote: 0
39348
39399
  };
39349
- var _loop3 = function _loop3() {
39400
+ var _loop2 = function _loop2() {
39350
39401
  var s = funcstack[i];
39351
39402
  var nextS = funcstack[i + 1];
39352
39403
  if (s === "{" && nextS === "{") {
@@ -39454,7 +39505,7 @@ function functionCopy(ctx, txt, mode, step) {
39454
39505
  i += 1;
39455
39506
  };
39456
39507
  while (i < funcstack.length) {
39457
- if (_loop3()) continue;
39508
+ if (_loop2()) continue;
39458
39509
  }
39459
39510
  return function_str;
39460
39511
  }