@syncfusion/ej2-calculate 35.1.40 → 35.1.42
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/ej2-calculate.umd.min.js +2 -2
- package/dist/ej2-calculate.umd.min.js.map +1 -1
- package/dist/es6/ej2-calculate.es2015.js +7 -6
- package/dist/es6/ej2-calculate.es2015.js.map +1 -1
- package/dist/es6/ej2-calculate.es5.js +7 -6
- package/dist/es6/ej2-calculate.es5.js.map +1 -1
- package/dist/global/ej2-calculate.min.js +2 -2
- package/dist/global/ej2-calculate.min.js.map +1 -1
- package/dist/global/index.d.ts +1 -1
- package/package.json +1 -1
- package/src/base/calculate.js +2 -1
- package/src/base/parser.js +3 -3
- package/src/formulas/logical.js +2 -2
|
@@ -12875,7 +12875,7 @@ var LogicalFormulas = /** @__PURE__ @class */ (function (_super) {
|
|
|
12875
12875
|
var condUpper = condition.toUpperCase();
|
|
12876
12876
|
var parsedVal = this.parent.parseFloat(condition);
|
|
12877
12877
|
if (condUpper === this.parent.trueValue || (parsedVal < 0 || parsedVal > 0)) {
|
|
12878
|
-
if (nestedFormula && argArr[1].includes(':')) {
|
|
12878
|
+
if (nestedFormula && argArr[1].includes(':') && this.parent.isCellReference(argArr[1])) {
|
|
12879
12879
|
cellValues = this.parent.getCellCollection(argArr[1]);
|
|
12880
12880
|
for (var i = 0; i < cellValues.length; i++) {
|
|
12881
12881
|
cellVal = this.parent.getValueFromArg(cellValues[i]);
|
|
@@ -12891,7 +12891,7 @@ var LogicalFormulas = /** @__PURE__ @class */ (function (_super) {
|
|
|
12891
12891
|
if (isNullOrUndefined(argArr[2])) {
|
|
12892
12892
|
return this.parent.falseValue;
|
|
12893
12893
|
}
|
|
12894
|
-
if (nestedFormula && argArr[2].includes(':')) {
|
|
12894
|
+
if (nestedFormula && argArr[2].includes(':') && this.parent.isCellReference(argArr[2])) {
|
|
12895
12895
|
cellValues = this.parent.getCellCollection(argArr[2]);
|
|
12896
12896
|
for (var i = 0; i < cellValues.length; i++) {
|
|
12897
12897
|
cellVal = this.parent.getValueFromArg(cellValues[i]);
|
|
@@ -21287,7 +21287,7 @@ var Parser = /** @__PURE__ @class */ (function () {
|
|
|
21287
21287
|
computeForceCalculate: false
|
|
21288
21288
|
};
|
|
21289
21289
|
};
|
|
21290
|
-
Parser.prototype.formulaAutoCorrection = function (formula, args
|
|
21290
|
+
Parser.prototype.formulaAutoCorrection = function (formula, args) {
|
|
21291
21291
|
var arithemeticArr = ['*', '+', '-', '/', '^', '&'];
|
|
21292
21292
|
var logicalSym = ['>', '=', '<'];
|
|
21293
21293
|
var i = 0;
|
|
@@ -21400,7 +21400,7 @@ var Parser = /** @__PURE__ @class */ (function () {
|
|
|
21400
21400
|
if (formula[i] === '/' || formula[i] === '*' || formula[i] === '^') {
|
|
21401
21401
|
form = form + formula[i];
|
|
21402
21402
|
}
|
|
21403
|
-
if (formula[i] === '&'
|
|
21403
|
+
if (formula[i] === '&') {
|
|
21404
21404
|
form = form + formula[i];
|
|
21405
21405
|
}
|
|
21406
21406
|
i = i + 1;
|
|
@@ -22114,7 +22114,7 @@ var Parser = /** @__PURE__ @class */ (function () {
|
|
|
22114
22114
|
try {
|
|
22115
22115
|
var args = void 0;
|
|
22116
22116
|
substr = substr.split('(').join('').split(')').join('');
|
|
22117
|
-
substr = '(' + this_1.formulaAutoCorrection(substr, args
|
|
22117
|
+
substr = '(' + this_1.formulaAutoCorrection(substr, args) + ')';
|
|
22118
22118
|
}
|
|
22119
22119
|
catch (ex) {
|
|
22120
22120
|
var args = {
|
|
@@ -24939,7 +24939,8 @@ var Calculate = /** @__PURE__ @class */ (function (_super) {
|
|
|
24939
24939
|
}
|
|
24940
24940
|
}
|
|
24941
24941
|
while (i < pFormula.length && (this.isDigit(pFormula[i]) ||
|
|
24942
|
-
(pFormula[i] === decimalSep || pFormula[i] === '.')
|
|
24942
|
+
(pFormula[i] === decimalSep || pFormula[i] === '.') ||
|
|
24943
|
+
pFormula[i] === '\n')) {
|
|
24943
24944
|
s += pFormula[i] === decimalSep ? '.' : pFormula[i];
|
|
24944
24945
|
i = i + 1;
|
|
24945
24946
|
}
|