@syncfusion/ej2-querybuilder 19.4.38 → 19.4.48

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

@@ -680,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);
             }
         }
@@ -1303,6 +1310,7 @@ let QueryBuilder = class QueryBuilder extends Component {
                     ruleElem = ruleElem.previousElementSibling;
                     index++;
                 }
+                rules.rules[index].value = '';
                 this.changeRule(rules.rules[index], args);
             }
         }
@@ -1390,6 +1398,9 @@ let QueryBuilder = class QueryBuilder extends Component {
             getComponent(tooltipElem[i], 'tooltip').destroy();
         }
         if (!args.cancel) {
+            if (this.selectedColumn === null) {
+                return;
+            }
             tempRule.type = this.selectedColumn.type;
             if (ruleElem.querySelector('.e-template')) {
                 rule.value = '';
@@ -1424,7 +1435,8 @@ 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'),
@@ -1432,7 +1444,11 @@ let QueryBuilder = class QueryBuilder extends Component {
             change: this.changeField.bind(this),
             index: 0,
             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;
@@ -1829,8 +1845,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');
@@ -3378,7 +3396,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]);
             }
@@ -3498,10 +3520,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;
@@ -3810,6 +3836,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;
     }
@@ -3899,7 +3931,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) {
@@ -4041,7 +4073,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);
                 }
@@ -4198,7 +4230,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         else {
             queryStr += '(';
         }
-        const condition = rules.condition;
+        let condition = rules.condition;
         if (rules.not) {
             if (isRoot) {
                 queryStr += 'NOT (';
@@ -4277,8 +4309,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() + ' ';
             }
         }