@syncfusion/ej2-querybuilder 25.1.42 → 25.2.3

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

@@ -1440,12 +1440,22 @@ let QueryBuilder = class QueryBuilder extends Component {
     changeValue(i, args) {
         let element;
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        if (this.isNumInput && typeof args.value === 'number') {
+            this.isNumInput = false;
+            return;
+        }
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         if (args.element && args.element.classList.contains('e-multiselect')) {
             const multiSelectArgs = args;
             element = multiSelectArgs.element;
         }
         else if (args.event) {
             element = args.event.target;
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        }
+        else if (args.type === 'input' && args.currentTarget) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            element = args.currentTarget;
         }
         else {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -1502,6 +1512,14 @@ let QueryBuilder = class QueryBuilder extends Component {
         }
         else {
             value = args.value;
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            if (args.type === 'input' && args.currentTarget) {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                value = Number(args.currentTarget.value);
+                const numericTextBoxObj = getInstance(args.currentTarget, NumericTextBox);
+                numericTextBoxObj.value = value;
+                this.isNumInput = true;
+            }
         }
         if (args.name === 'input' && this.immediateModeDelay) {
             window.clearInterval(this.timer);
@@ -2343,6 +2361,7 @@ let QueryBuilder = class QueryBuilder extends Component {
             const numeric = new NumericTextBox(numericTxt);
             numeric.appendTo('#' + parentId + '_valuekey' + idx);
             numeric.element.setAttribute('aria-label', itemData.label + ' ' + 'Value');
+            numeric.element.oninput = this.changeValue.bind(this, idx);
         }
     }
     processValueString(value, type) {
@@ -3154,7 +3173,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         if (this.portals && this.portals.length) {
             this.clearQBTemplate();
         }
-        popupElement = document.querySelectorAll('.qb-dropdownlist');
+        popupElement = document.querySelectorAll('.qb-dropdownlist.e-popup');
         if (popupElement) {
             for (i = 0; i < popupElement.length; i++) {
                 popupElement[i].remove();
@@ -5238,6 +5257,11 @@ let QueryBuilder = class QueryBuilder extends Component {
                     }
                 }
             }
+            else if (sqlString[matchValue.length] && (sqlString[matchValue.length] !== ')') &&
+                !this.checkCondition(sqlString, matchValue)) {
+                matchValue = this.getSingleQuoteString(sqlString, matchValue);
+            }
+            // end
             this.parser.push(['String', matchValue]);
             return matchValue.length;
         }
@@ -5267,6 +5291,27 @@ let QueryBuilder = class QueryBuilder extends Component {
         }
         return 1;
     }
+    checkCondition(sqlString, matchValue) {
+        if (sqlString.slice(matchValue.length + 1, matchValue.length + 4) === 'AND' ||
+            sqlString.slice(matchValue.length + 1, matchValue.length + 3) === 'OR') {
+            return true;
+        }
+        return false;
+    }
+    getSingleQuoteString(sqlString, matchValue) {
+        if (sqlString[matchValue.length] && (sqlString[matchValue.length] !== ')') &&
+            !this.checkCondition(sqlString, matchValue) && sqlString[matchValue.length] !== ',') {
+            const tempStr = sqlString.replace(matchValue, '');
+            // eslint-disable-next-line
+            if (isNullOrUndefined(/^'((?:[^\\']+?|\\.|'')*)'(?!')/.exec(tempStr))) {
+                // eslint-disable-next-line
+                let parsedValue = /^((?:[^\\']+?|\\.|'')*)'(?!')/.exec(tempStr)[0];
+                matchValue += parsedValue;
+                matchValue = this.getSingleQuoteString(sqlString, matchValue);
+            }
+        }
+        return matchValue;
+    }
     checkLiteral() {
         const lastParser = this.parser[this.parser.length - 1];
         if (!lastParser) {
@@ -5522,7 +5567,11 @@ let QueryBuilder = class QueryBuilder extends Component {
                     }
                     else {
                         rule.type = 'string';
-                        rule.value = parser[i + 2][1] ? parser[i + 2][1].replace(/'/g, '') : parser[i + 2][1];
+                        let val = parser[i + 2][1];
+                        if (val && val[0] === '\'') {
+                            val = val.substring(1, val.length - 1);
+                        }
+                        rule.value = val;
                     }
                     rule.type = this.getTypeFromColumn(rule);
                 }
@@ -5572,6 +5621,27 @@ let QueryBuilder = class QueryBuilder extends Component {
         }
         return rules;
     }
+    getValueFromParser(parser, idx) {
+        let value = '';
+        let k;
+        for (k = idx; k < parser.length; k++) {
+            if (parser[k][0] !== 'String' || parser[k][1] === ',' || parser[k][1] === ', ') {
+                break;
+            }
+            else {
+                if (value !== '') {
+                    idx += 1;
+                }
+                if (parser[k][1] !== null) {
+                    value += parser[k][1];
+                }
+                else {
+                    value = null;
+                }
+            }
+        }
+        return { value: value, idx: idx };
+    }
     /**
      * Clone the Group
      *