@syncfusion/ej2-querybuilder 20.3.59 → 20.4.38

package/src/query-builder/query-builder.d.ts

@@ -744,7 +744,7 @@ export declare class QueryBuilder extends Component<HTMLDivElement> implements I
      *
      * @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?: RuleModel, allowEscape?: boolean, sqlLocale?: boolean): string;

package/src/query-builder/query-builder.js

@@ -392,7 +392,7 @@ var QueryBuilder = /** @class */ (function (_super) {
                 if (sqlIdx > -1) {
                     var operator_1 = column.operators[j];
                     var operColl = Object.keys(operator_1);
-                    var values = operColl.map(function (key) { return operator_1[key]; }).join(',').split(',');
+                    var values = operColl.map(function (key) { return operator_1["" + key]; }).join(',').split(',');
                     var valueIdx = operColl.indexOf('value');
                     this_1.operators[values[valueIdx]] = values[sqlIdx];
                 }
@@ -789,6 +789,7 @@ var QueryBuilder = /** @class */ (function (_super) {
         var tooltip = new Tooltip({ content: this.l10n.getConstant('ValidationMessage'),
             position: 'BottomCenter', cssClass: 'e-querybuilder-error' });
         tooltip.appendTo(element);
+        // eslint-disable-next-line
         tooltip.open(element);
     };
     /**
@@ -846,8 +847,9 @@ var QueryBuilder = /** @class */ (function (_super) {
                     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)) {
                         var valElem = tempElem.querySelectorAll('.e-rule-value .e-control');
                         isValid = false;
@@ -925,7 +927,7 @@ var QueryBuilder = /** @class */ (function (_super) {
         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);
@@ -1809,29 +1811,29 @@ var QueryBuilder = /** @class */ (function (_super) {
                     for (var 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);
                 }
@@ -1845,9 +1847,9 @@ var QueryBuilder = /** @class */ (function (_super) {
         for (var 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;
     };
@@ -1859,28 +1861,28 @@ var QueryBuilder = /** @class */ (function (_super) {
         var isNested = field.indexOf(this.separator);
         var _loop_2 = function (i, iLen) {
             if (isNested === 0) {
-                value = dataSource[i][field];
+                value = dataSource[i]["" + field];
             }
             else {
                 nest = field.split(this_2.separator);
                 // eslint-disable-next-line @typescript-eslint/tslint/config
                 nest.forEach(function (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();
             }
             var 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;
@@ -2628,7 +2630,8 @@ var QueryBuilder = /** @class */ (function (_super) {
             var 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 = '';
@@ -3423,7 +3426,7 @@ var QueryBuilder = /** @class */ (function (_super) {
         EventHandler.remove(this.element, 'keydown', this.keyBoardHandler);
     };
     QueryBuilder.prototype.getParentGroup = function (target, isParent) {
-        var groupLevel = (target instanceof Element) ? this.levelColl[target.id] : this.levelColl[target];
+        var groupLevel = (target instanceof Element) ? this.levelColl[target.id] : this.levelColl["" + target];
         var len = isParent ? groupLevel.length - 1 : groupLevel.length;
         var rule = this.rule;
         for (var i = 0; i < len; i++) {
@@ -3585,6 +3588,7 @@ var QueryBuilder = /** @class */ (function (_super) {
                 err = [];
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 var error = 'error';
+                // eslint-disable-next-line
                 err[error] = error;
             }
             // eslint-enable
@@ -3746,6 +3750,9 @@ var QueryBuilder = /** @class */ (function (_super) {
                 else {
                     rule = { 'condition': rule.condition, 'rules': rule.rules };
                 }
+                if (rule.rules.length === 0) {
+                    rule = {};
+                }
             }
         }
         return rule;
@@ -3954,7 +3961,8 @@ var QueryBuilder = /** @class */ (function (_super) {
                 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 {
                         var value = ruleValue;
@@ -4438,89 +4446,90 @@ var QueryBuilder = /** @class */ (function (_super) {
                 queryStr += rulesNotCondition;
             }
         }
-        for (var j = 0, jLen = rules.rules.length; j < jLen; j++) {
-            if (rules.rules[j].rules) {
-                queryStr = this.getSqlString(rules.rules[j], enableEscape, queryStr, sqlLocale);
-            }
-            else {
-                var rule = rules.rules[j];
-                var valueStr = '';
-                var ruleOpertor = void 0;
-                ruleOpertor = sqlLocale ? this.sqlOperators[rule.operator] : this.operators[rule.operator];
-                if (rule.value instanceof Array) {
-                    if (rule.operator.toString().indexOf('between') > -1) {
-                        var 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 (var j = 0, jLen = rules.rules.length; j < jLen; j++) {
+                if (rules.rules[j].rules) {
+                    queryStr = this.getSqlString(rules.rules[j], enableEscape, queryStr, sqlLocale);
+                }
+                else {
+                    var rule = rules.rules[j];
+                    var valueStr = '';
+                    var ruleOpertor = sqlLocale ? this.sqlOperators[rule.operator] : this.operators[rule.operator];
+                    if (rule.value instanceof Array) {
+                        if (rule.operator.toString().indexOf('between') > -1) {
+                            var 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 (var 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 (var 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) {
@@ -4567,7 +4576,7 @@ var QueryBuilder = /** @class */ (function (_super) {
      *
      * @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.
      */
     QueryBuilder.prototype.getSqlFromRules = function (rule, allowEscape, sqlLocale) {
@@ -4611,6 +4620,7 @@ var QueryBuilder = /** @class */ (function (_super) {
         var matchValue;
         for (var 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()]);
@@ -4621,6 +4631,7 @@ var QueryBuilder = /** @class */ (function (_super) {
         if (!lastPasrser || (lastPasrser && lastPasrser[0] !== 'Literal')) {
             for (var 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()]);
@@ -4630,6 +4641,7 @@ var QueryBuilder = /** @class */ (function (_super) {
         }
         for (var 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()]);
@@ -4673,30 +4685,39 @@ var QueryBuilder = /** @class */ (function (_super) {
             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;
@@ -4722,6 +4743,7 @@ var QueryBuilder = /** @class */ (function (_super) {
             return true;
         }
         else {
+            // eslint-disable-next-line
             if (/^[0-9]+(\.[0-9]+)?/.exec(sqlString)) {
                 var secParser = this.parser[this.parser.length - 2];
                 var betweenParser = this.parser[this.parser.length - 3];
@@ -4779,7 +4801,7 @@ var QueryBuilder = /** @class */ (function (_super) {
                 return 'equal';
             }
         }
-        return operators[operator];
+        return operators["" + operator];
     };
     QueryBuilder.prototype.getTypeFromColumn = function (rules) {
         var columnData = this.getColumn(rules.field);