@syncfusion/ej2-querybuilder 19.4.40 → 19.4.50

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

@@ -179,6 +179,9 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
         _this.isNotified = false;
         _this.isAddSuccess = false;
         _this.isNotValueChange = false;
+        _this.isFieldChange = false;
+        _this.isFieldClose = false;
+        _this.isDestroy = false;
         MultiSelect.Inject(CheckBoxSelection);
         return _this;
     }
@@ -658,8 +661,8 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
                     ddlField = {
                         dataSource: this.columns,
                         fields: this.fields, placeholder: this.l10n.getConstant('SelectField'),
-                        popupHeight: ((this.columns.length > 5) ? height : 'auto'),
-                        change: this.changeField.bind(this), value: rule ? ddlValue : null, open: this.popupOpen.bind(this)
+                        popupHeight: ((this.columns.length > 5) ? height : 'auto'), close: this.fieldClose.bind(this, ruleElem.id + '_filterkey'),
+                        change: this.changeField.bind(this), value: rule ? ddlValue : null, open: this.popupOpen.bind(this, true)
                     };
                     if (this.fieldModel) {
                         ddlField = __assign({}, ddlField, this.fieldModel);
@@ -681,11 +684,11 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
                     var ddlValue = this.isImportRules ? rule.field : rule.field;
                     ddlField = {
                         fields: { dataSource: this.columns,
-                            value: "field", text: "label", child: 'columns', expanded: "expanded" },
+                            value: 'field', text: 'label', child: 'columns', expanded: 'expanded' },
                         placeholder: this.l10n.getConstant('SelectField'), showClearButton: false,
                         popupHeight: ((this.columns.length > 5) ? height : 'auto'), changeOnBlur: false,
                         change: this.changeField.bind(this), value: this.isImportRules ? [ddlValue] : null,
-                        open: this.popupOpen.bind(this)
+                        open: this.popupOpen.bind(this, false)
                     };
                     if (this.fieldModel) {
                         ddlField = __assign({}, ddlField, this.fieldModel);
@@ -729,12 +732,19 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
         else {
             groupElem = closest(target, '.e-group-container');
             rules = this.getParentGroup(groupElem);
+            var custom = rule.custom;
             if (Object.keys(rule).length) {
                 rules.rules.push({
                     'field': rule.field, 'type': rule.type, 'label': rule.label, 'operator': rule.operator, value: rule.value
                 });
+                if (custom) {
+                    rules.rules[rules.rules.length - 1].custom = custom;
+                }
             }
             else {
+                if (custom) {
+                    newRule.custom = custom;
+                }
                 rules.rules.push(newRule);
             }
         }
@@ -1288,21 +1298,41 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
             }
         }
     };
