@syncfusion/ej2-querybuilder 19.4.40 → 19.4.50

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

@@ -134,6 +134,9 @@ let QueryBuilder = class QueryBuilder extends Component {
         this.isNotified = false;
         this.isAddSuccess = false;
         this.isNotValueChange = false;
+        this.isFieldChange = false;
+        this.isFieldClose = false;
+        this.isDestroy = false;
         MultiSelect.Inject(CheckBoxSelection);
     }
     getPersistData() {
@@ -606,8 +609,8 @@ let QueryBuilder = class QueryBuilder extends Component {
                     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 = Object.assign({}, ddlField, this.fieldModel);
@@ -629,11 +632,11 @@ let QueryBuilder = class QueryBuilder extends Component {
                     const 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 = Object.assign({}, ddlField, this.fieldModel);
@@ -677,12 +680,19 @@ let QueryBuilder = class QueryBuilder extends Component {
         else {
             groupElem = closest(target, '.e-group-container');
             rules = this.getParentGroup(groupElem);
+            const 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);
             }
         }
@@ -1233,21 +1243,41 @@ let QueryBuilder = class QueryBuilder extends Component {
             }
         }
     }
+    fieldClose(id) {
+        if (this.isFieldChange || this.isDestroy) {
+            return;
+        }
+        this.isFieldClose = true;
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const ddl = getComponent(id, 'dropdownlist');
+        const item = ddl.popupObj.element.querySelector('.e-active');
+        const itemData = ddl.getItemData();
+        ddl.value = itemData.value;
+        const 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;
+    }
     changeField(args) {
         if (args.isInteracted) {
+            if (isNullOrUndefined(args.value)) {
+                return;
+            }
+            this.isFieldChange = true;
+            this.prevItemData = args.itemData;
             const fieldElem = closest(args.element, '.e-rule-filter') || closest(args.element, '.e-rule-sub-filter');
             const column = this.fieldMode === 'DropdownTree' ? this.getColumn(args.value[0]) : this.getColumn(args.value);
             if (this.fieldMode === 'DropdownTree' && fieldElem != null) {
-                const ddtElem = fieldElem.querySelector(".e-control");
+                const ddtElem = fieldElem.querySelector('.e-control');
                 const 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
@@ -1283,6 +1313,7 @@ let QueryBuilder = class QueryBuilder extends Component {
                     ruleElem = ruleElem.previousElementSibling;
                     index++;
                 }
+                rules.rules[index].value = '';
                 this.changeRule(rules.rules[index], args);
             }
         }
@@ -1370,6 +1401,9 @@ let QueryBuilder = class QueryBuilder extends Component {
             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 = '';
@@ -1404,15 +1438,20 @@ let QueryBuilder = class QueryBuilder extends Component {
         tempElem.appendChild(subFieldElem);
         const height = (this.element.className.indexOf('e-device') > -1) ? '250px' : '200px';
         const subFieldData = Object.keys(this.selectedColumn.columns[0]);
-        const dropDownList = new DropDownList({
+        let 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 = Object.assign({}, ddlField, this.fieldModel);
+        }
+        const dropDownList = new DropDownList(ddlField);
         dropDownList.appendTo('#' + ruleId + '_subfilterkey' + this.subFilterCounter);
         if (this.isImportRules) {
             const subField = this.selectedColumn.columns;
@@ -1532,7 +1571,7 @@ let QueryBuilder = class QueryBuilder extends Component {
                     change: this.changeField.bind(this),
                     index: 0,
                     value: value,
-                    open: this.popupOpen.bind(this)
+                    open: this.popupOpen.bind(this, false)
                 };
                 if (this.operatorModel) {
                     ddlOperator = Object.assign({}, ddlOperator, this.operatorModel);
@@ -1551,10 +1590,13 @@ let QueryBuilder = class QueryBuilder extends Component {
             this.updateRules(ddlArgs.element, ddlArgs.item);
         }
     }
-    popupOpen(args) {
+    popupOpen(isField, args) {
         if (this.enableRtl) {
             addClass([args.popup.element], 'e-rtl');
         }
+        if (isField) {
+            this.isFieldClose = false;
+        }
     }
     destroyControls(target, isRuleTemplate) {
         const element = isRuleTemplate ? target : target.nextElementSibling;
@@ -1747,7 +1789,7 @@ let QueryBuilder = class QueryBuilder extends Component {
             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 = Object.assign({}, multiSelectValue, this.valueModel.multiSelectModel);
@@ -1806,8 +1848,10 @@ let QueryBuilder = class QueryBuilder extends Component {
     }
     closePopup(i, args) {
         const element = document.getElementById(args.popup.element.id.replace('_popup', ''));
-        const value = getComponent(element, 'multiselect').value;
-        this.updateRules(element, value, i);
+        if (element) {
+            const value = getComponent(element, 'multiselect').value;
+            this.updateRules(element, value, i);
+        }
     }
     processTemplate(target, itemData, rule, tempRule) {
         const container = closest(target, '.e-rule-container');
@@ -2168,6 +2212,9 @@ let QueryBuilder = class QueryBuilder extends Component {
         return 0;
     }
     getPreviousItemData(prevItemData, column) {
+        if (this.isFieldClose && prevItemData) {
+            prevItemData = this.getColumn(prevItemData.value);
+        }
         if (column.template && prevItemData && Object.keys(prevItemData).length < 4) {
             prevItemData.template = column.template;
         }
@@ -2659,6 +2706,7 @@ let QueryBuilder = class QueryBuilder extends Component {
      * @returns {void}
      */
     destroy() {
+        this.isDestroy = true;
         const queryElement = this.element;
         if (!queryElement) {
             return;
@@ -2714,6 +2762,7 @@ let QueryBuilder = class QueryBuilder extends Component {
             this.clearQBTemplate();
         }
         classList(this.element, [], ['e-rtl', 'e-responsive', 'e-device']);
+        this.isDestroy = false;
     }
     /**
      * Adds single or multiple rules.
@@ -3350,7 +3399,11 @@ let QueryBuilder = class QueryBuilder extends Component {
                 }
             }
             const isTemplateRendered = clnruleElem.querySelector('.e-template-value');
-            detach(clnruleElem);
+            try {
+                detach(clnruleElem);
+            }
+            catch (err) {
+            }
             if (column && column.ruleTemplate) {
                 this.clearQBTemplate([clnruleElem.id]);
             }
@@ -3470,10 +3523,14 @@ let QueryBuilder = class QueryBuilder extends Component {
                 }
             }
             if ((this.isRefreshed && this.enablePersistence) || (this.rule.field !== '' && rule.operator !== '' && (rule.value !== '' &&
-                rule.value !== undefined))) {
+                rule.value !== undefined)) || (customObj && customObj.isQuestion)) {
+                const 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;
@@ -3495,6 +3552,9 @@ let QueryBuilder = class QueryBuilder extends Component {
                     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 };
@@ -3678,7 +3738,7 @@ let QueryBuilder = class QueryBuilder extends Component {
                     }
                 }
             }
-            else if (ruleColl[i].operator.length) {
+            else if (!isNullOrUndefined(ruleColl[i].operator) && !isNullOrUndefined(ruleColl[i].operator.length)) {
                 const oper = ruleColl[i].operator.toLowerCase();
                 let isDateFilter = false;
                 const dateOperColl = ['equal', 'notequal', 'greaterthan', 'greaterthanorequal', 'lessthan', 'lessthanorequal'];
@@ -3779,6 +3839,12 @@ let QueryBuilder = class QueryBuilder extends Component {
                     break;
                 }
             }
+            else if (field.indexOf(this.separator) > -1) {
+                if (columns[i].field === field.split(this.separator)[0]) {
+                    column = columns[i];
+                    break;
+                }
+            }
         }
         return column;
     }
@@ -3868,7 +3934,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         }
         if (!(operator.indexOf('null') > -1 || operator.indexOf('empty') > -1)) {
             for (let j = 0, jLen = value.length; j < jLen; j++) {
-                if (value[j] !== '') {
+                if (value[j] !== '' || ((operator === 'in' || operator === 'notin') && column.type === 'string')) {
                     if (j === 0) {
                         const gte = 'greaterthanorequal';
                         switch (operator) {
@@ -4010,7 +4076,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         if (!isNullOrUndefined(ruleColl)) {
             for (let i = 0, len = ruleColl.length; i < len; i++) {
                 const 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);
                 }
@@ -4167,7 +4233,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         else {
             queryStr += '(';
         }
-        const condition = rules.condition;
+        let condition = rules.condition;
         if (rules.not) {
             if (isRoot) {
                 queryStr += 'NOT (';
@@ -4246,8 +4312,14 @@ let QueryBuilder = class QueryBuilder extends Component {
                     }
                     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() + ' ';
             }
         }
@@ -4381,6 +4453,12 @@ let QueryBuilder = class QueryBuilder extends Component {
             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];
@@ -4420,6 +4498,25 @@ let QueryBuilder = class QueryBuilder extends Component {
         }
         return false;
     }
+    checkNumberLiteral(sqlString) {
+        const lastParser = this.parser[this.parser.length - 1];
+        if (!lastParser) {
+            return true;
+        }
+        else {
+            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;
+                }
+                if (lastParser[0] === 'Conditions' && (betweenParser && betweenParser[1].indexOf('between') < 0)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
     getOperator(value, operator) {
         const operators = {
             '=': 'equal', '!=': 'notequal', '<': 'lessthan', '>': 'greaterthan', '<=': 'lessthanorequal',