@syncfusion/ej2-querybuilder 31.2.12 → 31.2.16

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

@@ -162,6 +162,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         this.isValueEmpty = false;
         this.isPropChange = false;
         this.isRuleClicked = false;
+        this.groupCloned = false;
         MultiSelect.Inject(CheckBoxSelection);
     }
     getPersistData() {
@@ -530,7 +531,7 @@ let QueryBuilder = class QueryBuilder extends Component {
                     break;
                 case target.className.indexOf('e-clone-grp-btn') > -1:
                     this.actionButton = target;
-                    this.cloneGrpBtnClick = true;
+                    this.cloneGrpBtnClick = this.groupCloned = true;
                     this.isRuleClicked = true;
                     this.groupClone(closest(target, '.e-group-container'));
                     break;
@@ -4140,6 +4141,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         if (this.isAddSuccess || this.element.querySelectorAll('.e-group-container').length <= this.maxGroupCount) {
             groupID = this.element.id + '_' + groupID;
             const groupElem = document.getElementById(groupID);
+            const temp = this.groupIndex;
             const rule = this.getParentGroup(groupElem);
             const grouplen = groups.length;
             if (grouplen) {
@@ -4162,6 +4164,11 @@ let QueryBuilder = class QueryBuilder extends Component {
                     not = this.updatedRule.not;
                     isLocked = this.updatedRule.isLocked;
                 }
+                if (this.groupCloned) {
+                    const parent = this.element.querySelector('#' + groupID);
+                    const topLevelGroups = parent.querySelectorAll(':scope > .e-group-body > .e-rule-list > .e-group-container');
+                    this.groupIndex = topLevelGroups.length > 1 ? topLevelGroups.length - 1 : 0;
+                }
                 if (this.groupIndex < 0) {
                     if (this.enableNotCondition) {
                         rule.rules.push({ 'condition': condition, 'not': not, rules: [] });
@@ -4178,6 +4185,9 @@ let QueryBuilder = class QueryBuilder extends Component {
                         rule.rules.splice(this.groupIndex + 1, 0, { condition: condition, rules: [], isLocked: isLocked });
                     }
                 }
+                if (this.groupCloned) {
+                    this.groupIndex = temp;
+                }
             }
             if (!this.headerTemplate) {
                 this.disableRuleCondition(groupElem, rule, null, this.enableSeparateConnector ? true : null);
@@ -4634,7 +4644,13 @@ let QueryBuilder = class QueryBuilder extends Component {
         this.customOperators['numberOperator'] = this.customOperators['numberOperator'].concat(numberOper); // tslint:disable-line
         if (this.dataSource instanceof DataManager) {
             this.dataManager = this.dataSource;
-            this.executeDataManager(new Query().take(1));
+            if (this.columns && this.columns.length) {
+                this.dataColl = this.columns;
+                this.initControl();
+            }
+            else {
+                this.executeDataManager(new Query().take(1));
+            }
         }
         else {
             this.dataManager = new DataManager(this.dataSource);
@@ -4657,7 +4673,8 @@ let QueryBuilder = class QueryBuilder extends Component {
             isReplaceDragEle: true,
             isPreventSelect: false,
             abort: '.e-parent-header',
-            isDragScroll: true
+            isDragScroll: true,
+            enableAutoScroll: true
         });
     }
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -6685,13 +6702,13 @@ let QueryBuilder = class QueryBuilder extends Component {
         let isCloneGroup = this.showButtons.cloneGroup;
         groupID = groupID.replace(this.element.id + '_', '');
         this.groupIndex = index;
-        this.cloneGrpBtnClick = true;
+        this.cloneGrpBtnClick = this.groupCloned = true;
         this.showButtons.cloneGroup = true;
         this.addGroups([{ 'condition': group.condition, 'not': group.not, 'rules': group.rules }], groupID);
         this.groupIndex = -1;
         this.cloneGrpBtnClick = false;
         this.showButtons.cloneGroup = isCloneGroup;
-        isCloneGroup = false;
+        isCloneGroup = this.groupCloned = false;
     }
     /**
      * Locks the rule based on the rule ID.
@@ -7240,6 +7257,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         this.groupIndex = Array.prototype.indexOf.call(target.closest('.e-rule-list').children, target.closest('.e-group-container'));
         this.addGroups([{ 'condition': group.condition, 'not': group.not, 'rules': group.rules }], groupId);
         this.groupIndex = -1;
+        this.groupCloned = false;
     }
     ruleClone(target) {
         const ruleElem = closest(target, '.e-rule-container');