@syncfusion/ej2-querybuilder 32.2.8 → 33.1.44

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

@@ -1361,10 +1361,9 @@ let QueryBuilder = class QueryBuilder extends Component {
                     if (rule.rules[index].value instanceof Array) {
                         valArray = rule.rules[index].value;
                     }
-                    if (excludeOprs.indexOf(rule.rules[index].operator) < -1 &&
-                        (isNullOrUndefined(rule.rules[index].value) &&
-                            rule.rules[index].type !== 'date') || rule.rules[index].value === '' || rule.rules[index].value === null ||
-                        (rule.rules[index].value instanceof Array && valArray.length < 1)) {
+                    if (excludeOprs.indexOf(rule.rules[index].operator) < 0 && ((isNullOrUndefined(rule.rules[index].value) &&
+                        rule.rules[index].type !== 'date') || rule.rules[index].value === '' || rule.rules[index].value === null ||
+                        (rule.rules[index].value instanceof Array && valArray.length < 1))) {
                         const valElem = tempElem.querySelectorAll('.e-rule-value .e-control');
                         if (excludeOprs.indexOf(rule.rules[index].operator) < 0) {
                             isValid = false;
@@ -4218,9 +4217,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) {