@leankylin-sheet/core 7.0.39 → 7.0.40
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.esm.js +220 -168
- package/dist/index.js +220 -168
- package/dist/modules/formula.d.ts +8 -0
- package/package.json +2 -2
package/dist/index.esm.js
CHANGED
|
@@ -36936,6 +36936,8 @@ var FormulaCache = /*#__PURE__*/function () {
|
|
|
36936
36936
|
this.execFunctionExist = void 0;
|
|
36937
36937
|
this.execFunctionGlobalData = void 0;
|
|
36938
36938
|
this._lastDataRowCache = null;
|
|
36939
|
+
this.formulaParseCache = null;
|
|
36940
|
+
this.formulaParseCacheSignature = null;
|
|
36939
36941
|
var that = this;
|
|
36940
36942
|
this.data_parm_index = 0;
|
|
36941
36943
|
this.selectingRangeIndex = -1;
|
|
@@ -37654,6 +37656,118 @@ function groupValuesRefresh(ctx) {
|
|
|
37654
37656
|
ctx.groupValuesRefreshData = [];
|
|
37655
37657
|
}
|
|
37656
37658
|
}
|
|
37659
|
+
function getStructureSignature(ctx) {
|
|
37660
|
+
var _ctx$active_f2;
|
|
37661
|
+
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) : "";
|
|
37662
|
+
var luckysheetfile = ctx.luckysheetfile;
|
|
37663
|
+
for (var _i11 = 0; _i11 < luckysheetfile.length; _i11 += 1) {
|
|
37664
|
+
var _data$length, _data$0$length, _data$;
|
|
37665
|
+
var _luckysheetfile$_i = luckysheetfile[_i11],
|
|
37666
|
+
id = _luckysheetfile$_i.id,
|
|
37667
|
+
name = _luckysheetfile$_i.name,
|
|
37668
|
+
data = _luckysheetfile$_i.data;
|
|
37669
|
+
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);
|
|
37670
|
+
}
|
|
37671
|
+
return signature;
|
|
37672
|
+
}
|
|
37673
|
+
function ensureFormulaParseCache(ctx) {
|
|
37674
|
+
var signature = getStructureSignature(ctx);
|
|
37675
|
+
if (ctx.formulaCache.formulaParseCacheSignature !== signature || _.isNil(ctx.formulaCache.formulaParseCache)) {
|
|
37676
|
+
ctx.formulaCache.formulaParseCacheSignature = signature;
|
|
37677
|
+
ctx.formulaCache.formulaParseCache = Object.create(null);
|
|
37678
|
+
}
|
|
37679
|
+
return ctx.formulaCache.formulaParseCache;
|
|
37680
|
+
}
|
|
37681
|
+
function getSheetParseCache(cache, sheetId) {
|
|
37682
|
+
var sheetCache = cache[sheetId];
|
|
37683
|
+
if (_.isNil(sheetCache)) {
|
|
37684
|
+
sheetCache = Object.create(null);
|
|
37685
|
+
cache[sheetId] = sheetCache;
|
|
37686
|
+
}
|
|
37687
|
+
return sheetCache;
|
|
37688
|
+
}
|
|
37689
|
+
function parseFormulaRanges(ctx, calc_funcStr, fId) {
|
|
37690
|
+
var formulaArray = [];
|
|
37691
|
+
var txt1 = calc_funcStr.toUpperCase();
|
|
37692
|
+
var isOffsetFunc = txt1.indexOf("INDIRECT(") > -1 || txt1.indexOf("OFFSET(") > -1 || txt1.indexOf("INDEX(") > -1;
|
|
37693
|
+
if (isOffsetFunc) {
|
|
37694
|
+
isFunctionRange(ctx, calc_funcStr, null, null, fId, null, function (str_nb) {
|
|
37695
|
+
var range = getcellrange(ctx, _.trim(str_nb), fId);
|
|
37696
|
+
if (!_.isNil(range)) {
|
|
37697
|
+
formulaArray.push(range);
|
|
37698
|
+
}
|
|
37699
|
+
});
|
|
37700
|
+
} else if (!(calc_funcStr.substring(0, 2) === '="' && calc_funcStr.substring(calc_funcStr.length - 1, 1) === '"')) {
|
|
37701
|
+
var point = 0;
|
|
37702
|
+
var squote = -1;
|
|
37703
|
+
var dquote = -1;
|
|
37704
|
+
var formulaTextArray = [];
|
|
37705
|
+
var sq_end_array = [];
|
|
37706
|
+
var calc_funcStr_length = calc_funcStr.length;
|
|
37707
|
+
for (var j = 0; j < calc_funcStr_length; j += 1) {
|
|
37708
|
+
var char = calc_funcStr.charAt(j);
|
|
37709
|
+
if (char === "'" && dquote === -1) {
|
|
37710
|
+
if (squote === -1) {
|
|
37711
|
+
if (point !== j) {
|
|
37712
|
+
formulaTextArray.push.apply(formulaTextArray, _toConsumableArray(calc_funcStr.substring(point, j).split(/==|!=|<>|<=|>=|[,()=+-/*%&^><]/)));
|
|
37713
|
+
}
|
|
37714
|
+
squote = j;
|
|
37715
|
+
point = j;
|
|
37716
|
+
} else {
|
|
37717
|
+
if (j < calc_funcStr_length - 1 && calc_funcStr.charAt(j + 1) === "'") {
|
|
37718
|
+
j += 1;
|
|
37719
|
+
} else {
|
|
37720
|
+
point = j + 1;
|
|
37721
|
+
formulaTextArray.push(calc_funcStr.substring(squote, point));
|
|
37722
|
+
sq_end_array.push(formulaTextArray.length - 1);
|
|
37723
|
+
squote = -1;
|
|
37724
|
+
}
|
|
37725
|
+
}
|
|
37726
|
+
}
|
|
37727
|
+
if (char === '"' && squote === -1) {
|
|
37728
|
+
if (dquote === -1) {
|
|
37729
|
+
if (point !== j) {
|
|
37730
|
+
formulaTextArray.push.apply(formulaTextArray, _toConsumableArray(calc_funcStr.substring(point, j).split(/==|!=|<>|<=|>=|[,()=+-/*%&^><]/)));
|
|
37731
|
+
}
|
|
37732
|
+
dquote = j;
|
|
37733
|
+
point = j;
|
|
37734
|
+
} else {
|
|
37735
|
+
if (j < calc_funcStr_length - 1 && calc_funcStr.charAt(j + 1) === '"') {
|
|
37736
|
+
j += 1;
|
|
37737
|
+
} else {
|
|
37738
|
+
point = j + 1;
|
|
37739
|
+
formulaTextArray.push(calc_funcStr.substring(dquote, point));
|
|
37740
|
+
dquote = -1;
|
|
37741
|
+
}
|
|
37742
|
+
}
|
|
37743
|
+
}
|
|
37744
|
+
}
|
|
37745
|
+
if (point !== calc_funcStr_length) {
|
|
37746
|
+
formulaTextArray.push.apply(formulaTextArray, _toConsumableArray(calc_funcStr.substring(point, calc_funcStr_length).split(/==|!=|<>|<=|>=|[,()=+-/*%&^><]/)));
|
|
37747
|
+
}
|
|
37748
|
+
for (var _j = sq_end_array.length - 1; _j >= 0; _j -= 1) {
|
|
37749
|
+
if (sq_end_array[_j] !== formulaTextArray.length - 1) {
|
|
37750
|
+
formulaTextArray[sq_end_array[_j]] += formulaTextArray[sq_end_array[_j] + 1];
|
|
37751
|
+
formulaTextArray.splice(sq_end_array[_j] + 1, 1);
|
|
37752
|
+
}
|
|
37753
|
+
}
|
|
37754
|
+
for (var _j2 = 0; _j2 < formulaTextArray.length; _j2 += 1) {
|
|
37755
|
+
var t = _.trim(formulaTextArray[_j2]);
|
|
37756
|
+
if (t.length <= 1) {
|
|
37757
|
+
continue;
|
|
37758
|
+
}
|
|
37759
|
+
if (t.substring(0, 1) === '"' && t.substring(t.length - 1, 1) === '"' || !iscelldata(t)) {
|
|
37760
|
+
continue;
|
|
37761
|
+
}
|
|
37762
|
+
var range = getcellrange(ctx, t, fId);
|
|
37763
|
+
if (_.isNil(range)) {
|
|
37764
|
+
continue;
|
|
37765
|
+
}
|
|
37766
|
+
formulaArray.push(range);
|
|
37767
|
+
}
|
|
37768
|
+
}
|
|
37769
|
+
return formulaArray;
|
|
37770
|
+
}
|
|
37657
37771
|
function execFunctionGroup(ctx, origin_r, origin_c, value, id, data, isForce, notInsertFunc, originFormula) {
|
|
37658
37772
|
console.time('execFunctionGroup-1');
|
|
37659
37773
|
isForce = !_.isNil(isForce) ? isForce : false;
|
|
@@ -37679,8 +37793,8 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data, isForce, no
|
|
|
37679
37793
|
var formulaObjects = {};
|
|
37680
37794
|
var sheets = ctx.luckysheetfile;
|
|
37681
37795
|
var sheetData = {};
|
|
37682
|
-
for (var
|
|
37683
|
-
var sheet = sheets[
|
|
37796
|
+
for (var _i12 = 0; _i12 < sheets.length; _i12 += 1) {
|
|
37797
|
+
var sheet = sheets[_i12];
|
|
37684
37798
|
sheetData[sheet.id] = sheet.data;
|
|
37685
37799
|
}
|
|
37686
37800
|
var updateValueOjects = {};
|
|
@@ -37731,119 +37845,57 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data, isForce, no
|
|
|
37731
37845
|
}
|
|
37732
37846
|
}
|
|
37733
37847
|
};
|
|
37734
|
-
var
|
|
37735
|
-
|
|
37736
|
-
|
|
37737
|
-
|
|
37738
|
-
|
|
37739
|
-
|
|
37740
|
-
|
|
37741
|
-
|
|
37742
|
-
|
|
37743
|
-
|
|
37744
|
-
|
|
37745
|
-
|
|
37746
|
-
|
|
37848
|
+
var parseCache = ensureFormulaParseCache(ctx);
|
|
37849
|
+
for (var _i13 = 0; _i13 < calcChains.length; _i13 += 1) {
|
|
37850
|
+
var formulaCell = calcChains[_i13];
|
|
37851
|
+
var fR = formulaCell.r;
|
|
37852
|
+
var fC = formulaCell.c;
|
|
37853
|
+
var fId = formulaCell.id;
|
|
37854
|
+
var _key4 = "r".concat(fR, "c").concat(fC, "i").concat(fId);
|
|
37855
|
+
var sheetId = _.isNil(fId) ? ctx.currentSheetId : fId;
|
|
37856
|
+
var sheetParseCache = getSheetParseCache(parseCache, sheetId);
|
|
37857
|
+
var posKey = "".concat(fR, "_").concat(fC);
|
|
37858
|
+
var isOriginCell = !_.isNil(origin_r) && !_.isNil(origin_c) && fR === origin_r && fC === origin_c && fId === id;
|
|
37859
|
+
var calc_funcStr = null;
|
|
37860
|
+
if (isOriginCell && !_.isNil(originFormula)) {
|
|
37861
|
+
if (originFormula === "") {
|
|
37862
|
+
delete sheetParseCache[posKey];
|
|
37863
|
+
continue;
|
|
37747
37864
|
}
|
|
37865
|
+
calc_funcStr = originFormula;
|
|
37866
|
+
} else {
|
|
37867
|
+
var _sheetData$sheetId, _originCell$f;
|
|
37868
|
+
var rowData = (_sheetData$sheetId = sheetData[sheetId]) === null || _sheetData$sheetId === void 0 ? void 0 : _sheetData$sheetId[fR];
|
|
37869
|
+
var originCell = _.isNil(rowData) ? null : rowData[fC];
|
|
37870
|
+
calc_funcStr = _.isNil(originCell) ? null : (_originCell$f = originCell.f) !== null && _originCell$f !== void 0 ? _originCell$f : null;
|
|
37748
37871
|
if (_.isNil(calc_funcStr)) {
|
|
37749
|
-
|
|
37750
|
-
|
|
37751
|
-
var txt1 = calc_funcStr.toUpperCase();
|
|
37752
|
-
var isOffsetFunc = txt1.indexOf("INDIRECT(") > -1 || txt1.indexOf("OFFSET(") > -1 || txt1.indexOf("INDEX(") > -1;
|
|
37753
|
-
var formulaArray = [];
|
|
37754
|
-
if (isOffsetFunc) {
|
|
37755
|
-
isFunctionRange(ctx, calc_funcStr, null, null, fId, null, function (str_nb) {
|
|
37756
|
-
var range = getcellrange(ctx, _.trim(str_nb), fId);
|
|
37757
|
-
if (!_.isNil(range)) {
|
|
37758
|
-
formulaArray.push(range);
|
|
37759
|
-
}
|
|
37760
|
-
});
|
|
37761
|
-
} else if (!(calc_funcStr.substring(0, 2) === '="' && calc_funcStr.substring(calc_funcStr.length - 1, 1) === '"')) {
|
|
37762
|
-
var point = 0;
|
|
37763
|
-
var squote = -1;
|
|
37764
|
-
var dquote = -1;
|
|
37765
|
-
var formulaTextArray = [];
|
|
37766
|
-
var sq_end_array = [];
|
|
37767
|
-
var calc_funcStr_length = calc_funcStr.length;
|
|
37768
|
-
for (var j = 0; j < calc_funcStr_length; j += 1) {
|
|
37769
|
-
var char = calc_funcStr.charAt(j);
|
|
37770
|
-
if (char === "'" && dquote === -1) {
|
|
37771
|
-
if (squote === -1) {
|
|
37772
|
-
if (point !== j) {
|
|
37773
|
-
formulaTextArray.push.apply(formulaTextArray, _toConsumableArray(calc_funcStr.substring(point, j).split(/==|!=|<>|<=|>=|[,()=+-/*%&^><]/)));
|
|
37774
|
-
}
|
|
37775
|
-
squote = j;
|
|
37776
|
-
point = j;
|
|
37777
|
-
} else {
|
|
37778
|
-
if (j < calc_funcStr_length - 1 && calc_funcStr.charAt(j + 1) === "'") {
|
|
37779
|
-
j += 1;
|
|
37780
|
-
} else {
|
|
37781
|
-
point = j + 1;
|
|
37782
|
-
formulaTextArray.push(calc_funcStr.substring(squote, point));
|
|
37783
|
-
sq_end_array.push(formulaTextArray.length - 1);
|
|
37784
|
-
squote = -1;
|
|
37785
|
-
}
|
|
37786
|
-
}
|
|
37787
|
-
}
|
|
37788
|
-
if (char === '"' && squote === -1) {
|
|
37789
|
-
if (dquote === -1) {
|
|
37790
|
-
if (point !== j) {
|
|
37791
|
-
formulaTextArray.push.apply(formulaTextArray, _toConsumableArray(calc_funcStr.substring(point, j).split(/==|!=|<>|<=|>=|[,()=+-/*%&^><]/)));
|
|
37792
|
-
}
|
|
37793
|
-
dquote = j;
|
|
37794
|
-
point = j;
|
|
37795
|
-
} else {
|
|
37796
|
-
if (j < calc_funcStr_length - 1 && calc_funcStr.charAt(j + 1) === '"') {
|
|
37797
|
-
j += 1;
|
|
37798
|
-
} else {
|
|
37799
|
-
point = j + 1;
|
|
37800
|
-
formulaTextArray.push(calc_funcStr.substring(dquote, point));
|
|
37801
|
-
dquote = -1;
|
|
37802
|
-
}
|
|
37803
|
-
}
|
|
37804
|
-
}
|
|
37805
|
-
}
|
|
37806
|
-
if (point !== calc_funcStr_length) {
|
|
37807
|
-
formulaTextArray.push.apply(formulaTextArray, _toConsumableArray(calc_funcStr.substring(point, calc_funcStr_length).split(/==|!=|<>|<=|>=|[,()=+-/*%&^><]/)));
|
|
37808
|
-
}
|
|
37809
|
-
for (var _j = sq_end_array.length - 1; _j >= 0; _j -= 1) {
|
|
37810
|
-
if (sq_end_array[_j] !== formulaTextArray.length - 1) {
|
|
37811
|
-
formulaTextArray[sq_end_array[_j]] += formulaTextArray[sq_end_array[_j] + 1];
|
|
37812
|
-
formulaTextArray.splice(sq_end_array[_j] + 1, 1);
|
|
37813
|
-
}
|
|
37814
|
-
}
|
|
37815
|
-
for (var _j2 = 0; _j2 < formulaTextArray.length; _j2 += 1) {
|
|
37816
|
-
var t = _.trim(formulaTextArray[_j2]);
|
|
37817
|
-
if (t.length <= 1) {
|
|
37818
|
-
continue;
|
|
37819
|
-
}
|
|
37820
|
-
if (t.substring(0, 1) === '"' && t.substring(t.length - 1, 1) === '"' || !iscelldata(t)) {
|
|
37821
|
-
continue;
|
|
37822
|
-
}
|
|
37823
|
-
var range = getcellrange(ctx, t, fId);
|
|
37824
|
-
if (_.isNil(range)) {
|
|
37825
|
-
continue;
|
|
37826
|
-
}
|
|
37827
|
-
formulaArray.push(range);
|
|
37828
|
-
}
|
|
37872
|
+
delete sheetParseCache[posKey];
|
|
37873
|
+
continue;
|
|
37829
37874
|
}
|
|
37830
|
-
|
|
37831
|
-
|
|
37832
|
-
|
|
37833
|
-
|
|
37834
|
-
|
|
37835
|
-
|
|
37836
|
-
|
|
37837
|
-
|
|
37838
|
-
|
|
37839
|
-
|
|
37875
|
+
}
|
|
37876
|
+
var formulaArray = void 0;
|
|
37877
|
+
var cachedEntry = sheetParseCache[posKey];
|
|
37878
|
+
if (!_.isNil(cachedEntry) && cachedEntry.f === calc_funcStr) {
|
|
37879
|
+
formulaArray = cachedEntry.ranges;
|
|
37880
|
+
} else {
|
|
37881
|
+
formulaArray = parseFormulaRanges(ctx, calc_funcStr, fId);
|
|
37882
|
+
sheetParseCache[posKey] = {
|
|
37883
|
+
f: calc_funcStr,
|
|
37884
|
+
ranges: formulaArray
|
|
37840
37885
|
};
|
|
37841
|
-
|
|
37842
|
-
|
|
37843
|
-
|
|
37844
|
-
|
|
37845
|
-
|
|
37846
|
-
|
|
37886
|
+
}
|
|
37887
|
+
var item = {
|
|
37888
|
+
formulaArray: formulaArray,
|
|
37889
|
+
calc_funcStr: calc_funcStr,
|
|
37890
|
+
key: _key4,
|
|
37891
|
+
r: fR,
|
|
37892
|
+
c: fC,
|
|
37893
|
+
id: fId,
|
|
37894
|
+
parents: {},
|
|
37895
|
+
chidren: {},
|
|
37896
|
+
color: "w"
|
|
37897
|
+
};
|
|
37898
|
+
formulaObjects[_key4] = item;
|
|
37847
37899
|
}
|
|
37848
37900
|
Object.keys(formulaObjects).forEach(function (key) {
|
|
37849
37901
|
var formulaObject = formulaObjects[key];
|
|
@@ -37872,8 +37924,8 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data, isForce, no
|
|
|
37872
37924
|
var node = formulaObjects[nodeKey];
|
|
37873
37925
|
if (node) {
|
|
37874
37926
|
var children = Object.keys(node.chidren);
|
|
37875
|
-
for (var
|
|
37876
|
-
var childKey = children[
|
|
37927
|
+
for (var _i14 = 0; _i14 < children.length; _i14 += 1) {
|
|
37928
|
+
var childKey = children[_i14];
|
|
37877
37929
|
if (inStack[childKey]) {
|
|
37878
37930
|
var cycleStart = dfsPath.indexOf(childKey);
|
|
37879
37931
|
if (cycleStart > -1) {
|
|
@@ -37897,7 +37949,7 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data, isForce, no
|
|
|
37897
37949
|
var formulaRunList = [];
|
|
37898
37950
|
var stack = updateValueArray;
|
|
37899
37951
|
var existsFormulaRunList = {};
|
|
37900
|
-
var
|
|
37952
|
+
var _loop = function _loop() {
|
|
37901
37953
|
var formulaObject = stack.pop();
|
|
37902
37954
|
if (_.isNil(formulaObject) || formulaObject.key in existsFormulaRunList) {
|
|
37903
37955
|
return 0; // continue
|
|
@@ -37923,10 +37975,10 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data, isForce, no
|
|
|
37923
37975
|
stack = stack.concat(cacheStack);
|
|
37924
37976
|
}
|
|
37925
37977
|
},
|
|
37926
|
-
|
|
37978
|
+
_ret;
|
|
37927
37979
|
while (stack.length > 0) {
|
|
37928
|
-
|
|
37929
|
-
if (
|
|
37980
|
+
_ret = _loop();
|
|
37981
|
+
if (_ret === 0) continue;
|
|
37930
37982
|
}
|
|
37931
37983
|
formulaRunList.reverse();
|
|
37932
37984
|
var formulaRunListKeys = {};
|
|
@@ -37973,10 +38025,10 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data, isForce, no
|
|
|
37973
38025
|
});
|
|
37974
38026
|
}
|
|
37975
38027
|
var lastDataRowSheets = Object.create(null);
|
|
37976
|
-
for (var
|
|
37977
|
-
var
|
|
37978
|
-
if (lastDataRowSheets[
|
|
37979
|
-
var fd = getFlowdata(ctx,
|
|
38028
|
+
for (var _i15 = 0; _i15 < formulaRunList.length; _i15++) {
|
|
38029
|
+
var _sheetId = formulaRunList[_i15].id;
|
|
38030
|
+
if (lastDataRowSheets[_sheetId] !== undefined) continue;
|
|
38031
|
+
var fd = getFlowdata(ctx, _sheetId);
|
|
37980
38032
|
var lastDataRow = 0;
|
|
37981
38033
|
if (fd) {
|
|
37982
38034
|
for (var r = fd.length - 1; r >= 0; r--) {
|
|
@@ -37986,27 +38038,27 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data, isForce, no
|
|
|
37986
38038
|
}
|
|
37987
38039
|
}
|
|
37988
38040
|
}
|
|
37989
|
-
lastDataRowSheets[
|
|
38041
|
+
lastDataRowSheets[_sheetId] = lastDataRow;
|
|
37990
38042
|
}
|
|
37991
38043
|
ctx.formulaCache._lastDataRowCache = lastDataRowSheets;
|
|
37992
38044
|
console.time('execFunctionGroup-formulaRunList');
|
|
37993
38045
|
console.log('formulaRunList', formulaRunList);
|
|
37994
|
-
for (var
|
|
37995
|
-
var
|
|
37996
|
-
if (
|
|
38046
|
+
for (var _i16 = 0; _i16 < formulaRunList.length; _i16 += 1) {
|
|
38047
|
+
var _formulaCell = formulaRunList[_i16];
|
|
38048
|
+
if (_formulaCell.level === Math.max) {
|
|
37997
38049
|
continue;
|
|
37998
38050
|
}
|
|
37999
|
-
var
|
|
38000
|
-
var v = execfunction(ctx,
|
|
38051
|
+
var _calc_funcStr = _formulaCell.calc_funcStr;
|
|
38052
|
+
var v = execfunction(ctx, _calc_funcStr, _formulaCell.r, _formulaCell.c, _formulaCell.id, false, notInsertFunc);
|
|
38001
38053
|
ctx.groupValuesRefreshData.push({
|
|
38002
|
-
r:
|
|
38003
|
-
c:
|
|
38054
|
+
r: _formulaCell.r,
|
|
38055
|
+
c: _formulaCell.c,
|
|
38004
38056
|
v: v[1],
|
|
38005
38057
|
f: v[2],
|
|
38006
38058
|
spe: v[3],
|
|
38007
|
-
id:
|
|
38059
|
+
id: _formulaCell.id
|
|
38008
38060
|
});
|
|
38009
|
-
ctx.formulaCache.execFunctionGlobalData["".concat(
|
|
38061
|
+
ctx.formulaCache.execFunctionGlobalData["".concat(_formulaCell.r, "_").concat(_formulaCell.c, "_").concat(_formulaCell.id)] = {
|
|
38010
38062
|
v: v[1],
|
|
38011
38063
|
f: v[2]
|
|
38012
38064
|
};
|
|
@@ -38027,26 +38079,26 @@ function findrangeindex(ctx, v, vp) {
|
|
|
38027
38079
|
var vplen = vp_a.length;
|
|
38028
38080
|
var vlen = v_a.length;
|
|
38029
38081
|
if (vplen === vlen) {
|
|
38030
|
-
var
|
|
38031
|
-
var p = vp_a[
|
|
38032
|
-
var n = v_a[
|
|
38082
|
+
var _i17 = pfri[0];
|
|
38083
|
+
var p = vp_a[_i17];
|
|
38084
|
+
var n = v_a[_i17];
|
|
38033
38085
|
if (_.isNil(p)) {
|
|
38034
|
-
if (vp_a.length <=
|
|
38086
|
+
if (vp_a.length <= _i17) {
|
|
38035
38087
|
pfri = [vp_a.length - 1, vp_a.length - 1];
|
|
38036
|
-
} else if (v_a.length <=
|
|
38088
|
+
} else if (v_a.length <= _i17) {
|
|
38037
38089
|
pfri = [v_a.length - 1, v_a.length - 1];
|
|
38038
38090
|
}
|
|
38039
38091
|
return pfri;
|
|
38040
38092
|
}
|
|
38041
38093
|
if (p.length === n.length) {
|
|
38042
|
-
if (!_.isNil(vp_a[
|
|
38094
|
+
if (!_.isNil(vp_a[_i17 + 1]) && !_.isNil(v_a[_i17 + 1]) && vp_a[_i17 + 1].length < v_a[_i17 + 1].length) {
|
|
38043
38095
|
pfri[0] += 1;
|
|
38044
38096
|
pfri[1] = 1;
|
|
38045
38097
|
}
|
|
38046
38098
|
return pfri;
|
|
38047
38099
|
}
|
|
38048
38100
|
if (p.length > n.length) {
|
|
38049
|
-
if (!_.isNil(p) && !_.isNil(v_a[
|
|
38101
|
+
if (!_.isNil(p) && !_.isNil(v_a[_i17 + 1]) && v_a[_i17 + 1].substring(0, 1) === '"' && (p.indexOf("{") > -1 || p.indexOf("}") > -1)) {
|
|
38050
38102
|
pfri[0] += 1;
|
|
38051
38103
|
pfri[1] = 1;
|
|
38052
38104
|
}
|
|
@@ -38059,34 +38111,34 @@ function findrangeindex(ctx, v, vp) {
|
|
|
38059
38111
|
return pfri;
|
|
38060
38112
|
}
|
|
38061
38113
|
} else if (vplen > vlen) {
|
|
38062
|
-
var
|
|
38063
|
-
var _p = vp_a[
|
|
38064
|
-
var _n = v_a[
|
|
38114
|
+
var _i18 = pfri[0];
|
|
38115
|
+
var _p = vp_a[_i18];
|
|
38116
|
+
var _n = v_a[_i18];
|
|
38065
38117
|
if (_.isNil(_n)) {
|
|
38066
|
-
if (v_a[
|
|
38118
|
+
if (v_a[_i18 - 1].indexOf("{") > -1) {
|
|
38067
38119
|
pfri[0] -= 1;
|
|
38068
|
-
var start = v_a[
|
|
38120
|
+
var start = v_a[_i18 - 1].search("{");
|
|
38069
38121
|
pfri[1] += start;
|
|
38070
38122
|
} else {
|
|
38071
38123
|
pfri[0] = 0;
|
|
38072
38124
|
pfri[1] = 0;
|
|
38073
38125
|
}
|
|
38074
38126
|
} else if (_p.length === _n.length) {
|
|
38075
|
-
if (!_.isNil(v_a[
|
|
38127
|
+
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) === "}")) {
|
|
38076
38128
|
pfri[0] += 1;
|
|
38077
38129
|
pfri[1] = 1;
|
|
38078
|
-
} else if (!_.isNil(_p) && _p.length > 2 && _p.substring(0, 1) === '"' && _p.substring(_p.length - 1, 1) === '"') ; else if (!_.isNil(v_a[
|
|
38130
|
+
} else if (!_.isNil(_p) && _p.length > 2 && _p.substring(0, 1) === '"' && _p.substring(_p.length - 1, 1) === '"') ; else if (!_.isNil(v_a[_i18]) && v_a[_i18] === '")') {
|
|
38079
38131
|
pfri[1] = 1;
|
|
38080
|
-
} else if (!_.isNil(v_a[
|
|
38132
|
+
} else if (!_.isNil(v_a[_i18]) && v_a[_i18] === '"}') {
|
|
38081
38133
|
pfri[1] = 1;
|
|
38082
|
-
} else if (!_.isNil(v_a[
|
|
38134
|
+
} else if (!_.isNil(v_a[_i18]) && v_a[_i18] === "{)") {
|
|
38083
38135
|
pfri[1] = 1;
|
|
38084
38136
|
} else {
|
|
38085
38137
|
pfri[1] = _n.length;
|
|
38086
38138
|
}
|
|
38087
38139
|
return pfri;
|
|
38088
38140
|
} else if (_p.length > _n.length) {
|
|
38089
|
-
if (!_.isNil(v_a[
|
|
38141
|
+
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) === "}")) {
|
|
38090
38142
|
pfri[0] += 1;
|
|
38091
38143
|
pfri[1] = 1;
|
|
38092
38144
|
}
|
|
@@ -38096,17 +38148,17 @@ function findrangeindex(ctx, v, vp) {
|
|
|
38096
38148
|
}
|
|
38097
38149
|
return pfri;
|
|
38098
38150
|
} else if (vplen < vlen) {
|
|
38099
|
-
var
|
|
38100
|
-
var _p2 = vp_a[
|
|
38101
|
-
var _n2 = v_a[
|
|
38151
|
+
var _i19 = pfri[0];
|
|
38152
|
+
var _p2 = vp_a[_i19];
|
|
38153
|
+
var _n2 = v_a[_i19];
|
|
38102
38154
|
if (_.isNil(_p2)) {
|
|
38103
38155
|
pfri[0] = v_a.length - 1;
|
|
38104
38156
|
var last = v_a[pfri[0]];
|
|
38105
38157
|
pfri[1] = _.isNil(last) ? 1 : last.length;
|
|
38106
38158
|
} else if (_p2.length === _n2.length) {
|
|
38107
|
-
if (vp_a[
|
|
38159
|
+
if (vp_a[_i19 + 1] != null && (vp_a[_i19 + 1].substring(0, 1) === '"' || vp_a[_i19 + 1].substring(0, 1) === "{" || vp_a[_i19 + 1].substring(0, 1) === "}")) {
|
|
38108
38160
|
pfri[1] = _n2.length;
|
|
38109
|
-
} else if (!_.isNil(v_a[
|
|
38161
|
+
} else 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) === "}")) {
|
|
38110
38162
|
pfri[0] += 1;
|
|
38111
38163
|
pfri[1] = 1;
|
|
38112
38164
|
} else if (!_.isNil(_n2) && _n2.substring(0, 1) === '"' && _n2.substring(_n2.length - 1, 1) === '"' && _p2.substring(0, 1) === '"' && _p2.substring(_p2.length - 1, 1) === ")") {
|
|
@@ -38116,7 +38168,7 @@ function findrangeindex(ctx, v, vp) {
|
|
|
38116
38168
|
} else {
|
|
38117
38169
|
pfri[0] = pfri[0] + vlen - vplen;
|
|
38118
38170
|
if (v_a.length > vp_a.length) {
|
|
38119
|
-
pfri[1] = v_a[
|
|
38171
|
+
pfri[1] = v_a[_i19 + 1].length;
|
|
38120
38172
|
} else {
|
|
38121
38173
|
pfri[1] = 1;
|
|
38122
38174
|
}
|
|
@@ -38125,17 +38177,17 @@ function findrangeindex(ctx, v, vp) {
|
|
|
38125
38177
|
} else if (_p2.length > _n2.length) {
|
|
38126
38178
|
if (!_.isNil(_p2) && _p2.substring(0, 1) === '"') {
|
|
38127
38179
|
pfri[1] = _n2.length;
|
|
38128
|
-
} else if (_.isNil(v_a[
|
|
38180
|
+
} else if (_.isNil(v_a[_i19 + 1]) && /{.*?}/.test(v_a[_i19 + 1])) {
|
|
38129
38181
|
pfri[0] += 1;
|
|
38130
|
-
pfri[1] = v_a[
|
|
38131
|
-
} else if (!_.isNil(_p2) && v_a[
|
|
38182
|
+
pfri[1] = v_a[_i19 + 1].length;
|
|
38183
|
+
} else if (!_.isNil(_p2) && v_a[_i19 + 1].substring(0, 1) === '"' && (_p2.indexOf("{") > -1 || _p2.indexOf("}") > -1)) {
|
|
38132
38184
|
pfri[0] += 1;
|
|
38133
38185
|
pfri[1] = 1;
|
|
38134
38186
|
} else if (!_.isNil(_p2) && (_p2.indexOf("{") > -1 || _p2.indexOf("}") > -1)) ; else if (!_.isNil(_p2) && !_.startsWith(_p2[0], "=") && _.startsWith(_n2, "=")) {
|
|
38135
38187
|
return [vlen - 1, v_a[vlen - 1].length];
|
|
38136
38188
|
} else {
|
|
38137
38189
|
pfri[0] = pfri[0] + vlen - vplen - 1;
|
|
38138
|
-
pfri[1] = v_a[(
|
|
38190
|
+
pfri[1] = v_a[(_i19 || 1) - 1].length;
|
|
38139
38191
|
}
|
|
38140
38192
|
return pfri;
|
|
38141
38193
|
} else if (_p2.length < _n2.length) {
|
|
@@ -38182,9 +38234,9 @@ function locateTextOffset(node, offset) {
|
|
|
38182
38234
|
text = walker.nextNode();
|
|
38183
38235
|
}
|
|
38184
38236
|
var acc = 0;
|
|
38185
|
-
for (var
|
|
38237
|
+
for (var _i20 = 0; _i20 < texts.length; _i20 += 1) {
|
|
38186
38238
|
var _item$textContent$len, _item$textContent;
|
|
38187
|
-
var item = texts[
|
|
38239
|
+
var item = texts[_i20];
|
|
38188
38240
|
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;
|
|
38189
38241
|
if (offset <= acc + len) {
|
|
38190
38242
|
return [item, Math.max(0, offset - acc)];
|
|
@@ -38270,8 +38322,8 @@ function searchFunction(ctx, searchtxt) {
|
|
|
38270
38322
|
var f = [];
|
|
38271
38323
|
var s = [];
|
|
38272
38324
|
var t = [];
|
|
38273
|
-
for (var
|
|
38274
|
-
var item = functionlist[
|
|
38325
|
+
for (var _i21 = 0; _i21 < functionlist.length; _i21 += 1) {
|
|
38326
|
+
var item = functionlist[_i21];
|
|
38275
38327
|
var n = item.n;
|
|
38276
38328
|
if (n === searchtxt) {
|
|
38277
38329
|
f.unshift(item);
|
|
@@ -38327,8 +38379,8 @@ function helpFunctionExe($editer, currSelection, ctx) {
|
|
|
38327
38379
|
var _locale2 = locale(ctx),
|
|
38328
38380
|
functionlist = _locale2.functionlist;
|
|
38329
38381
|
if (_.isEmpty(ctx.formulaCache.functionlistMap)) {
|
|
38330
|
-
for (var
|
|
38331
|
-
ctx.formulaCache.functionlistMap[functionlist[
|
|
38382
|
+
for (var _i22 = 0; _i22 < functionlist.length; _i22 += 1) {
|
|
38383
|
+
ctx.formulaCache.functionlistMap[functionlist[_i22].n] = functionlist[_i22];
|
|
38332
38384
|
}
|
|
38333
38385
|
}
|
|
38334
38386
|
if (!currSelection) {
|
|
@@ -38961,7 +39013,7 @@ function functionStrChange(txt, type, rc, orient, stindex, step, sheetName, isCu
|
|
|
38961
39013
|
return function_str;
|
|
38962
39014
|
}
|
|
38963
39015
|
function rangeSetValue(ctx, cellInput, selected, fxInput) {
|
|
38964
|
-
var _document$activeEleme, _ctx$
|
|
39016
|
+
var _document$activeEleme, _ctx$active_f3;
|
|
38965
39017
|
var $editor = cellInput;
|
|
38966
39018
|
var $copyTo = fxInput;
|
|
38967
39019
|
if (((_document$activeEleme = document.activeElement) === null || _document$activeEleme === void 0 ? void 0 : _document$activeEleme.id) === "luckysheet-functionbox-cell") {
|
|
@@ -38975,7 +39027,7 @@ function rangeSetValue(ctx, cellInput, selected, fxInput) {
|
|
|
38975
39027
|
var range = "";
|
|
38976
39028
|
var rf = selected.row[0];
|
|
38977
39029
|
var cf = selected.column[0];
|
|
38978
|
-
var sheetId = ((_ctx$
|
|
39030
|
+
var sheetId = ((_ctx$active_f3 = ctx.active_f) === null || _ctx$active_f3 === void 0 ? void 0 : _ctx$active_f3.sheetId) || ctx.formulaCache.rangetosheet;
|
|
38979
39031
|
if (ctx.config.merge != null && "".concat(rf, "_").concat(cf) in ctx.config.merge) {
|
|
38980
39032
|
range = getRangetxt(ctx, ctx.currentSheetId, {
|
|
38981
39033
|
column: [cf, cf],
|
|
@@ -39336,7 +39388,7 @@ function functionCopy(ctx, txt, mode, step) {
|
|
|
39336
39388
|
squote: 0,
|
|
39337
39389
|
dquote: 0
|
|
39338
39390
|
};
|
|
39339
|
-
var
|
|
39391
|
+
var _loop2 = function _loop2() {
|
|
39340
39392
|
var s = funcstack[i];
|
|
39341
39393
|
var nextS = funcstack[i + 1];
|
|
39342
39394
|
if (s === "{" && nextS === "{") {
|
|
@@ -39444,7 +39496,7 @@ function functionCopy(ctx, txt, mode, step) {
|
|
|
39444
39496
|
i += 1;
|
|
39445
39497
|
};
|
|
39446
39498
|
while (i < funcstack.length) {
|
|
39447
|
-
if (
|
|
39499
|
+
if (_loop2()) continue;
|
|
39448
39500
|
}
|
|
39449
39501
|
return function_str;
|
|
39450
39502
|
}
|
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;
|
|
@@ -37664,6 +37666,118 @@ function groupValuesRefresh(ctx) {
|
|
|
37664
37666
|
ctx.groupValuesRefreshData = [];
|
|
37665
37667
|
}
|
|
37666
37668
|
}
|
|
37669
|
+
function getStructureSignature(ctx) {
|
|
37670
|
+
var _ctx$active_f2;
|
|
37671
|
+
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) : "";
|
|
37672
|
+
var luckysheetfile = ctx.luckysheetfile;
|
|
37673
|
+
for (var _i11 = 0; _i11 < luckysheetfile.length; _i11 += 1) {
|
|
37674
|
+
var _data$length, _data$0$length, _data$;
|
|
37675
|
+
var _luckysheetfile$_i = luckysheetfile[_i11],
|
|
37676
|
+
id = _luckysheetfile$_i.id,
|
|
37677
|
+
name = _luckysheetfile$_i.name,
|
|
37678
|
+
data = _luckysheetfile$_i.data;
|
|
37679
|
+
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);
|
|
37680
|
+
}
|
|
37681
|
+
return signature;
|
|
37682
|
+
}
|
|
37683
|
+
function ensureFormulaParseCache(ctx) {
|
|
37684
|
+
var signature = getStructureSignature(ctx);
|
|
37685
|
+
if (ctx.formulaCache.formulaParseCacheSignature !== signature || ___default['default'].isNil(ctx.formulaCache.formulaParseCache)) {
|
|
37686
|
+
ctx.formulaCache.formulaParseCacheSignature = signature;
|
|
37687
|
+
ctx.formulaCache.formulaParseCache = Object.create(null);
|
|
37688
|
+
}
|
|
37689
|
+
return ctx.formulaCache.formulaParseCache;
|
|
37690
|
+
}
|
|
37691
|
+
function getSheetParseCache(cache, sheetId) {
|
|
37692
|
+
var sheetCache = cache[sheetId];
|
|
37693
|
+
if (___default['default'].isNil(sheetCache)) {
|
|
37694
|
+
sheetCache = Object.create(null);
|
|
37695
|
+
cache[sheetId] = sheetCache;
|
|
37696
|
+
}
|
|
37697
|
+
return sheetCache;
|
|
37698
|
+
}
|
|
37699
|
+
function parseFormulaRanges(ctx, calc_funcStr, fId) {
|
|
37700
|
+
var formulaArray = [];
|
|
37701
|
+
var txt1 = calc_funcStr.toUpperCase();
|
|
37702
|
+
var isOffsetFunc = txt1.indexOf("INDIRECT(") > -1 || txt1.indexOf("OFFSET(") > -1 || txt1.indexOf("INDEX(") > -1;
|
|
37703
|
+
if (isOffsetFunc) {
|
|
37704
|
+
isFunctionRange(ctx, calc_funcStr, null, null, fId, null, function (str_nb) {
|
|
37705
|
+
var range = getcellrange(ctx, ___default['default'].trim(str_nb), fId);
|
|
37706
|
+
if (!___default['default'].isNil(range)) {
|
|
37707
|
+
formulaArray.push(range);
|
|
37708
|
+
}
|
|
37709
|
+
});
|
|
37710
|
+
} else if (!(calc_funcStr.substring(0, 2) === '="' && calc_funcStr.substring(calc_funcStr.length - 1, 1) === '"')) {
|
|
37711
|
+
var point = 0;
|
|
37712
|
+
var squote = -1;
|
|
37713
|
+
var dquote = -1;
|
|
37714
|
+
var formulaTextArray = [];
|
|
37715
|
+
var sq_end_array = [];
|
|
37716
|
+
var calc_funcStr_length = calc_funcStr.length;
|
|
37717
|
+
for (var j = 0; j < calc_funcStr_length; j += 1) {
|
|
37718
|
+
var char = calc_funcStr.charAt(j);
|
|
37719
|
+
if (char === "'" && dquote === -1) {
|
|
37720
|
+
if (squote === -1) {
|
|
37721
|
+
if (point !== j) {
|
|
37722
|
+
formulaTextArray.push.apply(formulaTextArray, _toConsumableArray(calc_funcStr.substring(point, j).split(/==|!=|<>|<=|>=|[,()=+-/*%&^><]/)));
|
|
37723
|
+
}
|
|
37724
|
+
squote = j;
|
|
37725
|
+
point = j;
|
|
37726
|
+
} else {
|
|
37727
|
+
if (j < calc_funcStr_length - 1 && calc_funcStr.charAt(j + 1) === "'") {
|
|
37728
|
+
j += 1;
|
|
37729
|
+
} else {
|
|
37730
|
+
point = j + 1;
|
|
37731
|
+
formulaTextArray.push(calc_funcStr.substring(squote, point));
|
|
37732
|
+
sq_end_array.push(formulaTextArray.length - 1);
|
|
37733
|
+
squote = -1;
|
|
37734
|
+
}
|
|
37735
|
+
}
|
|
37736
|
+
}
|
|
37737
|
+
if (char === '"' && squote === -1) {
|
|
37738
|
+
if (dquote === -1) {
|
|
37739
|
+
if (point !== j) {
|
|
37740
|
+
formulaTextArray.push.apply(formulaTextArray, _toConsumableArray(calc_funcStr.substring(point, j).split(/==|!=|<>|<=|>=|[,()=+-/*%&^><]/)));
|
|
37741
|
+
}
|
|
37742
|
+
dquote = j;
|
|
37743
|
+
point = j;
|
|
37744
|
+
} else {
|
|
37745
|
+
if (j < calc_funcStr_length - 1 && calc_funcStr.charAt(j + 1) === '"') {
|
|
37746
|
+
j += 1;
|
|
37747
|
+
} else {
|
|
37748
|
+
point = j + 1;
|
|
37749
|
+
formulaTextArray.push(calc_funcStr.substring(dquote, point));
|
|
37750
|
+
dquote = -1;
|
|
37751
|
+
}
|
|
37752
|
+
}
|
|
37753
|
+
}
|
|
37754
|
+
}
|
|
37755
|
+
if (point !== calc_funcStr_length) {
|
|
37756
|
+
formulaTextArray.push.apply(formulaTextArray, _toConsumableArray(calc_funcStr.substring(point, calc_funcStr_length).split(/==|!=|<>|<=|>=|[,()=+-/*%&^><]/)));
|
|
37757
|
+
}
|
|
37758
|
+
for (var _j = sq_end_array.length - 1; _j >= 0; _j -= 1) {
|
|
37759
|
+
if (sq_end_array[_j] !== formulaTextArray.length - 1) {
|
|
37760
|
+
formulaTextArray[sq_end_array[_j]] += formulaTextArray[sq_end_array[_j] + 1];
|
|
37761
|
+
formulaTextArray.splice(sq_end_array[_j] + 1, 1);
|
|
37762
|
+
}
|
|
37763
|
+
}
|
|
37764
|
+
for (var _j2 = 0; _j2 < formulaTextArray.length; _j2 += 1) {
|
|
37765
|
+
var t = ___default['default'].trim(formulaTextArray[_j2]);
|
|
37766
|
+
if (t.length <= 1) {
|
|
37767
|
+
continue;
|
|
37768
|
+
}
|
|
37769
|
+
if (t.substring(0, 1) === '"' && t.substring(t.length - 1, 1) === '"' || !iscelldata(t)) {
|
|
37770
|
+
continue;
|
|
37771
|
+
}
|
|
37772
|
+
var range = getcellrange(ctx, t, fId);
|
|
37773
|
+
if (___default['default'].isNil(range)) {
|
|
37774
|
+
continue;
|
|
37775
|
+
}
|
|
37776
|
+
formulaArray.push(range);
|
|
37777
|
+
}
|
|
37778
|
+
}
|
|
37779
|
+
return formulaArray;
|
|
37780
|
+
}
|
|
37667
37781
|
function execFunctionGroup(ctx, origin_r, origin_c, value, id, data, isForce, notInsertFunc, originFormula) {
|
|
37668
37782
|
console.time('execFunctionGroup-1');
|
|
37669
37783
|
isForce = !___default['default'].isNil(isForce) ? isForce : false;
|
|
@@ -37689,8 +37803,8 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data, isForce, no
|
|
|
37689
37803
|
var formulaObjects = {};
|
|
37690
37804
|
var sheets = ctx.luckysheetfile;
|
|
37691
37805
|
var sheetData = {};
|
|
37692
|
-
for (var
|
|
37693
|
-
var sheet = sheets[
|
|
37806
|
+
for (var _i12 = 0; _i12 < sheets.length; _i12 += 1) {
|
|
37807
|
+
var sheet = sheets[_i12];
|
|
37694
37808
|
sheetData[sheet.id] = sheet.data;
|
|
37695
37809
|
}
|
|
37696
37810
|
var updateValueOjects = {};
|
|
@@ -37741,119 +37855,57 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data, isForce, no
|
|
|
37741
37855
|
}
|
|
37742
37856
|
}
|
|
37743
37857
|
};
|
|
37744
|
-
var
|
|
37745
|
-
|
|
37746
|
-
|
|
37747
|
-
|
|
37748
|
-
|
|
37749
|
-
|
|
37750
|
-
|
|
37751
|
-
|
|
37752
|
-
|
|
37753
|
-
|
|
37754
|
-
|
|
37755
|
-
|
|
37756
|
-
|
|
37858
|
+
var parseCache = ensureFormulaParseCache(ctx);
|
|
37859
|
+
for (var _i13 = 0; _i13 < calcChains.length; _i13 += 1) {
|
|
37860
|
+
var formulaCell = calcChains[_i13];
|
|
37861
|
+
var fR = formulaCell.r;
|
|
37862
|
+
var fC = formulaCell.c;
|
|
37863
|
+
var fId = formulaCell.id;
|
|
37864
|
+
var _key4 = "r".concat(fR, "c").concat(fC, "i").concat(fId);
|
|
37865
|
+
var sheetId = ___default['default'].isNil(fId) ? ctx.currentSheetId : fId;
|
|
37866
|
+
var sheetParseCache = getSheetParseCache(parseCache, sheetId);
|
|
37867
|
+
var posKey = "".concat(fR, "_").concat(fC);
|
|
37868
|
+
var isOriginCell = !___default['default'].isNil(origin_r) && !___default['default'].isNil(origin_c) && fR === origin_r && fC === origin_c && fId === id;
|
|
37869
|
+
var calc_funcStr = null;
|
|
37870
|
+
if (isOriginCell && !___default['default'].isNil(originFormula)) {
|
|
37871
|
+
if (originFormula === "") {
|
|
37872
|
+
delete sheetParseCache[posKey];
|
|
37873
|
+
continue;
|
|
37757
37874
|
}
|
|
37875
|
+
calc_funcStr = originFormula;
|
|
37876
|
+
} else {
|
|
37877
|
+
var _sheetData$sheetId, _originCell$f;
|
|
37878
|
+
var rowData = (_sheetData$sheetId = sheetData[sheetId]) === null || _sheetData$sheetId === void 0 ? void 0 : _sheetData$sheetId[fR];
|
|
37879
|
+
var originCell = ___default['default'].isNil(rowData) ? null : rowData[fC];
|
|
37880
|
+
calc_funcStr = ___default['default'].isNil(originCell) ? null : (_originCell$f = originCell.f) !== null && _originCell$f !== void 0 ? _originCell$f : null;
|
|
37758
37881
|
if (___default['default'].isNil(calc_funcStr)) {
|
|
37759
|
-
|
|
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
|
-
}
|
|
37882
|
+
delete sheetParseCache[posKey];
|
|
37883
|
+
continue;
|
|
37839
37884
|
}
|
|
37840
|
-
|
|
37841
|
-
|
|
37842
|
-
|
|
37843
|
-
|
|
37844
|
-
|
|
37845
|
-
|
|
37846
|
-
|
|
37847
|
-
|
|
37848
|
-
|
|
37849
|
-
|
|
37885
|
+
}
|
|
37886
|
+
var formulaArray = void 0;
|
|
37887
|
+
var cachedEntry = sheetParseCache[posKey];
|
|
37888
|
+
if (!___default['default'].isNil(cachedEntry) && cachedEntry.f === calc_funcStr) {
|
|
37889
|
+
formulaArray = cachedEntry.ranges;
|
|
37890
|
+
} else {
|
|
37891
|
+
formulaArray = parseFormulaRanges(ctx, calc_funcStr, fId);
|
|
37892
|
+
sheetParseCache[posKey] = {
|
|
37893
|
+
f: calc_funcStr,
|
|
37894
|
+
ranges: formulaArray
|
|
37850
37895
|
};
|
|
37851
|
-
|
|
37852
|
-
|
|
37853
|
-
|
|
37854
|
-
|
|
37855
|
-
|
|
37856
|
-
|
|
37896
|
+
}
|
|
37897
|
+
var item = {
|
|
37898
|
+
formulaArray: formulaArray,
|
|
37899
|
+
calc_funcStr: calc_funcStr,
|
|
37900
|
+
key: _key4,
|
|
37901
|
+
r: fR,
|
|
37902
|
+
c: fC,
|
|
37903
|
+
id: fId,
|
|
37904
|
+
parents: {},
|
|
37905
|
+
chidren: {},
|
|
37906
|
+
color: "w"
|
|
37907
|
+
};
|
|
37908
|
+
formulaObjects[_key4] = item;
|
|
37857
37909
|
}
|
|
37858
37910
|
Object.keys(formulaObjects).forEach(function (key) {
|
|
37859
37911
|
var formulaObject = formulaObjects[key];
|
|
@@ -37882,8 +37934,8 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data, isForce, no
|
|
|
37882
37934
|
var node = formulaObjects[nodeKey];
|
|
37883
37935
|
if (node) {
|
|
37884
37936
|
var children = Object.keys(node.chidren);
|
|
37885
|
-
for (var
|
|
37886
|
-
var childKey = children[
|
|
37937
|
+
for (var _i14 = 0; _i14 < children.length; _i14 += 1) {
|
|
37938
|
+
var childKey = children[_i14];
|
|
37887
37939
|
if (inStack[childKey]) {
|
|
37888
37940
|
var cycleStart = dfsPath.indexOf(childKey);
|
|
37889
37941
|
if (cycleStart > -1) {
|
|
@@ -37907,7 +37959,7 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data, isForce, no
|
|
|
37907
37959
|
var formulaRunList = [];
|
|
37908
37960
|
var stack = updateValueArray;
|
|
37909
37961
|
var existsFormulaRunList = {};
|
|
37910
|
-
var
|
|
37962
|
+
var _loop = function _loop() {
|
|
37911
37963
|
var formulaObject = stack.pop();
|
|
37912
37964
|
if (___default['default'].isNil(formulaObject) || formulaObject.key in existsFormulaRunList) {
|
|
37913
37965
|
return 0; // continue
|
|
@@ -37933,10 +37985,10 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data, isForce, no
|
|
|
37933
37985
|
stack = stack.concat(cacheStack);
|
|
37934
37986
|
}
|
|
37935
37987
|
},
|
|
37936
|
-
|
|
37988
|
+
_ret;
|
|
37937
37989
|
while (stack.length > 0) {
|
|
37938
|
-
|
|
37939
|
-
if (
|
|
37990
|
+
_ret = _loop();
|
|
37991
|
+
if (_ret === 0) continue;
|
|
37940
37992
|
}
|
|
37941
37993
|
formulaRunList.reverse();
|
|
37942
37994
|
var formulaRunListKeys = {};
|
|
@@ -37983,10 +38035,10 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data, isForce, no
|
|
|
37983
38035
|
});
|
|
37984
38036
|
}
|
|
37985
38037
|
var lastDataRowSheets = Object.create(null);
|
|
37986
|
-
for (var
|
|
37987
|
-
var
|
|
37988
|
-
if (lastDataRowSheets[
|
|
37989
|
-
var fd = getFlowdata(ctx,
|
|
38038
|
+
for (var _i15 = 0; _i15 < formulaRunList.length; _i15++) {
|
|
38039
|
+
var _sheetId = formulaRunList[_i15].id;
|
|
38040
|
+
if (lastDataRowSheets[_sheetId] !== undefined) continue;
|
|
38041
|
+
var fd = getFlowdata(ctx, _sheetId);
|
|
37990
38042
|
var lastDataRow = 0;
|
|
37991
38043
|
if (fd) {
|
|
37992
38044
|
for (var r = fd.length - 1; r >= 0; r--) {
|
|
@@ -37996,27 +38048,27 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data, isForce, no
|
|
|
37996
38048
|
}
|
|
37997
38049
|
}
|
|
37998
38050
|
}
|
|
37999
|
-
lastDataRowSheets[
|
|
38051
|
+
lastDataRowSheets[_sheetId] = lastDataRow;
|
|
38000
38052
|
}
|
|
38001
38053
|
ctx.formulaCache._lastDataRowCache = lastDataRowSheets;
|
|
38002
38054
|
console.time('execFunctionGroup-formulaRunList');
|
|
38003
38055
|
console.log('formulaRunList', formulaRunList);
|
|
38004
|
-
for (var
|
|
38005
|
-
var
|
|
38006
|
-
if (
|
|
38056
|
+
for (var _i16 = 0; _i16 < formulaRunList.length; _i16 += 1) {
|
|
38057
|
+
var _formulaCell = formulaRunList[_i16];
|
|
38058
|
+
if (_formulaCell.level === Math.max) {
|
|
38007
38059
|
continue;
|
|
38008
38060
|
}
|
|
38009
|
-
var
|
|
38010
|
-
var v = execfunction(ctx,
|
|
38061
|
+
var _calc_funcStr = _formulaCell.calc_funcStr;
|
|
38062
|
+
var v = execfunction(ctx, _calc_funcStr, _formulaCell.r, _formulaCell.c, _formulaCell.id, false, notInsertFunc);
|
|
38011
38063
|
ctx.groupValuesRefreshData.push({
|
|
38012
|
-
r:
|
|
38013
|
-
c:
|
|
38064
|
+
r: _formulaCell.r,
|
|
38065
|
+
c: _formulaCell.c,
|
|
38014
38066
|
v: v[1],
|
|
38015
38067
|
f: v[2],
|
|
38016
38068
|
spe: v[3],
|
|
38017
|
-
id:
|
|
38069
|
+
id: _formulaCell.id
|
|
38018
38070
|
});
|
|
38019
|
-
ctx.formulaCache.execFunctionGlobalData["".concat(
|
|
38071
|
+
ctx.formulaCache.execFunctionGlobalData["".concat(_formulaCell.r, "_").concat(_formulaCell.c, "_").concat(_formulaCell.id)] = {
|
|
38020
38072
|
v: v[1],
|
|
38021
38073
|
f: v[2]
|
|
38022
38074
|
};
|
|
@@ -38037,26 +38089,26 @@ function findrangeindex(ctx, v, vp) {
|
|
|
38037
38089
|
var vplen = vp_a.length;
|
|
38038
38090
|
var vlen = v_a.length;
|
|
38039
38091
|
if (vplen === vlen) {
|
|
38040
|
-
var
|
|
38041
|
-
var p = vp_a[
|
|
38042
|
-
var n = v_a[
|
|
38092
|
+
var _i17 = pfri[0];
|
|
38093
|
+
var p = vp_a[_i17];
|
|
38094
|
+
var n = v_a[_i17];
|
|
38043
38095
|
if (___default['default'].isNil(p)) {
|
|
38044
|
-
if (vp_a.length <=
|
|
38096
|
+
if (vp_a.length <= _i17) {
|
|
38045
38097
|
pfri = [vp_a.length - 1, vp_a.length - 1];
|
|
38046
|
-
} else if (v_a.length <=
|
|
38098
|
+
} else if (v_a.length <= _i17) {
|
|
38047
38099
|
pfri = [v_a.length - 1, v_a.length - 1];
|
|
38048
38100
|
}
|
|
38049
38101
|
return pfri;
|
|
38050
38102
|
}
|
|
38051
38103
|
if (p.length === n.length) {
|
|
38052
|
-
if (!___default['default'].isNil(vp_a[
|
|
38104
|
+
if (!___default['default'].isNil(vp_a[_i17 + 1]) && !___default['default'].isNil(v_a[_i17 + 1]) && vp_a[_i17 + 1].length < v_a[_i17 + 1].length) {
|
|
38053
38105
|
pfri[0] += 1;
|
|
38054
38106
|
pfri[1] = 1;
|
|
38055
38107
|
}
|
|
38056
38108
|
return pfri;
|
|
38057
38109
|
}
|
|
38058
38110
|
if (p.length > n.length) {
|
|
38059
|
-
if (!___default['default'].isNil(p) && !___default['default'].isNil(v_a[
|
|
38111
|
+
if (!___default['default'].isNil(p) && !___default['default'].isNil(v_a[_i17 + 1]) && v_a[_i17 + 1].substring(0, 1) === '"' && (p.indexOf("{") > -1 || p.indexOf("}") > -1)) {
|
|
38060
38112
|
pfri[0] += 1;
|
|
38061
38113
|
pfri[1] = 1;
|
|
38062
38114
|
}
|
|
@@ -38069,34 +38121,34 @@ function findrangeindex(ctx, v, vp) {
|
|
|
38069
38121
|
return pfri;
|
|
38070
38122
|
}
|
|
38071
38123
|
} else if (vplen > vlen) {
|
|
38072
|
-
var
|
|
38073
|
-
var _p = vp_a[
|
|
38074
|
-
var _n = v_a[
|
|
38124
|
+
var _i18 = pfri[0];
|
|
38125
|
+
var _p = vp_a[_i18];
|
|
38126
|
+
var _n = v_a[_i18];
|
|
38075
38127
|
if (___default['default'].isNil(_n)) {
|
|
38076
|
-
if (v_a[
|
|
38128
|
+
if (v_a[_i18 - 1].indexOf("{") > -1) {
|
|
38077
38129
|
pfri[0] -= 1;
|
|
38078
|
-
var start = v_a[
|
|
38130
|
+
var start = v_a[_i18 - 1].search("{");
|
|
38079
38131
|
pfri[1] += start;
|
|
38080
38132
|
} else {
|
|
38081
38133
|
pfri[0] = 0;
|
|
38082
38134
|
pfri[1] = 0;
|
|
38083
38135
|
}
|
|
38084
38136
|
} else if (_p.length === _n.length) {
|
|
38085
|
-
if (!___default['default'].isNil(v_a[
|
|
38137
|
+
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) === "}")) {
|
|
38086
38138
|
pfri[0] += 1;
|
|
38087
38139
|
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[
|
|
38140
|
+
} 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[_i18]) && v_a[_i18] === '")') {
|
|
38089
38141
|
pfri[1] = 1;
|
|
38090
|
-
} else if (!___default['default'].isNil(v_a[
|
|
38142
|
+
} else if (!___default['default'].isNil(v_a[_i18]) && v_a[_i18] === '"}') {
|
|
38091
38143
|
pfri[1] = 1;
|
|
38092
|
-
} else if (!___default['default'].isNil(v_a[
|
|
38144
|
+
} else if (!___default['default'].isNil(v_a[_i18]) && v_a[_i18] === "{)") {
|
|
38093
38145
|
pfri[1] = 1;
|
|
38094
38146
|
} else {
|
|
38095
38147
|
pfri[1] = _n.length;
|
|
38096
38148
|
}
|
|
38097
38149
|
return pfri;
|
|
38098
38150
|
} else if (_p.length > _n.length) {
|
|
38099
|
-
if (!___default['default'].isNil(v_a[
|
|
38151
|
+
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) === "}")) {
|
|
38100
38152
|
pfri[0] += 1;
|
|
38101
38153
|
pfri[1] = 1;
|
|
38102
38154
|
}
|
|
@@ -38106,17 +38158,17 @@ function findrangeindex(ctx, v, vp) {
|
|
|
38106
38158
|
}
|
|
38107
38159
|
return pfri;
|
|
38108
38160
|
} else if (vplen < vlen) {
|
|
38109
|
-
var
|
|
38110
|
-
var _p2 = vp_a[
|
|
38111
|
-
var _n2 = v_a[
|
|
38161
|
+
var _i19 = pfri[0];
|
|
38162
|
+
var _p2 = vp_a[_i19];
|
|
38163
|
+
var _n2 = v_a[_i19];
|
|
38112
38164
|
if (___default['default'].isNil(_p2)) {
|
|
38113
38165
|
pfri[0] = v_a.length - 1;
|
|
38114
38166
|
var last = v_a[pfri[0]];
|
|
38115
38167
|
pfri[1] = ___default['default'].isNil(last) ? 1 : last.length;
|
|
38116
38168
|
} else if (_p2.length === _n2.length) {
|
|
38117
|
-
if (vp_a[
|
|
38169
|
+
if (vp_a[_i19 + 1] != null && (vp_a[_i19 + 1].substring(0, 1) === '"' || vp_a[_i19 + 1].substring(0, 1) === "{" || vp_a[_i19 + 1].substring(0, 1) === "}")) {
|
|
38118
38170
|
pfri[1] = _n2.length;
|
|
38119
|
-
} else if (!___default['default'].isNil(v_a[
|
|
38171
|
+
} else 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) === "}")) {
|
|
38120
38172
|
pfri[0] += 1;
|
|
38121
38173
|
pfri[1] = 1;
|
|
38122
38174
|
} 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 +38178,7 @@ function findrangeindex(ctx, v, vp) {
|
|
|
38126
38178
|
} else {
|
|
38127
38179
|
pfri[0] = pfri[0] + vlen - vplen;
|
|
38128
38180
|
if (v_a.length > vp_a.length) {
|
|
38129
|
-
pfri[1] = v_a[
|
|
38181
|
+
pfri[1] = v_a[_i19 + 1].length;
|
|
38130
38182
|
} else {
|
|
38131
38183
|
pfri[1] = 1;
|
|
38132
38184
|
}
|
|
@@ -38135,17 +38187,17 @@ function findrangeindex(ctx, v, vp) {
|
|
|
38135
38187
|
} else if (_p2.length > _n2.length) {
|
|
38136
38188
|
if (!___default['default'].isNil(_p2) && _p2.substring(0, 1) === '"') {
|
|
38137
38189
|
pfri[1] = _n2.length;
|
|
38138
|
-
} else if (___default['default'].isNil(v_a[
|
|
38190
|
+
} else if (___default['default'].isNil(v_a[_i19 + 1]) && /{.*?}/.test(v_a[_i19 + 1])) {
|
|
38139
38191
|
pfri[0] += 1;
|
|
38140
|
-
pfri[1] = v_a[
|
|
38141
|
-
} else if (!___default['default'].isNil(_p2) && v_a[
|
|
38192
|
+
pfri[1] = v_a[_i19 + 1].length;
|
|
38193
|
+
} else if (!___default['default'].isNil(_p2) && v_a[_i19 + 1].substring(0, 1) === '"' && (_p2.indexOf("{") > -1 || _p2.indexOf("}") > -1)) {
|
|
38142
38194
|
pfri[0] += 1;
|
|
38143
38195
|
pfri[1] = 1;
|
|
38144
38196
|
} 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
38197
|
return [vlen - 1, v_a[vlen - 1].length];
|
|
38146
38198
|
} else {
|
|
38147
38199
|
pfri[0] = pfri[0] + vlen - vplen - 1;
|
|
38148
|
-
pfri[1] = v_a[(
|
|
38200
|
+
pfri[1] = v_a[(_i19 || 1) - 1].length;
|
|
38149
38201
|
}
|
|
38150
38202
|
return pfri;
|
|
38151
38203
|
} else if (_p2.length < _n2.length) {
|
|
@@ -38192,9 +38244,9 @@ function locateTextOffset(node, offset) {
|
|
|
38192
38244
|
text = walker.nextNode();
|
|
38193
38245
|
}
|
|
38194
38246
|
var acc = 0;
|
|
38195
|
-
for (var
|
|
38247
|
+
for (var _i20 = 0; _i20 < texts.length; _i20 += 1) {
|
|
38196
38248
|
var _item$textContent$len, _item$textContent;
|
|
38197
|
-
var item = texts[
|
|
38249
|
+
var item = texts[_i20];
|
|
38198
38250
|
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
38251
|
if (offset <= acc + len) {
|
|
38200
38252
|
return [item, Math.max(0, offset - acc)];
|
|
@@ -38280,8 +38332,8 @@ function searchFunction(ctx, searchtxt) {
|
|
|
38280
38332
|
var f = [];
|
|
38281
38333
|
var s = [];
|
|
38282
38334
|
var t = [];
|
|
38283
|
-
for (var
|
|
38284
|
-
var item = functionlist[
|
|
38335
|
+
for (var _i21 = 0; _i21 < functionlist.length; _i21 += 1) {
|
|
38336
|
+
var item = functionlist[_i21];
|
|
38285
38337
|
var n = item.n;
|
|
38286
38338
|
if (n === searchtxt) {
|
|
38287
38339
|
f.unshift(item);
|
|
@@ -38337,8 +38389,8 @@ function helpFunctionExe($editer, currSelection, ctx) {
|
|
|
38337
38389
|
var _locale2 = locale(ctx),
|
|
38338
38390
|
functionlist = _locale2.functionlist;
|
|
38339
38391
|
if (___default['default'].isEmpty(ctx.formulaCache.functionlistMap)) {
|
|
38340
|
-
for (var
|
|
38341
|
-
ctx.formulaCache.functionlistMap[functionlist[
|
|
38392
|
+
for (var _i22 = 0; _i22 < functionlist.length; _i22 += 1) {
|
|
38393
|
+
ctx.formulaCache.functionlistMap[functionlist[_i22].n] = functionlist[_i22];
|
|
38342
38394
|
}
|
|
38343
38395
|
}
|
|
38344
38396
|
if (!currSelection) {
|
|
@@ -38971,7 +39023,7 @@ function functionStrChange(txt, type, rc, orient, stindex, step, sheetName, isCu
|
|
|
38971
39023
|
return function_str;
|
|
38972
39024
|
}
|
|
38973
39025
|
function rangeSetValue(ctx, cellInput, selected, fxInput) {
|
|
38974
|
-
var _document$activeEleme, _ctx$
|
|
39026
|
+
var _document$activeEleme, _ctx$active_f3;
|
|
38975
39027
|
var $editor = cellInput;
|
|
38976
39028
|
var $copyTo = fxInput;
|
|
38977
39029
|
if (((_document$activeEleme = document.activeElement) === null || _document$activeEleme === void 0 ? void 0 : _document$activeEleme.id) === "luckysheet-functionbox-cell") {
|
|
@@ -38985,7 +39037,7 @@ function rangeSetValue(ctx, cellInput, selected, fxInput) {
|
|
|
38985
39037
|
var range = "";
|
|
38986
39038
|
var rf = selected.row[0];
|
|
38987
39039
|
var cf = selected.column[0];
|
|
38988
|
-
var sheetId = ((_ctx$
|
|
39040
|
+
var sheetId = ((_ctx$active_f3 = ctx.active_f) === null || _ctx$active_f3 === void 0 ? void 0 : _ctx$active_f3.sheetId) || ctx.formulaCache.rangetosheet;
|
|
38989
39041
|
if (ctx.config.merge != null && "".concat(rf, "_").concat(cf) in ctx.config.merge) {
|
|
38990
39042
|
range = getRangetxt(ctx, ctx.currentSheetId, {
|
|
38991
39043
|
column: [cf, cf],
|
|
@@ -39346,7 +39398,7 @@ function functionCopy(ctx, txt, mode, step) {
|
|
|
39346
39398
|
squote: 0,
|
|
39347
39399
|
dquote: 0
|
|
39348
39400
|
};
|
|
39349
|
-
var
|
|
39401
|
+
var _loop2 = function _loop2() {
|
|
39350
39402
|
var s = funcstack[i];
|
|
39351
39403
|
var nextS = funcstack[i + 1];
|
|
39352
39404
|
if (s === "{" && nextS === "{") {
|
|
@@ -39454,7 +39506,7 @@ function functionCopy(ctx, txt, mode, step) {
|
|
|
39454
39506
|
i += 1;
|
|
39455
39507
|
};
|
|
39456
39508
|
while (i < funcstack.length) {
|
|
39457
|
-
if (
|
|
39509
|
+
if (_loop2()) continue;
|
|
39458
39510
|
}
|
|
39459
39511
|
return function_str;
|
|
39460
39512
|
}
|
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
import type { Cell, Rect, Selection } from "../types";
|
|
2
2
|
import { Context } from "../context";
|
|
3
|
+
type FormulaParseEntry = {
|
|
4
|
+
f: string;
|
|
5
|
+
ranges: any[];
|
|
6
|
+
};
|
|
7
|
+
type FormulaParseCacheStore = Record<string, Record<string, FormulaParseEntry>>;
|
|
3
8
|
export declare class FormulaCache {
|
|
4
9
|
parser: any;
|
|
5
10
|
func_selectedrange?: Selection;
|
|
@@ -25,6 +30,8 @@ export declare class FormulaCache {
|
|
|
25
30
|
execFunctionExist?: any[];
|
|
26
31
|
execFunctionGlobalData: any;
|
|
27
32
|
_lastDataRowCache: Record<string, number> | null;
|
|
33
|
+
formulaParseCache: FormulaParseCacheStore | null;
|
|
34
|
+
formulaParseCacheSignature: string | null;
|
|
28
35
|
constructor();
|
|
29
36
|
tryGetCellAsNumber(cell: Cell): string | number | boolean | null;
|
|
30
37
|
}
|
|
@@ -53,3 +60,4 @@ export declare function rangeDrag(ctx: Context, e: MouseEvent, cellInput: HTMLDi
|
|
|
53
60
|
export declare function rangeDragColumn(ctx: Context, e: MouseEvent, cellInput: HTMLDivElement, scrollLeft: number, scrollTop: number, container: HTMLDivElement, fxInput?: HTMLDivElement | null): void;
|
|
54
61
|
export declare function rangeDragRow(ctx: Context, e: MouseEvent, cellInput: HTMLDivElement, scrollLeft: number, scrollTop: number, container: HTMLDivElement, fxInput?: HTMLDivElement | null): void;
|
|
55
62
|
export declare function functionCopy(ctx: Context, txt: string, mode: string, step: number): string;
|
|
63
|
+
export {};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@leankylin-sheet/core",
|
|
3
|
-
"version": "7.0.
|
|
3
|
+
"version": "7.0.40",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"module": "dist/index.esm.js",
|
|
6
6
|
"typings": "dist/index.d.ts",
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"build": "father-build"
|
|
14
14
|
},
|
|
15
15
|
"dependencies": {
|
|
16
|
-
"@leankylin-sheet/formula-parser": "7.0.
|
|
16
|
+
"@leankylin-sheet/formula-parser": "7.0.40",
|
|
17
17
|
"dayjs": "^1.11.0",
|
|
18
18
|
"immer": "^9.0.12",
|
|
19
19
|
"lodash": "^4.17.21",
|