@syncfusion/ej2-querybuilder 31.1.22 → 31.2.2

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

@@ -161,6 +161,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         this.cloneRuleBtnClick = false;
         this.isValueEmpty = false;
         this.isPropChange = false;
+        this.isRuleClicked = false;
         MultiSelect.Inject(CheckBoxSelection);
     }
     getPersistData() {
@@ -516,6 +517,7 @@ let QueryBuilder = class QueryBuilder extends Component {
                 case target.className.indexOf('e-clone-rule-btn') > -1:
                     this.actionButton = target;
                     this.cloneRuleBtnClick = true;
+                    this.isRuleClicked = true;
                     this.ruleClone(target);
                     break;
                 case target.className.indexOf('e-lock-rule-btn') > -1:
@@ -529,6 +531,7 @@ let QueryBuilder = class QueryBuilder extends Component {
                 case target.className.indexOf('e-clone-grp-btn') > -1:
                     this.actionButton = target;
                     this.cloneGrpBtnClick = true;
+                    this.isRuleClicked = true;
                     this.groupClone(closest(target, '.e-group-container'));
                     break;
                 case target.className.indexOf('e-deletegroup') > -1:
@@ -688,9 +691,11 @@ let QueryBuilder = class QueryBuilder extends Component {
             }
         }
         else if (event.element.children[0].className.indexOf('e-addrule') > -1) {
+            this.isRuleClicked = true;
             this.addRuleElement(closest(target, '.e-group-container'), {});
         }
         else if (event.element.children[0].className.indexOf('e-addgroup') > -1) {
+            this.isRuleClicked = true;
             this.addGroupElement(true, closest(target, '.e-group-container'), '', true);
         }
     }
@@ -889,6 +894,10 @@ let QueryBuilder = class QueryBuilder extends Component {
             if (!this.isImportRules) {
                 this.updateAddedRule(trgt, rule, newRule, isRlTmp, pId, this.enableSeparateConnector ? true : null);
             }
+            if (this.rule.condition === '' && (this.isRuleClicked || this.rule.rules.length > 1)) {
+                this.rule.condition = 'and';
+            }
+            this.isRuleClicked = false;
             const ruleCount = this.rule.rules.length;
             if (!column || (column && !column.ruleTemplate) || !rule.field) {
                 if (ruleCount > 20) {
@@ -4028,6 +4037,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         }
         classList(this.element, [], ['e-rtl', 'e-responsive', 'e-device']);
         this.isDestroy = false;
+        super.destroy();
     }
     /**
      * Adds single or multiple rules.
@@ -7418,6 +7428,9 @@ let QueryBuilder = class QueryBuilder extends Component {
 __decorate([
     Event()
 ], QueryBuilder.prototype, "created", void 0);
+__decorate([
+    Event()
+], QueryBuilder.prototype, "destroyed", void 0);
 __decorate([
     Event()
 ], QueryBuilder.prototype, "actionBegin", void 0);