@syncfusion/ej2-querybuilder 20.3.59 → 20.4.40

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

@@ -153,7 +153,10 @@ let QueryBuilder = class QueryBuilder extends Component {
         let bodyElem = this.element.querySelector('.e-group-body');
         const inputElement = this.element.querySelectorAll('input.e-control');
         for (let i = 0, len = inputElement.length; i < len; i++) {
-            if (inputElement[i].parentElement.className.indexOf('e-tooltip') > -1) {
+            if (inputElement[i].className.indexOf('e-tooltip') > -1) {
+                getComponent(inputElement[i], 'tooltip').destroy();
+            }
+            else if (inputElement[i].parentElement.className.indexOf('e-tooltip') > -1) {
                 getComponent(inputElement[i].parentElement, 'tooltip').destroy();
             }
         }
@@ -337,7 +340,7 @@ let QueryBuilder = class QueryBuilder extends Component {
                 if (sqlIdx > -1) {
                     const operator = column.operators[j];
                     const operColl = Object.keys(operator);
-                    const values = operColl.map((key) => operator[key]).join(',').split(',');
+                    const values = operColl.map((key) => operator[`${key}`]).join(',').split(',');
                     const valueIdx = operColl.indexOf('value');
                     this.operators[values[valueIdx]] = values[sqlIdx];
                 }
@@ -728,6 +731,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         const tooltip = new Tooltip({ content: this.l10n.getConstant('ValidationMessage'),
             position: 'BottomCenter', cssClass: 'e-querybuilder-error' });
         tooltip.appendTo(element);
+        // eslint-disable-next-line
         tooltip.open(element);
     }
     /**
@@ -751,23 +755,25 @@ let QueryBuilder = class QueryBuilder extends Component {
             let tempElem;
             let rule;
             const ruleElemCln = this.element.querySelectorAll('.e-rule-container');
-            let validateRule;
             for (i = 0, len = ruleElemCln.length; i < len; i++) {
+                let validateRule;
                 groupElem = closest(ruleElemCln[i], '.e-group-container');
                 rule = this.getParentGroup(groupElem);
                 index = 0;
                 indexElem = tempElem = ruleElemCln[i];
                 if (this.fieldMode === 'DropdownTree') {
-                    dropDownTreeObj = getComponent(ruleElemCln[i].querySelector('.e-rule-field input.e-control'), 'dropdowntree');
-                    if (dropDownTreeObj.value && dropDownTreeObj.value.length) {
+                    dropDownTreeObj = getComponent(ruleElemCln[i].querySelector('.e-rule-filter input.e-dropdowntree'), 'dropdowntree');
+                    if (dropDownTreeObj && dropDownTreeObj.value && dropDownTreeObj.value.length) {
                         this.selectedColumn = this.getColumn(dropDownTreeObj.value[0]);
                         validateRule = this.selectedColumn.validation;
                     }
                 }
                 else {
-                    dropDownObj = getComponent(ruleElemCln[i].querySelector('.e-rule-field input.e-control'), 'dropdownlist');
-                    this.selectedColumn = dropDownObj.getDataByValue(dropDownObj.value);
-                    validateRule = !isNullOrUndefined(dropDownObj.index) && this.selectedColumn.validation;
+                    dropDownObj = getComponent(ruleElemCln[i].querySelector('.e-rule-filter input.e-dropdownlist'), 'dropdownlist');
+                    if (dropDownObj && dropDownObj.value) {
+                        this.selectedColumn = dropDownObj.getDataByValue(dropDownObj.value);
+                        validateRule = !isNullOrUndefined(dropDownObj.index) && this.selectedColumn.validation;
+                    }
                 }
                 fieldElem = tempElem.querySelector('.e-rule-field input.e-control');
                 if (validateRule && validateRule.isRequired) {
@@ -785,8 +791,9 @@ let QueryBuilder = class QueryBuilder extends Component {
                     if (rule.rules[index].value instanceof Array) {
                         valArray = rule.rules[index].value;
                     }
-                    if (excludeOprs.indexOf(rule.rules[index].operator) < 0 && (isNullOrUndefined(rule.rules[index].value) &&
-                        rule.rules[index].type !== 'date') || rule.rules[index].value === '' ||
+                    if (excludeOprs.indexOf(rule.rules[index].operator) < 0 &&
+                        (isNullOrUndefined(rule.rules[index].value) &&
+                            rule.rules[index].type !== 'date') || rule.rules[index].value === '' ||
                         (rule.rules[index].value instanceof Array && valArray.length < 1)) {
                         const valElem = tempElem.querySelectorAll('.e-rule-value .e-control');
                         isValid = false;
@@ -809,8 +816,8 @@ let QueryBuilder = class QueryBuilder extends Component {
                 else if ((dropDownObj && dropDownObj.element && isNullOrUndefined(dropDownObj.index)) ||
                     (dropDownTreeObj && dropDownTreeObj.element && (isNullOrUndefined(dropDownTreeObj.value) ||
                         dropDownTreeObj.value.length < 1))) {
-                    if (fieldElem.parentElement.className.indexOf('e-tooltip') < 0) {
-                        this.renderToolTip(fieldElem.parentElement);
+                    if (fieldElem.className.indexOf('e-tooltip') < 0) {
+                        this.renderToolTip(fieldElem);
                     }
                     isValid = false;
                 }
@@ -864,7 +871,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         groupElem.appendChild(grpBodyElem);
         // create button group in OR and AND process
         if (!this.headerTemplate) {
-            glueElem = this.createElement('div', { attrs: { class: 'e-lib e-btn-group' } });
+            glueElem = this.createElement('div', { attrs: { class: 'e-lib e-btn-group', role: 'group' } });
             if (this.enableNotCondition) {
                 inputElem = this.createElement('button', { attrs: { type: 'button', class: 'e-qb-toggle' } });
                 glueElem.appendChild(inputElem);
@@ -1469,6 +1476,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         }
     }
     createSubFields(filterElem, rule, tempRule, ddlArgs) {
+        let subFieldValue = false;
         const fieldElem = closest(filterElem, '.e-rule-field');
         const tempElem = this.createElement('div', { attrs: { class: 'e-rule-sub-filter', id: 'subfilter' + this.subFilterCounter } });
         fieldElem.insertBefore(tempElem, fieldElem.querySelector('.e-rule-operator'));
@@ -1498,6 +1506,7 @@ let QueryBuilder = class QueryBuilder extends Component {
                 if (rule.field === subField[i].field || rule.field.indexOf(subField[i].field) > -1) {
                     dropDownList.value = subField[i].field;
                     this.selectedColumn = subField[i];
+                    subFieldValue = true;
                     break;
                 }
             }
@@ -1506,7 +1515,10 @@ let QueryBuilder = class QueryBuilder extends Component {
         this.subFieldElem = subFieldElem;
         // eslint-disable-next-line
         ddlArgs.itemData = ddlArgs.itemData;
-        if (!this.isImportRules) {
+        if (!this.isImportRules || (!subFieldValue && this.selectedColumn.columns)) {
+            if (!subFieldValue && this.isImportRules) {
+                dropDownList.value = null;
+            }
             this.selectedColumn = this.selectedColumn.columns[0];
         }
         if (!this.selectedColumn.columns) {
@@ -1743,29 +1755,29 @@ let QueryBuilder = class QueryBuilder extends Component {
                     for (let j = 0, jLen = fieldColl.length; j < jLen; j++) {
                         fieldStr = fieldColl[j];
                         if (fieldColl.length === (j + 1)) {
-                            value = dataObj[fieldStr];
-                            if (Number(dataObj[fieldStr]) === dataObj[fieldStr] && dataObj[fieldStr] % 1 !== 0) {
-                                value = dataObj[fieldStr].toString();
+                            value = dataObj[`${fieldStr}`];
+                            if (Number(dataObj[`${fieldStr}`]) === dataObj[`${fieldStr}`] && dataObj[`${fieldStr}`] % 1 !== 0) {
+                                value = dataObj[`${fieldStr}`].toString();
                             }
                         }
                         else {
-                            dataObj = dataObj[fieldStr];
+                            dataObj = dataObj[`${fieldStr}`];
                         }
                     }
                 }
                 else {
-                    value = dataSource[i][field];
-                    if (Number(dataSource[i][field]) === dataSource[i][field] && dataSource[i][field] % 1 !== 0) {
-                        value = dataSource[i][field].toString();
+                    value = dataSource[i][`${field}`];
+                    if (Number(dataSource[i][`${field}`]) === dataSource[i][`${field}`] && dataSource[i][`${field}`] % 1 !== 0) {
+                        value = dataSource[i][`${field}`].toString();
                     }
                 }
                 if (!(value in original)) {
-                    original[value] = 1;
+                    original[`${value}`] = 1;
                     if (fieldColl.length > 1) {
                         this.createNestedObject(data, fieldColl, value);
                     }
                     else {
-                        data[field] = value;
+                        data[`${field}`] = value;
                     }
                     result.push(data);
                 }
@@ -1779,9 +1791,9 @@ let QueryBuilder = class QueryBuilder extends Component {
         for (let k = 0; k < lastIndex; ++k) {
             key = fieldColl[k];
             if (!(key in obj)) {
-                obj[key] = {};
+                obj[`${key}`] = {};
             }
-            obj = obj[key];
+            obj = obj[`${key}`];
         }
         obj[fieldColl[lastIndex]] = value;
     }
@@ -1793,28 +1805,28 @@ let QueryBuilder = class QueryBuilder extends Component {
         const isNested = field.indexOf(this.separator);
         for (let i = 0, iLen = dataSource.length; i < iLen; i++) {
             if (isNested === 0) {
-                value = dataSource[i][field];
+                value = dataSource[i][`${field}`];
             }
             else {
                 nest = field.split(this.separator);
                 // eslint-disable-next-line @typescript-eslint/tslint/config
                 nest.forEach(element => {
                     if (value) {
-                        value = value[element];
+                        value = value[`${element}`];
                     }
                     else {
-                        value = dataSource[i][element];
+                        value = dataSource[i][`${element}`];
                     }
                 });
             }
-            if (Number(dataSource[i][field]) === dataSource[i][field] && dataSource[i][field] % 1 !== 0) {
-                value = dataSource[i][field].toString();
+            if (Number(dataSource[i][`${field}`]) === dataSource[i][`${field}`] && dataSource[i][`${field}`] % 1 !== 0) {
+                value = dataSource[i][`${field}`].toString();
             }
             const data = {};
             if (!(value in original)) {
-                original[value] = 1;
+                original[`${value}`] = 1;
                 if (isNested === 0) {
-                    data[field] = value;
+                    data[`${field}`] = value;
                 }
                 else {
                     data[nest[nest.length - 1]] = value;
@@ -2289,7 +2301,7 @@ let QueryBuilder = class QueryBuilder extends Component {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             prevItemData = this.getColumn(prevItemData.value);
         }
-        if (column.template && prevItemData && Object.keys(prevItemData).length < 4) {
+        if (column && column.template && prevItemData && Object.keys(prevItemData).length < 4) {
             prevItemData.template = column.template;
         }
         return prevItemData;
@@ -2345,7 +2357,9 @@ let QueryBuilder = class QueryBuilder extends Component {
                 this.validateValue(rule, closest(target, '.e-rule-container'));
                 this.destroyControls(target);
             }
-            itemData.template = column.template;
+            if (column) {
+                itemData.template = column.template;
+            }
             if (itemData.template) {
                 addClass([target.nextElementSibling], 'e-template-value');
                 itemData.template = column.template;
@@ -2556,7 +2570,8 @@ let QueryBuilder = class QueryBuilder extends Component {
             const column = this.fieldMode === 'DropdownTree' ? this.getColumn(dropDownObj.value[0])
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 : this.getColumn(dropDownObj.value);
-            if (!this.isImportRules && rule.rules[index].field && rule.rules[index].field.toLowerCase() !== column.field.toLowerCase()) {
+            if (!this.isImportRules && rule.rules[index].field &&
+                rule.rules[index].field.toLowerCase() !== column.field.toLowerCase()) {
                 if (!(ruleElem.querySelectorAll('.e-template')) && !(operator.indexOf('null') > -1)
                     || (operator.indexOf('empty') > -1)) {
                     rule.rules[index].value = '';
@@ -2592,8 +2607,8 @@ let QueryBuilder = class QueryBuilder extends Component {
             if (!this.isImportRules) {
                 this.trigger('change', eventsArgs);
             }
-            if (this.allowValidation && rule.rules[index].field && target.parentElement.className.indexOf('e-tooltip') > -1) {
-                getComponent(target.parentElement, 'tooltip').destroy();
+            if (this.allowValidation && rule.rules[index].field && target.className.indexOf('e-tooltip') > -1) {
+                getComponent(target, 'tooltip').destroy();
             }
             this.filterRules(beforeRules, this.getValidRules(this.rule), 'field');
         }
@@ -3349,7 +3364,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         EventHandler.remove(this.element, 'keydown', this.keyBoardHandler);
     }
     getParentGroup(target, isParent) {
-        const groupLevel = (target instanceof Element) ? this.levelColl[target.id] : this.levelColl[target];
+        const groupLevel = (target instanceof Element) ? this.levelColl[target.id] : this.levelColl[`${target}`];
         const len = isParent ? groupLevel.length - 1 : groupLevel.length;
         let rule = this.rule;
         for (let i = 0; i < len; i++) {
@@ -3509,6 +3524,7 @@ let QueryBuilder = class QueryBuilder extends Component {
                 err = [];
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 const error = 'error';
+                // eslint-disable-next-line
                 err[error] = error;
             }
             // eslint-enable
@@ -3670,6 +3686,9 @@ let QueryBuilder = class QueryBuilder extends Component {
                 else {
                     rule = { 'condition': rule.condition, 'rules': rule.rules };
                 }
+                if (rule.rules.length === 0) {
+                    rule = {};
+                }
             }
         }
         return rule;
@@ -3878,7 +3897,8 @@ let QueryBuilder = class QueryBuilder extends Component {
                 if (i === 0) {
                     if (isDateFilter || (oper.indexOf('in') > -1 || oper.indexOf('between') > -1 || oper.indexOf('null') > -1 ||
                         oper.indexOf('empty') > -1) && oper.indexOf('contains') < 0) {
-                        pred = isDateFilter ? this.datePredicate(ruleColl[i], ruleValue) : this.arrayPredicate(ruleColl[i]);
+                        pred = isDateFilter ? this.datePredicate(ruleColl[i], ruleValue) :
+                            this.arrayPredicate(ruleColl[i]);
                     }
                     else {
                         const value = ruleValue;
@@ -4361,89 +4381,90 @@ let QueryBuilder = class QueryBuilder extends Component {
                 queryStr += rulesNotCondition;
             }
         }
-        for (let j = 0, jLen = rules.rules.length; j < jLen; j++) {
-            if (rules.rules[j].rules) {
-                queryStr = this.getSqlString(rules.rules[j], enableEscape, queryStr, sqlLocale);
-            }
-            else {
-                const rule = rules.rules[j];
-                let valueStr = '';
-                let ruleOpertor;
-                ruleOpertor = sqlLocale ? this.sqlOperators[rule.operator] : this.operators[rule.operator];
-                if (rule.value instanceof Array) {
-                    if (rule.operator.toString().indexOf('between') > -1) {
-                        let ruleCondition = sqlLocale ? ' ' + this.l10n.getConstant('AND').toUpperCase() + ' ' : ' ' + 'AND' + ' ';
-                        if (rule.type === 'date' && !this.isDateFunction(rule.value[0])) {
-                            valueStr += '"' + rule.value[0] + '"' + ruleCondition + '"' + rule.value[1] + '"';
+        if (rules.rules) {
+            for (let j = 0, jLen = rules.rules.length; j < jLen; j++) {
+                if (rules.rules[j].rules) {
+                    queryStr = this.getSqlString(rules.rules[j], enableEscape, queryStr, sqlLocale);
+                }
+                else {
+                    const rule = rules.rules[j];
+                    let valueStr = '';
+                    const ruleOpertor = sqlLocale ? this.sqlOperators[rule.operator] : this.operators[rule.operator];
+                    if (rule.value instanceof Array) {
+                        if (rule.operator.toString().indexOf('between') > -1) {
+                            const ruleCondition = sqlLocale ? ' ' + this.l10n.getConstant('AND').toUpperCase() + ' ' : ' ' + 'AND' + ' ';
+                            if (rule.type === 'date' && !this.isDateFunction(rule.value[0])) {
+                                valueStr += '"' + rule.value[0] + '"' + ruleCondition + '"' + rule.value[1] + '"';
+                            }
+                            else {
+                                valueStr += rule.value[0] + ruleCondition + rule.value[1];
+                            }
                         }
                         else {
-                            valueStr += rule.value[0] + ruleCondition + rule.value[1];
+                            if (typeof rule.value[0] === 'string' && rule.value !== null) {
+                                valueStr += '("' + rule.value[0] + '"';
+                                for (let k = 1, kLen = rule.value.length; k < kLen; k++) {
+                                    valueStr += ',"' + rule.value[k] + '"';
+                                }
+                                valueStr += ')';
+                            }
+                            else {
+                                valueStr += '(' + rule.value + ')';
+                            }
                         }
                     }
                     else {
-                        if (typeof rule.value[0] === 'string' && rule.value !== null) {
-                            valueStr += '("' + rule.value[0] + '"';
-                            for (let k = 1, kLen = rule.value.length; k < kLen; k++) {
-                                valueStr += ',"' + rule.value[k] + '"';
-                            }
-                            valueStr += ')';
+                        if (rule.operator.toString().indexOf('startswith') > -1) {
+                            valueStr += rule.value ? '("' + rule.value + '%")' : '(' + rule.value + ')';
+                        }
+                        else if (rule.operator.toString().indexOf('endswith') > -1) {
+                            valueStr += rule.value ? '("%' + rule.value + '")' : '(' + rule.value + ')';
+                        }
+                        else if (rule.operator.toString().indexOf('contains') > -1) {
+                            valueStr += rule.value ? '("%' + rule.value + '%")' : '(' + rule.value + ')';
                         }
                         else {
-                            valueStr += '(' + rule.value + ')';
+                            if (rule.type === 'number' || typeof rule.value === 'boolean' || rule.value === null) {
+                                valueStr += rule.value;
+                            }
+                            else {
+                                valueStr += '"' + rule.value + '"';
+                            }
                         }
                     }
-                }
-                else {
-                    if (rule.operator.toString().indexOf('startswith') > -1) {
-                        valueStr += rule.value ? '("' + rule.value + '%")' : '(' + rule.value + ')';
-                    }
-                    else if (rule.operator.toString().indexOf('endswith') > -1) {
-                        valueStr += rule.value ? '("%' + rule.value + '")' : '(' + rule.value + ')';
-                    }
-                    else if (rule.operator.toString().indexOf('contains') > -1) {
-                        valueStr += rule.value ? '("%' + rule.value + '%")' : '(' + rule.value + ')';
-                    }
-                    else {
-                        if (rule.type === 'number' || typeof rule.value === 'boolean' || rule.value === null) {
-                            valueStr += rule.value;
+                    if (rule.operator.toString().indexOf('null') > -1 || (rule.operator.toString().indexOf('empty') > -1)) {
+                        if (enableEscape) {
+                            rule.field = '`' + rule.field + '`';
                         }
                         else {
-                            valueStr += '"' + rule.value + '"';
+                            if (rule.field.indexOf(' ') > -1) {
+                                rule.field = '"' + rule.field + '"';
+                            }
                         }
-                    }
-                }
-                if (rule.operator.toString().indexOf('null') > -1 || (rule.operator.toString().indexOf('empty') > -1)) {
-                    if (enableEscape) {
-                        rule.field = '`' + rule.field + '`';
+                        queryStr += rule.field + ' ' + ruleOpertor;
                     }
                     else {
-                        if (rule.field.indexOf(' ') > -1) {
-                            rule.field = '"' + rule.field + '"';
+                        if (enableEscape) {
+                            rule.field = '`' + rule.field + '`';
                         }
-                    }
-                    queryStr += rule.field + ' ' + ruleOpertor;
-                }
-                else {
-                    if (enableEscape) {
-                        rule.field = '`' + rule.field + '`';
-                    }
-                    else {
-                        if (rule.field.indexOf(' ') > -1) {
-                            rule.field = '"' + rule.field + '"';
+                        else {
+                            if (rule.field.indexOf(' ') > -1) {
+                                rule.field = '"' + rule.field + '"';
+                            }
                         }
+                        queryStr += rule.field + ' ' + ruleOpertor + ' ' + valueStr;
+                    }
+                    if (rule.condition && rule.condition !== '') {
+                        condition = rule.condition;
                     }
-                    queryStr += rule.field + ' ' + ruleOpertor + ' ' + valueStr;
-                }
-                if (rule.condition && rule.condition !== '') {
-                    condition = rule.condition;
                 }
-            }
-            if (j !== jLen - 1) {
-                if (condition === '') {
-                    condition = rules.rules[j].condition;
+                if (j !== jLen - 1) {
+                    if (condition === '') {
+                        condition = rules.rules[j].condition;
+                    }
+                    condition = sqlLocale ? this.l10n.getConstant(condition.toUpperCase()).toUpperCase() : condition.toUpperCase();
+                    queryStr += ' ' + condition + ' ';
                 }
-                condition = sqlLocale ? this.l10n.getConstant(condition.toUpperCase()).toUpperCase() : condition.toUpperCase();
-                queryStr += ' ' + condition + ' ';
             }
         }
         if (!isRoot) {
@@ -4490,7 +4511,7 @@ let QueryBuilder = class QueryBuilder extends Component {
      *
      * @param {RuleModel} rule - 'rule' to be passed to get the sql.
      * @param {boolean} allowEscape - Set `true` if it exclude the escape character.
-     * @param {boolean} sqlLocale - Set `true` if Localization for Sql query.
+     *  @param {boolean} sqlLocale - Set `true` if Localization for Sql query.
      * @returns {object} - Sql query from rules.
      */
     getSqlFromRules(rule, allowEscape, sqlLocale) {
@@ -4534,6 +4555,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         let matchValue;
         for (let i = 0, iLen = operators.length; i < iLen; i++) {
             regexStr = /^\w+$/.test(operators[i]) ? '\\b' : '';
+            // eslint-disable-next-line
             regex = new RegExp('^(' + operators[i] + ')' + regexStr, 'ig');
             if (regex.exec(sqlString)) {
                 this.parser.push(['Operators', operators[i].toLowerCase()]);
@@ -4544,6 +4566,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         if (!lastPasrser || (lastPasrser && lastPasrser[0] !== 'Literal')) {
             for (let i = 0, iLen = conditions.length; i < iLen; i++) {
                 regexStr = /^\w+$/.test(conditions[i]) ? '\\b' : '';
+                // eslint-disable-next-line
                 regex = new RegExp('^(' + conditions[i] + ')' + regexStr, 'ig');
                 if (regex.exec(sqlString)) {
                     this.parser.push(['Conditions', conditions[i].toLowerCase()]);
@@ -4553,6 +4576,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         }
         for (let i = 0, iLen = subOp.length; i < iLen; i++) {
             regexStr = /^\w+$/.test(subOp[i]) ? '\\b' : '';
+            // eslint-disable-next-line
             regex = new RegExp('^(' + subOp[i] + ')' + regexStr, 'ig');
             if (regex.exec(sqlString)) {
                 this.parser.push(['SubOperators', subOp[i].toLowerCase()]);
@@ -4596,30 +4620,39 @@ let QueryBuilder = class QueryBuilder extends Component {
             return matchValue.length + 2;
         }
         if (this.checkNumberLiteral(sqlString, sqlLocale)) {
+            // eslint-disable-next-line
             matchValue = /^[0-9]+(\.[0-9]+)?/.exec(sqlString)[0];
             this.parser.push(['Literal', matchValue]);
             return matchValue.length;
         }
         //String
+        // eslint-disable-next-line
         if (/^'((?:[^\\']+?|\\.|'')*)'(?!')/.exec(sqlString)) {
+            // eslint-disable-next-line
             matchValue = /^'((?:[^\\']+?|\\.|'')*)'(?!')/.exec(sqlString)[0];
             this.parser.push(['String', matchValue]);
             return matchValue.length;
         }
         //Double String
+        // eslint-disable-next-line
         if (/^"([^\\"]*(?:\\.[^\\"]*)*)"/.exec(sqlString)) {
+            // eslint-disable-next-line
             matchValue = /^"([^\\"]*(?:\\.[^\\"]*)*)"/.exec(sqlString)[0];
             this.parser.push(['DoubleString', matchValue]);
             return matchValue.length;
         }
         //Number
+        // eslint-disable-next-line
         if (/^[0-9]+(\.[0-9]+)?/.exec(sqlString)) {
+            // eslint-disable-next-line
             matchValue = /^[0-9]+(\.[0-9]+)?/.exec(sqlString)[0];
             this.parser.push(['Number', matchValue]);
             return matchValue.length;
         }
         //Negative Number
+        // eslint-disable-next-line
         if (/^-?[0-9]+(\.[0-9]+)?/.exec(sqlString)) {
+            // eslint-disable-next-line
             matchValue = /^-?[0-9]+(\.[0-9]+)?/.exec(sqlString)[0];
             this.parser.push(['Number', matchValue]);
             return matchValue.length;
@@ -4645,13 +4678,14 @@ let QueryBuilder = class QueryBuilder extends Component {
             return true;
         }
         else {
+            // eslint-disable-next-line
             if (/^[0-9]+(\.[0-9]+)?/.exec(sqlString)) {
                 const secParser = this.parser[this.parser.length - 2];
                 const betweenParser = this.parser[this.parser.length - 3];
                 if (lastParser[0] === 'Left' && (secParser && secParser[0] === 'Conditions')) {
                     return true;
                 }
-                let betweenOperator = sqlLocale ? this.l10n.getConstant('Between').toLowerCase() : 'between';
+                const betweenOperator = sqlLocale ? this.l10n.getConstant('Between').toLowerCase() : 'between';
                 if (lastParser[0] === 'Conditions' && (betweenParser && betweenParser[1].indexOf(betweenOperator) < 0)) {
                     return true;
                 }
@@ -4666,7 +4700,7 @@ let QueryBuilder = class QueryBuilder extends Component {
             'is empty': 'isempty', 'is null': 'isnull', 'is not null': 'isnotnull', 'is not empty': 'isnotempty'
         };
         if (sqlLocale) {
-            let localeOperator = Object.keys(this.sqlOperators);
+            const localeOperator = Object.keys(this.sqlOperators);
             for (let i = 0; i < localeOperator.length; i++) {
                 if (this.sqlOperators[localeOperator[i]] === operator.toUpperCase()) {
                     if (value && value.indexOf('%') === 0 && value[value.length - 1] === '%') {
@@ -4702,7 +4736,7 @@ let QueryBuilder = class QueryBuilder extends Component {
                 return 'equal';
             }
         }
-        return operators[operator];
+        return operators[`${operator}`];
     }
     getTypeFromColumn(rules) {
         const columnData = this.getColumn(rules.field);