@syncfusion/ej2-querybuilder 31.1.17 → 31.2.2

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

@@ -206,6 +206,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
         _this.cloneRuleBtnClick = false;
         _this.isValueEmpty = false;
         _this.isPropChange = false;
+        _this.isRuleClicked = false;
         MultiSelect.Inject(CheckBoxSelection);
         return _this;
     }
@@ -570,6 +571,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
                 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:
@@ -583,6 +585,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
                 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:
@@ -742,9 +745,11 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
             }
         }
         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);
         }
     };
@@ -945,6 +950,10 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
             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;
             var ruleCount = this.rule.rules.length;
             if (!column || (column && !column.ruleTemplate) || !rule.field) {
                 if (ruleCount > 20) {
@@ -3058,26 +3067,45 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
         var ddlObj = this.fieldMode === 'DropdownTree' ? getComponent(filterElem, 'dropdowntree')
             : getComponent(container.querySelector('.e-rule-filter .e-filter-input'), 'dropdownlist');
         var column = this.fieldMode === 'DropdownTree' ? this.getColumn(ddlObj.value[0]) : this.getColumn(ddlObj.value);
+        if (target && target.nextElementSibling) {
+            target.nextElementSibling.style.position = 'relative';
+            target.nextElementSibling.classList.add('e-querybuilder-spinner');
+        }
+        var onComplete = function () {
+            if (target && target.nextElementSibling && target.nextElementSibling.classList.contains('e-querybuilder-spinner')) {
+                target.nextElementSibling.classList.remove('e-querybuilder-spinner');
+            }
+        };
         if (typeof itemData.template === 'string' || itemData.template.write === undefined) {
             var args = {
                 rule: rule, ruleID: container.id, operator: tempRule.operator, field: column.field,
                 requestType: 'value-template-create'
             };
             this.trigger('actionBegin', args);
+            onComplete();
         }
         else {
             var template = itemData.template;
+            var templateArgs = {
+                elements: tempElements.length > 1 ? tempElements : tempElements[0],
+                values: rule.value,
+                operator: tempRule.operator,
+                field: column.field,
+                dataSource: column.values,
+                onComplete: onComplete
+            };
+            var writeResult = void 0;
             if (typeof template.write === 'string') {
-                getValue(template.write, window)({
-                    elements: tempElements.length > 1 ? tempElements : tempElements[0], values: rule.value,
-                    operator: tempRule.operator, field: column.field, dataSource: column.values
-                });
+                writeResult = getValue(template.write, window)(templateArgs);
             }
             else if (typeof itemData.template !== 'function') {
-                itemData.template.write({
-                    elements: tempElements.length > 1 ? tempElements : tempElements[0],
-                    values: rule.value, operator: tempRule.operator, field: column.field, dataSource: column.values
-                });
+                writeResult = itemData.template.write(templateArgs);
+            }
+            if (writeResult && typeof writeResult.then === 'function') {
+                writeResult.then(function () { return onComplete(); });
+            }
+            else {
+                setTimeout(function () { return onComplete(); }, 100);
             }
         }
     };
@@ -4079,6 +4107,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
         }
         classList(this.element, [], ['e-rtl', 'e-responsive', 'e-device']);
         this.isDestroy = false;
+        _super.prototype.destroy.call(this);
     };
     /**
      * Adds single or multiple rules.
@@ -7432,7 +7461,8 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
             deleteElem: groupElem.querySelectorAll('.e-rule-delete'),
             lockElem: groupElem.querySelectorAll('.e-lock-rule'),
             cloneElem: groupElem.querySelectorAll('.e-clone-rule'),
-            ruleElem: groupElem.querySelectorAll('.e-rule-container')
+            ruleElem: groupElem.querySelectorAll('.e-rule-container'),
+            ddTree: groupElem.querySelectorAll('.e-control.e-dropdowntree')
         };
         elements.deleteElem.forEach(function (elem, i) {
             if (isDisabled) {
@@ -7469,10 +7499,14 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
         disableComponents(elements.checkbox, function (elem) { return getComponent(elem, 'checkbox'); }, isDisabled);
         disableComponents(elements.radio, function (elem) { return getComponent(elem, 'radio'); }, isDisabled);
         disableComponents(elements.multiSelect, function (elem) { return getComponent(elem, 'multiselect'); }, isDisabled);
+        disableComponents(elements.ddTree, function (elem) { return getComponent(elem, 'dropdowntree'); }, isDisabled);
     };
     __decorate([
         Event()
     ], QueryBuilder.prototype, "created", void 0);
+    __decorate([
+        Event()
+    ], QueryBuilder.prototype, "destroyed", void 0);
     __decorate([
         Event()
     ], QueryBuilder.prototype, "actionBegin", void 0);