+    QueryBuilder.prototype.fieldClose = function (id) {
+        if (this.isFieldChange || this.isDestroy) {
+            return;
+        }
+        this.isFieldClose = true;
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        var ddl = getComponent(id, 'dropdownlist');
+        var item = ddl.popupObj.element.querySelector('.e-active');
+        var itemData = ddl.getItemData();
+        ddl.value = itemData.value;
+        var customArgs = { element: ddl.element, value: itemData.value, isInteracted: true,
+            previousItemData: this.prevItemData, previousItem: null, item: item, itemData: itemData, event: null, e: null };
+        this.changeField(customArgs);
+        this.isFieldChange = false;
+    };
     QueryBuilder.prototype.changeField = function (args) {
         if (args.isInteracted) {
+            if (isNullOrUndefined(args.value)) {
+                return;
+            }
+            this.isFieldChange = true;
+            this.prevItemData = args.itemData;
             var fieldElem = closest(args.element, '.e-rule-filter') || closest(args.element, '.e-rule-sub-filter');
             var column = this.fieldMode === 'DropdownTree' ? this.getColumn(args.value[0]) : this.getColumn(args.value);
             if (this.fieldMode === 'DropdownTree' && fieldElem != null) {
-                var ddtElem = fieldElem.querySelector(".e-control");
+                var ddtElem = fieldElem.querySelector('.e-control');
                 var ddt = getComponent(ddtElem, 'dropdowntree');
                 if (column) {
-                    if (column.type == 'object') {
+                    if (column.type === 'object') {
                         // eslint-disable-next-line @typescript-eslint/no-explicit-any
                         ddt.value = args.oldValue;
                         ddt.dataBind();
                         // eslint-disable-next-line @typescript-eslint/no-explicit-any
                         if (isNullOrUndefined(args.oldValue)) {
-                            ddtElem.value = "";
+                            ddtElem.value = '';
                         }
                         else {
                             // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -1338,6 +1368,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
                     ruleElem = ruleElem.previousElementSibling;
                     index++;
                 }
+                rules.rules[index].value = '';
                 this.changeRule(rules.rules[index], args);
             }
         }
@@ -1427,6 +1458,9 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
             getComponent(tooltipElem[i], 'tooltip').destroy();
         }
         if (!args.cancel) {
+            if (isNullOrUndefined(this.selectedColumn)) {
+                return;
+            }
             tempRule.type = this.selectedColumn.type;
             if (ruleElem.querySelector('.e-template')) {
                 rule.value = '';
@@ -1461,15 +1495,20 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
         tempElem.appendChild(subFieldElem);
         var height = (this.element.className.indexOf('e-device') > -1) ? '250px' : '200px';
         var subFieldData = Object.keys(this.selectedColumn.columns[0]);
-        var dropDownList = new DropDownList({
+        var ddlField;
+        ddlField = {
             dataSource: this.selectedColumn.columns,
             fields: this.fields,
             placeholder: this.l10n.getConstant('SelectField'),
             popupHeight: ((subFieldData.length > 5) ? height : 'auto'),
             change: this.changeField.bind(this),
             index: 0,
-            open: this.popupOpen.bind(this)
-        });
+            open: this.popupOpen.bind(this, false)
+        };
+        if (this.fieldModel) {
+            ddlField = __assign({}, ddlField, this.fieldModel);
+        }
+        var dropDownList = new DropDownList(ddlField);
         dropDownList.appendTo('#' + ruleId + '_subfilterkey' + this.subFilterCounter);
         if (this.isImportRules) {
             var subField = this.selectedColumn.columns;
@@ -1589,7 +1628,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
                     change: this.changeField.bind(this),
                     index: 0,
                     value: value,
-                    open: this.popupOpen.bind(this)
+                    open: this.popupOpen.bind(this, false)
                 };
                 if (this.operatorModel) {
                     ddlOperator = __assign({}, ddlOperator, this.operatorModel);
@@ -1608,10 +1647,13 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
             this.updateRules(ddlArgs.element, ddlArgs.item);
         }
     };
-    QueryBuilder.prototype.popupOpen = function (args) {
+    QueryBuilder.prototype.popupOpen = function (isField, args) {
         if (this.enableRtl) {
             addClass([args.popup.element], 'e-rtl');
         }
+        if (isField) {
+            this.isFieldClose = false;
+        }
     };
     QueryBuilder.prototype.destroyControls = function (target, isRuleTemplate) {
         var element = isRuleTemplate ? target : target.nextElementSibling;
@@ -1804,7 +1846,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
             change: this.changeValue.bind(this, i),
             close: this.closePopup.bind(this, i),
             actionBegin: this.multiSelectOpen.bind(this, parentId + '_valuekey' + i),
-            open: this.popupOpen.bind(this)
+            open: this.popupOpen.bind(this, false)
         };
         if (this.valueModel && this.valueModel.multiSelectModel) {
             multiSelectValue = __assign({}, multiSelectValue, this.valueModel.multiSelectModel);
@@ -1864,8 +1906,10 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
     };
     QueryBuilder.prototype.closePopup = function (i, args) {
         var element = document.getElementById(args.popup.element.id.replace('_popup', ''));
-        var value = getComponent(element, 'multiselect').value;
-        this.updateRules(element, value, i);
+        if (element) {
+            var value = getComponent(element, 'multiselect').value;
+            this.updateRules(element, value, i);
+        }
     };
     QueryBuilder.prototype.processTemplate = function (target, itemData, rule, tempRule) {
         var container = closest(target, '.e-rule-container');
@@ -2226,6 +2270,9 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
         return 0;
     };
     QueryBuilder.prototype.getPreviousItemData = function (prevItemData, column) {
+        if (this.isFieldClose && prevItemData) {
+            prevItemData = this.getColumn(prevItemData.value);
+        }
         if (column.template && prevItemData && Object.keys(prevItemData).length < 4) {
             prevItemData.template = column.template;
         }
@@ -2718,6 +2765,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
      * @returns {void}
      */
     QueryBuilder.prototype.destroy = function () {
+        this.isDestroy = true;
         var queryElement = this.element;
         if (!queryElement) {
             return;
@@ -2773,6 +2821,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
             this.clearQBTemplate();
         }
         classList(this.element, [], ['e-rtl', 'e-responsive', 'e-device']);
+        this.isDestroy = false;
     };
     /**
      * Adds single or multiple rules.
@@ -3413,7 +3462,11 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
                 }
             }
             var isTemplateRendered = clnruleElem.querySelector('.e-template-value');
-            detach(clnruleElem);
+            try {
+                detach(clnruleElem);
+            }
+            catch (err) {
+            }
             if (column && column.ruleTemplate) {
                 this.clearQBTemplate([clnruleElem.id]);
             }
@@ -3533,10 +3586,14 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
                 }
             }
             if ((this.isRefreshed && this.enablePersistence) || (this.rule.field !== '' && rule.operator !== '' && (rule.value !== '' &&
-                rule.value !== undefined))) {
+                rule.value !== undefined)) || (customObj && customObj.isQuestion)) {
+                var condition = rule.condition;
                 rule = {
                     'label': rule.label, 'field': rule.field, 'operator': rule.operator, 'type': rule.type, 'value': rule.value
                 };
+                if (condition) {
+                    rule.condition = condition;
+                }
                 if (customObj) {
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     rule.custom = customObj;
@@ -3558,6 +3615,9 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
                     rule.not = notValue;
                 }
             }
+            else if ((isNullOrUndefined(rule.condition)) && isNullOrUndefined(rule.rules)) {
+                rule = { 'label': '', 'field': '', 'operator': '', 'type': '', 'value': '' };
+            }
             else {
                 if (this.enableNotCondition) {
                     rule = { 'condition': rule.condition, 'rules': rule.rules, 'not': rule.not };
@@ -3741,7 +3801,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
                     }
                 }
             }
-            else if (ruleColl[i].operator.length) {
+            else if (!isNullOrUndefined(ruleColl[i].operator) && !isNullOrUndefined(ruleColl[i].operator.length)) {
                 var oper = ruleColl[i].operator.toLowerCase();
                 var isDateFilter = false;
                 var dateOperColl = ['equal', 'notequal', 'greaterthan', 'greaterthanorequal', 'lessthan', 'lessthanorequal'];
@@ -3842,6 +3902,12 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
                     break;
                 }
             }
+            else if (field.indexOf(this.separator) > -1) {
+                if (columns[i].field === field.split(this.separator)[0]) {
+                    column = columns[i];
+                    break;
+                }
+            }
         }
         return column;
     };
@@ -3931,7 +3997,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
         }
         if (!(operator.indexOf('null') > -1 || operator.indexOf('empty') > -1)) {
             for (var j = 0, jLen = value.length; j < jLen; j++) {
-                if (value[j] !== '') {
+                if (value[j] !== '' || ((operator === 'in' || operator === 'notin') && column.type === 'string')) {
                     if (j === 0) {
                         var gte = 'greaterthanorequal';
                         switch (operator) {
@@ -4073,7 +4139,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
         if (!isNullOrUndefined(ruleColl)) {
             for (var i = 0, len = ruleColl.length; i < len; i++) {
                 var keys = Object.keys(ruleColl[i]);
-                if (!isNullOrUndefined(ruleColl[i].rules) && keys.indexOf('rules') > -1) {
+                if (!isNullOrUndefined(ruleColl[i].rules) && keys.indexOf('rules') > -1 && (ruleColl[i].rules.length !== 0)) {
                     parentElem = this.renderGroup(ruleColl[i], ruleColl[i].condition, parentElem, ruleColl[i].not);
                     parentElem = this.importRules(ruleColl[i], parentElem, true);
                 }
@@ -4310,8 +4376,14 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
                     }
                     queryStr += rule.field + ' ' + this.operators[rule.operator] + ' ' + valueStr;
                 }
+                if (rule.condition && rule.condition != '') {
+                    condition = rule.condition;
+                }
             }
             if (j !== jLen - 1) {
+                if (condition === '') {
+                    condition = rules.rules[j].condition;
+                }
                 queryStr += ' ' + condition.toUpperCase() + ' ';
             }
         }
@@ -4445,6 +4517,12 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
             this.parser.push(['Literal', matchValue]);
             return matchValue.length + 2;
         }
+        // eslint-disable-next-line
+        if (this.checkNumberLiteral(sqlString)) {
+            matchValue = /^[0-9]+(\.[0-9]+)?/.exec(sqlString)[0];
+            this.parser.push(['Literal', matchValue]);
+            return matchValue.length;
+        }
         //String
         if (/^'((?:[^\\']+?|\\.|'')*)'(?!')/.exec(sqlString)) {
             matchValue = /^'((?:[^\\']+?|\\.|'')*)'(?!')/.exec(sqlString)[0];
@@ -4484,6 +4562,25 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
         }
         return false;
     };
+    QueryBuilder.prototype.checkNumberLiteral = function (sqlString) {
+        var lastParser = this.parser[this.parser.length - 1];
+        if (!lastParser) {
+            return true;
+        }
+        else {
+            if (/^[0-9]+(\.[0-9]+)?/.exec(sqlString)) {
+                var secParser = this.parser[this.parser.length - 2];
+                var betweenParser = this.parser[this.parser.length - 3];
+                if (lastParser[0] === 'Left' && (secParser && secParser[0] === 'Conditions')) {
+                    return true;
+                }
+                if (lastParser[0] === 'Conditions' && (betweenParser && betweenParser[1].indexOf('between') < 0)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    };
     QueryBuilder.prototype.getOperator = function (value, operator) {
         var operators = {
             '=': 'equal', '!=': 'notequal', '<': 'lessthan', '>': 'greaterthan', '<=': 'lessthanorequal',