@syncfusion/ej2-querybuilder 25.1.35 → 25.1.37

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

@@ -2122,17 +2122,11 @@ let QueryBuilder = class QueryBuilder extends Component {
         if (!this.dataColl.length && values.length) {
             isValues = true;
         }
-        let fieldValue = this.selectedRule.field;
-        const isNested = this.selectedRule.field.indexOf(this.separator);
-        if (isNested !== 0 && this.fieldMode !== 'DropdownTree') {
-            const nest = this.selectedRule.field.split(this.separator);
-            fieldValue = nest[nest.length - 1];
-        }
         let multiSelectValue;
         multiSelectValue = {
             dataSource: isValues ? values : (isFetched ? ds : this.dataManager),
             query: new Query([rule.field]),
-            fields: { text: fieldValue, value: fieldValue },
+            fields: { text: this.selectedRule.field, value: this.selectedRule.field },
             placeholder: this.l10n.getConstant('SelectValue'),
             value: selectedValue,
             mode: 'CheckBox',
@@ -5050,6 +5044,7 @@ let QueryBuilder = class QueryBuilder extends Component {
      */
     cloneRule(ruleID, groupID, index) {
         const getRule = this.getRule(ruleID.replace(this.element.id + '_', ''));
+        let isCloneRule = this.showButtons.cloneRule;
         groupID = groupID.replace(this.element.id + '_', '');
         this.ruleIndex = index;
         this.cloneRuleBtnClick = true;
@@ -5060,7 +5055,8 @@ let QueryBuilder = class QueryBuilder extends Component {
             }], groupID);
         this.ruleIndex = -1;
         this.cloneRuleBtnClick = false;
-        this.showButtons.cloneRule = false;
+        this.showButtons.cloneRule = isCloneRule;
+        isCloneRule = false;
     }
     /**
      * Clones the group based on the group ID to the specific group.
@@ -5073,6 +5069,7 @@ let QueryBuilder = class QueryBuilder extends Component {
     cloneGroup(groupID, parentGroupID, index) {
         parentGroupID = parentGroupID.replace(this.element.id + '_', '');
         const group = this.getGroup(parentGroupID);
+        let isCloneGroup = this.showButtons.cloneGroup;
         groupID = groupID.replace(this.element.id + '_', '');
         this.groupIndex = index;
         this.cloneGrpBtnClick = true;
@@ -5080,7 +5077,8 @@ let QueryBuilder = class QueryBuilder extends Component {
         this.addGroups([{ 'condition': group.condition, 'not': group.not, 'rules': group.rules }], groupID);
         this.groupIndex = -1;
         this.cloneGrpBtnClick = false;
-        this.showButtons.cloneGroup = false;
+        this.showButtons.cloneGroup = isCloneGroup;
+        isCloneGroup = false;
     }
     /**
      * Locks the rule based on the rule ID.
@@ -5089,6 +5087,9 @@ let QueryBuilder = class QueryBuilder extends Component {
      * @returns {void}
      */
     lockRule(ruleID) {
+        if (ruleID.indexOf(this.element.id) < 0) {
+            ruleID = this.element.id + '_' + ruleID;
+        }
         const target = document.getElementById(ruleID).querySelectorAll('.e-lock-rule-btn')[0];
         this.ruleLock(target);
     }
@@ -5099,6 +5100,9 @@ let QueryBuilder = class QueryBuilder extends Component {
      * @returns {void}
      */
     lockGroup(groupID) {
+        if (groupID.indexOf(this.element.id) < 0) {
+            groupID = this.element.id + '_' + groupID;
+        }
         const target = document.getElementById(groupID).querySelectorAll('.e-lock-grp-btn')[0];
         this.groupLock(target);
     }