@syncfusion/ej2-querybuilder 27.1.48 → 27.1.52

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

@@ -159,6 +159,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         this.cloneGrpBtnClick = false;
         this.isMiddleGroup = false;
         this.cloneRuleBtnClick = false;
+        this.isValueEmpty = false;
         MultiSelect.Inject(CheckBoxSelection);
     }
     getPersistData() {
@@ -948,13 +949,14 @@ let QueryBuilder = class QueryBuilder extends Component {
                 .filter((filteredChild) => filteredChild !== null);
             this.changeDataSource(matchedDataSource);
             setTimeout(() => {
-                if (!isNullOrUndefined(proxy.ddTree)) {
+                if (!isNullOrUndefined(proxy.ddTree) && !isNullOrUndefined(proxy.ddTree.treeObj)) {
                     proxy.ddTree.treeObj.expandAll();
                 }
             }, 100);
         }
     }
     changeDataSource(data) {
+        this.updateDropdowntreeDS(data);
         this.ddTree.treeObj.fields = {
             dataSource: data,
             value: 'field',
@@ -988,7 +990,7 @@ let QueryBuilder = class QueryBuilder extends Component {
     }
     dropdownTreeClose() {
         if (this.ddTree) {
-            this.changeDataSource(this.columns);
+            this.changeDataSource(extend([], this.columns, [], true));
         }
         this.ddTree = null;
     }
@@ -2025,7 +2027,9 @@ let QueryBuilder = class QueryBuilder extends Component {
                 if (isNaN(value) && elem.value.indexOf(decimalSeparator) !== -1) {
                     value = this.intl.getNumberParser({ format: 'n' })(elem.value);
                 }
-                numericTextBoxObj.value = value;
+                if (!isNaN(value)) {
+                    numericTextBoxObj.value = value;
+                }
                 this.isNumInput = true;
             }
         }
@@ -2401,11 +2405,13 @@ let QueryBuilder = class QueryBuilder extends Component {
                 }
                 const height = (this.element.className.indexOf('e-device') > -1) ? '250px' : '200px';
                 let operator;
-                operatorList.forEach((obj) => {
-                    if ('value' in obj && typeof obj.value === 'string' && obj.value.toLowerCase() === rule.operator.toLowerCase()) {
-                        operator = obj.value;
-                    }
-                });
+                if (rule.operator) {
+                    operatorList.forEach((obj) => {
+                        if ('value' in obj && typeof obj.value === 'string' && obj.value.toLowerCase() === rule.operator.toLowerCase()) {
+                            operator = obj.value;
+                        }
+                    });
+                }
                 let value = operator ? operator : operatorList[0].value;
                 let ddlIdx = 0;
                 if (!this.autoSelectOperator) {
@@ -3181,6 +3187,10 @@ let QueryBuilder = class QueryBuilder extends Component {
                     }
                     target.nextElementSibling.innerHTML = '';
                 }
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                if (this.isAngular && !isNullOrUndefined(prevItemData.key) && this.fieldMode === 'DropdownTree') {
+                    delete prevItemData.template;
+                }
             }
             if (isRender) {
                 this.validateValue(rule, closest(target, '.e-rule-container'));
@@ -3220,6 +3230,10 @@ let QueryBuilder = class QueryBuilder extends Component {
                     }
                 }
                 this.renderControls(target, itemData, rule, tempRule, isTempRendered);
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                if (this.isAngular && !isNullOrUndefined(itemData.key) && itemData.template && this.fieldMode === 'DropdownTree') {
+                    delete itemData.template;
+                }
             }
         }
         else {
@@ -5064,6 +5078,7 @@ let QueryBuilder = class QueryBuilder extends Component {
      * @returns {RuleModel} - Valid rule or rules collection
      */
     getValidRules(currentRule) {
+        this.isValueEmpty = true;
         if (!currentRule) {
             currentRule = this.getRules();
         }
@@ -5073,6 +5088,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         const rule = !isNullOrUndefined(currentRule.isLocked) ?
             this.getRuleCollection({ condition: ruleCondtion, rules: ruleColl, not: notCondition, isLocked: currentRule.isLocked }, true) :
             this.getRuleCollection({ condition: ruleCondtion, rules: ruleColl, not: notCondition }, true);
+        this.isValueEmpty = false;
         return rule;
     }
     getRuleCollection(rule, isValidRule) {
@@ -5102,8 +5118,9 @@ let QueryBuilder = class QueryBuilder extends Component {
                     rule.value = null;
                 }
             }
-            if ((this.isRefreshed && this.enablePersistence) || (rule.field !== '' && rule.operator !== '' && (rule.value !== '' &&
-                rule.value !== undefined)) || (customObj && customObj.isQuestion)) {
+            if ((this.isRefreshed && this.enablePersistence) || (rule.field !== '' && rule.operator !== '' &&
+                (this.isValueEmpty ? rule.value !== '' && rule.value !== undefined : rule.value !== undefined)) ||
+                (customObj && customObj.isQuestion)) {
                 const condition = rule.condition;
                 const lockedRule = rule.isLocked;
                 rule = { 'label': rule.label, 'field': rule.field, 'operator': rule.operator, 'type': rule.type, 'value': rule.value };