@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
|
@@ -11433,7 +11433,7 @@ class LogicalFormulas extends FormulaModuleBase {
|
|
|
11433
11433
|
const condUpper = condition.toUpperCase();
|
|
11434
11434
|
const parsedVal = this.parent.parseFloat(condition);
|
|
11435
11435
|
if (condUpper === this.parent.trueValue || (parsedVal < 0 || parsedVal > 0)) {
|
|
11436
|
-
if (nestedFormula && argArr[1].includes(':')) {
|
|
11436
|
+
if (nestedFormula && argArr[1].includes(':') && this.parent.isCellReference(argArr[1])) {
|
|
11437
11437
|
cellValues = this.parent.getCellCollection(argArr[1]);
|
|
11438
11438
|
for (let i = 0; i < cellValues.length; i++) {
|
|
11439
11439
|
cellVal = this.parent.getValueFromArg(cellValues[i]);
|
|
@@ -11449,7 +11449,7 @@ class LogicalFormulas extends FormulaModuleBase {
|
|
|
11449
11449
|
if (isNullOrUndefined(argArr[2])) {
|
|
11450
11450
|
return this.parent.falseValue;
|
|
11451
11451
|
}
|
|
11452
|
-
if (nestedFormula && argArr[2].includes(':')) {
|
|
11452
|
+
if (nestedFormula && argArr[2].includes(':') && this.parent.isCellReference(argArr[2])) {
|
|
11453
11453
|
cellValues = this.parent.getCellCollection(argArr[2]);
|
|
11454
11454
|
for (let i = 0; i < cellValues.length; i++) {
|
|
11455
11455
|
cellVal = this.parent.getValueFromArg(cellValues[i]);
|
|
@@ -18906,7 +18906,7 @@ class Parser {
|
|
|
18906
18906
|
computeForceCalculate: false
|
|
18907
18907
|
};
|
|
18908
18908
|
}
|
|
18909
|
-
formulaAutoCorrection(formula, args
|
|
18909
|
+
formulaAutoCorrection(formula, args) {
|
|
18910
18910
|
const arithemeticArr = ['*', '+', '-', '/', '^', '&'];
|
|
18911
18911
|
const logicalSym = ['>', '=', '<'];
|
|
18912
18912
|
let i = 0;
|
|
@@ -19019,7 +19019,7 @@ class Parser {
|
|
|
19019
19019
|
if (formula[i] === '/' || formula[i] === '*' || formula[i] === '^') {
|
|
19020
19020
|
form = form + formula[i];
|
|
19021
19021
|
}
|
|
19022
|
-
if (formula[i] === '&'
|
|
19022
|
+
if (formula[i] === '&') {
|
|
19023
19023
|
form = form + formula[i];
|
|
19024
19024
|
}
|
|
19025
19025
|
i = i + 1;
|
|
@@ -19732,7 +19732,7 @@ class Parser {
|
|
|
19732
19732
|
try {
|
|
19733
19733
|
let args;
|
|
19734
19734
|
substr = substr.split('(').join('').split(')').join('');
|
|
19735
|
-
substr = '(' + this.formulaAutoCorrection(substr, args
|
|
19735
|
+
substr = '(' + this.formulaAutoCorrection(substr, args) + ')';
|
|
19736
19736
|
}
|
|
19737
19737
|
catch (ex) {
|
|
19738
19738
|
const args = {
|
|
@@ -22519,7 +22519,8 @@ let Calculate = class Calculate extends Base {
|
|
|
22519
22519
|
}
|
|
22520
22520
|
}
|
|
22521
22521
|
while (i < pFormula.length && (this.isDigit(pFormula[i]) ||
|
|
22522
|
-
(pFormula[i] === decimalSep || pFormula[i] === '.')
|
|
22522
|
+
(pFormula[i] === decimalSep || pFormula[i] === '.') ||
|
|
22523
|
+
pFormula[i] === '\n')) {
|
|
22523
22524
|
s += pFormula[i] === decimalSep ? '.' : pFormula[i];
|
|
22524
22525
|
i = i + 1;
|
|
22525
22526
|
}
|