@syncfusion/ej2-querybuilder 29.2.10 → 30.1.39

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

@@ -469,7 +469,15 @@ let QueryBuilder = class QueryBuilder extends Component {
                     targetValue = document.getElementById(forIdValue).getAttribute('value');
                 }
                 else if (this.enableSeparateConnector) {
-                    targetValue = target.textContent;
+                    if (target.classList.contains('e-btngroup-or-lbl')) {
+                        targetValue = 'or';
+                    }
+                    else if (target.classList.contains('e-btngroup-and-lbl')) {
+                        targetValue = 'and';
+                    }
+                    else {
+                        targetValue = target.textContent;
+                    }
                 }
                 groupID = element.id.replace(this.element.id + '_', '');
                 const group = this.getGroup(groupID);
@@ -3390,6 +3398,9 @@ let QueryBuilder = class QueryBuilder extends Component {
                         (rule.type === 'string' ? textboxValue.split(',').map((val) => val.trim()) :
                             textboxValue.split(',').map(Number)) : [];
                 }
+                else {
+                    rule.value = textboxValue;
+                }
                 break;
             case 'dropdownlist':
                 rule.value = getComponent(element, controlName).value;
@@ -4714,7 +4725,9 @@ let QueryBuilder = class QueryBuilder extends Component {
         EventHandler.add(wrapper, 'focusout', this.focusEventHandler, this);
         EventHandler.add(wrapper, 'focusin', this.focusEventHandler, this);
         EventHandler.add(this.element, 'keydown', this.keyBoardHandler, this);
-        EventHandler.add(document, 'keydown', this.keyBoardHandler, this);
+        if (this.allowDragAndDrop) {
+            EventHandler.add(document, 'keydown', this.keyBoardHandler, this);
+        }
         window.addEventListener('resize', this.windowResizeHandler.bind(this));
     }
     unWireEvents() {
@@ -5083,6 +5096,10 @@ let QueryBuilder = class QueryBuilder extends Component {
                         const orGroup = groupElem.parentElement.querySelectorAll('.e-btngroup-or');
                         andElem = andGroup[andGroup.length - (1 + index)];
                         orElem = orGroup[orGroup.length - (1 + index)];
+                        if (this.isImportRules) {
+                            andElem = groupElem.parentElement.querySelector('.e-btn-group.e-multi-connector .e-btngroup-and');
+                            orElem = groupElem.parentElement.querySelector('.e-btn-group.e-multi-connector .e-btngroup-or');
+                        }
                         element = andGroup[andGroup.length - (1 + index)];
                         if (element && element.parentElement && element.parentElement.style.display === 'none') {
                             index++;
@@ -5802,6 +5819,9 @@ let QueryBuilder = class QueryBuilder extends Component {
                 const tglBtnElem = parentElem.querySelector('.e-qb-toggle');
                 if (rule.not) {
                     addClass([tglBtnElem], 'e-active-toggle');
+                    if (this.enableSeparateConnector) {
+                        getComponent(tglBtnElem.querySelector('.e-checkbox'), 'checkbox').checked = rule.not;
+                    }
                 }
                 else {
                     removeClass([tglBtnElem], 'e-active-toggle');