@syncfusion/ej2-querybuilder 33.2.7 → 34.1.29

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

@@ -204,6 +204,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
         _this.cloneGrpBtnClick = false;
         _this.isMiddleGroup = false;
         _this.cloneRuleBtnClick = false;
+        _this.groupConnectorStates = {};
         _this.isValueEmpty = false;
         _this.isPropChange = false;
         _this.isRuleClicked = false;
@@ -4852,6 +4853,17 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
         return visualElement;
     };
     QueryBuilder.prototype.dragStartHandler = function (e) {
+        var _this = this;
+        this.groupConnectorStates = {};
+        var allGroupContainers = this.element.querySelectorAll('.e-group-container');
+        allGroupContainers.forEach(function (grpContainer) {
+            if (grpContainer.id !== '') {
+                var groupRule = _this.getGroup(grpContainer);
+                if (groupRule && groupRule.condition) {
+                    _this.groupConnectorStates[grpContainer.id] = groupRule.condition.toUpperCase();
+                }
+            }
+        });
         this.draggedRule = e.target;
         this.isDragEventPrevent = false;
         document.body.classList.add('e-prevent-select');
@@ -4939,6 +4951,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
         if (this.isDragEventPrevent) {
             return;
         }
+        var dropped = false;
         var targetGroup = closest(e.target, '.e-rule-container');
         if (isNullOrUndefined(targetGroup) && e.target.parentElement &&
             e.target.parentElement.classList.contains('e-btn-group') && this.enableSeparateConnector) {
@@ -5041,6 +5054,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
                         }
                     }
                 });
+                dropped = true;
             }
         }
         else if (tgrt.classList.contains('e-rule-list') && tgrt.children.length === 0 && !isPreventelem) {
@@ -5071,6 +5085,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
                     this.addRules([rule], groupId);
                 }
             }
+            dropped = true;
         }
         else if (tgrt.classList.contains('e-rule-list') && tgrt.children[0].classList.contains('e-group-container') && !isPreventelem) {
             var groupElem = closest(tgrt, '.e-group-container');
@@ -5125,6 +5140,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
                     }
                 }
             });
+            dropped = true;
         }
         else if ((closest(e.target, '.e-group-container') || e.target.classList.contains('e-group-container')) && !isPreventelem) {
             var rule = void 0;
@@ -5159,10 +5175,14 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
                     }
                 }
             }
+            dropped = true;
         }
         if (!isPreventelem) {
             this.trigger('ruleChange', { previousRule: prevRule, rule: this.getValidRules(), type: 'drag-and-drop' });
         }
+        if (!dropped) {
+            this.restoreGroupConnectorStates();
+        }
         this.prvtEvtTgrDaD = false;
         document.body.classList.remove('e-prevent-select');
         var borderLineElem = this.element.querySelectorAll('.e-drag-rule-bottom-line');
@@ -5522,11 +5542,38 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
             if (dragElemnet) {
                 remove(dragElemnet);
             }
+            this.restoreGroupConnectorStates();
             if (this.enableSeparateConnector) {
                 this.refresh();
             }
         }
     };
+    QueryBuilder.prototype.restoreGroupConnectorStates = function () {
+        var _this = this;
+        var updatedGroupContainers = this.element.querySelectorAll('.e-group-container');
+        updatedGroupContainers.forEach(function (grpContainer) {
+            var groupId = grpContainer.id;
+            if (_this.groupConnectorStates.hasOwnProperty(groupId)) {
+                var savedCondition = _this.groupConnectorStates[groupId];
+                var groupRule = _this.getGroup(grpContainer);
+                if (groupRule) {
+                    groupRule.condition = savedCondition.toLowerCase();
+                }
+                var andElem = grpContainer.querySelector('.e-btngroup-and');
+                var orElem = grpContainer.querySelector('.e-btngroup-or');
+                if (andElem && orElem) {
+                    if (savedCondition === 'AND') {
+                        andElem.checked = true;
+                        orElem.checked = false;
+                    }
+                    else {
+                        orElem.checked = true;
+                        andElem.checked = false;
+                    }
+                }
+            }
+        });
+    };
     QueryBuilder.prototype.windowResizeHandler = function () {
         if (Browser.isDevice || window.innerWidth < 768) {
             this.displayMode = 'Vertical';
@@ -6385,8 +6432,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
                     if (this.element.querySelectorAll('.e-group-container').length > this.maxGroupCount) {
                         return null;
                     }
-                    if (isNullOrUndefined(this.updatedRule) && this.allowDragAndDrop && this.dragElement &&
-                        this.dragElement.querySelector('.e-rule-list') && this.dragElement.querySelector('.e-rule-list').querySelector('.e-group-container')) {
+                    if (isNullOrUndefined(this.updatedRule) && this.allowDragAndDrop && this.dragElement) {
                         this.updatedRule = {
                             isLocked: ruleColl[i].isLocked, condition: ruleColl[i].condition,
                             not: ruleColl[i].not