@syncfusion/ej2-querybuilder 33.2.7 → 34.1.29

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.groupConnectorStates = {};
         this.isValueEmpty = false;
         this.isPropChange = false;
         this.isRuleClicked = false;
@@ -4780,6 +4781,16 @@ let QueryBuilder = class QueryBuilder extends Component {
         return visualElement;
     }
     dragStartHandler(e) {
+        this.groupConnectorStates = {};
+        const allGroupContainers = this.element.querySelectorAll('.e-group-container');
+        allGroupContainers.forEach((grpContainer) => {
+            if (grpContainer.id !== '') {
+                const 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');
@@ -4866,6 +4877,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         if (this.isDragEventPrevent) {
             return;
         }
+        let dropped = false;
         let targetGroup = closest(e.target, '.e-rule-container');
         if (isNullOrUndefined(targetGroup) && e.target.parentElement &&
             e.target.parentElement.classList.contains('e-btn-group') && this.enableSeparateConnector) {
@@ -4968,6 +4980,7 @@ let QueryBuilder = class QueryBuilder extends Component {
                         }
                     }
                 });
+                dropped = true;
             }
         }
         else if (tgrt.classList.contains('e-rule-list') && tgrt.children.length === 0 && !isPreventelem) {
@@ -4998,6 +5011,7 @@ let QueryBuilder = class QueryBuilder extends Component {
                     this.addRules([rule], groupId);
                 }
             }
+            dropped = true;
         }
         else if (tgrt.classList.contains('e-rule-list') && tgrt.children[0].classList.contains('e-group-container') && !isPreventelem) {
             const groupElem = closest(tgrt, '.e-group-container');
@@ -5052,6 +5066,7 @@ let QueryBuilder = class QueryBuilder extends Component {
                     }
                 }
             });
+            dropped = true;
         }
         else if ((closest(e.target, '.e-group-container') || e.target.classList.contains('e-group-container')) && !isPreventelem) {
             let rule;
@@ -5086,10 +5101,14 @@ let QueryBuilder = class QueryBuilder extends Component {
                     }
                 }
             }
+            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');
         let borderLineElem = this.element.querySelectorAll('.e-drag-rule-bottom-line');
@@ -5446,11 +5465,37 @@ let QueryBuilder = class QueryBuilder extends Component {
             if (dragElemnet) {
                 remove(dragElemnet);
             }
+            this.restoreGroupConnectorStates();
             if (this.enableSeparateConnector) {
                 this.refresh();
             }
         }
     }
+    restoreGroupConnectorStates() {
+        const updatedGroupContainers = this.element.querySelectorAll('.e-group-container');
+        updatedGroupContainers.forEach((grpContainer) => {
+            const groupId = grpContainer.id;
+            if (this.groupConnectorStates.hasOwnProperty(groupId)) {
+                const savedCondition = this.groupConnectorStates[groupId];
+                const groupRule = this.getGroup(grpContainer);
+                if (groupRule) {
+                    groupRule.condition = savedCondition.toLowerCase();
+                }
+                const andElem = grpContainer.querySelector('.e-btngroup-and');
+                const 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;
+                    }
+                }
+            }
+        });
+    }
     windowResizeHandler() {
         if (Browser.isDevice || window.innerWidth < 768) {
             this.displayMode = 'Vertical';
@@ -6309,8 +6354,7 @@ let QueryBuilder = class QueryBuilder extends Component {
                     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