@syncfusion/ej2-calculate 35.1.37 → 35.1.39

package/dist/es6/ej2-calculate.es2015.js

@@ -19701,6 +19701,13 @@ class Parser {
                             const criteriaStr = this.parent.substring(substr, leftBraceIdx, substr.indexOf('}') - leftBraceIdx + 1);
                             substr = substr.split(criteriaStr).join(criteriaStr.split(argsSep).join(this.parent.tic + this.parent.tic));
                         }
+                        else if ((libFormula === 'VLOOKUP' || libFormula === 'HLOOKUP') && substr.includes('{')) {
+                            const leftBraceIdx = substr.indexOf('{');
+                            const criteriaStr = this.parent.substring(substr, leftBraceIdx, substr.indexOf('}') - leftBraceIdx + 1);
+                            const protectedStr = criteriaStr.split(';').join(this.parent.tic + 'RSEP' + this.parent.tic)
+                                .split(argsSep).join(this.parent.tic + 'CSEP' + this.parent.tic);
+                            substr = substr.split(criteriaStr).join(protectedStr);
+                        }
                     }
                     try {
                         let args;
@@ -21633,7 +21640,52 @@ let Calculate = class Calculate extends Base {
                 return errorStrings[CommonErrors.Value];
             }
         }
-        const rangeArr = argArr[1].split(':');
+        const rangeArg = argArr[1];
+        const rowSepMarker = this.tic + 'RSEP' + this.tic;
+        const isInlineArray = rangeArg.includes(rowSepMarker) ||
+            (rangeArg.startsWith('(') && rangeArg.endsWith(')') && rangeArg.includes(rowSepMarker));
+        if (isInlineArray) {
+            const innerStr = rangeArg.startsWith('(') && rangeArg.endsWith(')')
+                ? rangeArg.substring(1, rangeArg.length - 1) : rangeArg;
+            const rowBoundary = this.tic + 'RSEP' + this.tic;
+            const colBoundary = this.tic + 'CSEP' + this.tic;
+            const rows = innerStr.split(rowBoundary).map((rowStr) => {
+                return rowStr.split(colBoundary).map((cell) => {
+                    if (cell.startsWith(this.tic) && cell.endsWith(this.tic)) {
+                        return cell.substring(1, cell.length - 1);
+                    }
+                    if (this.isCellReference(cell.trim())) {
+                        return this.getValueFromArg(cell.trim());
+                    }
+                    return cell.trim();
+                });
+            });
+            const numRows = rows.length;
+            const numCols = rows[0] ? rows[0].length : 0;
+            const matchColIdx = colNumIdx - 1;
+            if (isVlookup && numCols <= matchColIdx) {
+                return errorStrings[CommonErrors.Ref];
+            }
+            if (!isVlookup && numRows <= matchColIdx) {
+                return errorStrings[CommonErrors.Ref];
+            }
+            const lookupValUpper = lookupValue.toUpperCase();
+            const iterCount = isVlookup ? numRows : numCols;
+            for (let r = 0; r < iterCount; r++) {
+                const cellVal = (isVlookup ? rows[r][0] : rows[0][r]) || '';
+                const isMatch = this.isNumber(lookupValue) && this.isNumber(cellVal)
+                    ? this.parseFloat(lookupValue) === this.parseFloat(cellVal) : cellVal.toUpperCase() === lookupValUpper;
+                if (isMatch) {
+                    const matchVal = isVlookup
+                        ? (rows[r][matchColIdx] !== undefined ? rows[r][matchColIdx] : '')
+                        : (rows[matchColIdx] !== undefined && rows[matchColIdx][r] !== undefined
+                            ? rows[matchColIdx][r] : '');
+                    return matchVal !== '' ? matchVal : '';
+                }
+            }
+            return errorStrings[CommonErrors.NA];
+        }
+        const rangeArr = rangeArg.split(':');
         let startIdx;
         let endIdx;
         let idx;
@@ -23245,8 +23297,8 @@ let Calculate = class Calculate extends Base {
         return { op, criteria };
     }
     processNestedFormula(pText, sFormula, fResult) {
-        if (fResult && !fResult.toString().includes('"')) {
-            const formulaEndIdx = pText.indexOf(sFormula) + sFormula.length;
+        if (!fResult.toString().includes('"')) {
+            const formulaEndIdx = pText.lastIndexOf(sFormula) + sFormula.length;
             if (pText[formulaEndIdx] === '"' && this.getErrorStrings().indexOf(fResult.toString()) < 0 &&
                 !this.isNumber(fResult) && fResult !== this.trueValue && fResult !== this.falseValue) {
                 return pText.split(sFormula).join('"' + fResult + '"');