@syncfusion/ej2-querybuilder 32.2.7 → 32.2.9

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

@@ -2911,7 +2911,7 @@ let QueryBuilder = class QueryBuilder extends Component {
                 value = dataSource[i][`${field}`].toString();
             }
             const data = {};
-            if (!(value in original)) {
+            if (!(value in original) && value) {
                 original[`${value}`] = 1;
                 if (isNested === 0) {
                     data[`${field}`] = value;
@@ -2999,8 +2999,27 @@ let QueryBuilder = class QueryBuilder extends Component {
                 args.cancel = true;
                 this.bindMultiSelectData(element, value);
             }
+            const multiselectObj = getComponent(element, 'multiselect');
+            if (!multiselectObj) {
+                return;
+            }
+            const incomingQuery = (args.query) ? args.query : null;
+            const existingQuery = multiselectObj.query ? multiselectObj.query : null;
+            if (!this.areQueriesSame(existingQuery, incomingQuery)) {
+                multiselectObj.query = null;
+                args.query = null;
+            }
         }
     }
+    areQueriesSame(query1, query2) {
+        if ((query1 === null || query1 === undefined) && (query2 === null || query2 === undefined)) {
+            return true;
+        }
+        if ((query1 === null || query1 === undefined) || (query2 === null || query2 === undefined)) {
+            return false;
+        }
+        return JSON.stringify(query1) === JSON.stringify(query2);
+    }
     bindMultiSelectData(element, value) {
         this.getMultiSelectData(element, value);
     }
@@ -4199,9 +4218,18 @@ let QueryBuilder = class QueryBuilder extends Component {
                 if (this.groupCloned && this.target instanceof HTMLElement &&
                     this.getGroup(this.target).rules.length > 1) {
                     const parent = this.element.querySelector('#' + groupID);
+                    const allContainers = parent.querySelectorAll(':scope > .e-group-body > .e-rule-list > [class*="-container"]');
                     const topLevelGroups = parent.querySelectorAll(':scope > .e-group-body > .e-rule-list > .e-group-container');
-                    if (groupID !== 'querybuilder_group0' && !(this.isAngular && groupID === 'ej2-querybuilder_0_group0')) {
-                        this.groupIndex = topLevelGroups.length > 1 ? topLevelGroups.length - 1 : 0;
+                    if (topLevelGroups.length > 0 && groupID !== 'querybuilder_group0' && !(this.isAngular && groupID === 'ej2-querybuilder_0_group0')) {
+                        let lastGroupIndex = -1;
+                        const lastGroup = topLevelGroups[topLevelGroups.length - 1];
+                        for (let i = 0; i < allContainers.length; i++) {
+                            if (allContainers[i] === lastGroup) {
+                                lastGroupIndex = i;
+                                break;
+                            }
+                        }
+                        this.groupIndex = lastGroupIndex - 1;
                     }
                 }
                 if (this.groupIndex < 0) {