@syncfusion/ej2-querybuilder 32.1.21 → 32.1.24

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

@@ -2928,8 +2928,8 @@ let QueryBuilder = class QueryBuilder extends Component {
         let ds;
         let isValues = false;
         this.isGetNestedData = false;
-        if (this.dataColl[1]) {
-            if (Object.keys(this.dataColl[1]).indexOf(rule.field) > -1) {
+        if (this.dataColl[0]) {
+            if (Object.keys(this.dataColl[0]).indexOf(rule.field) > -1) {
                 isFetched = true;
                 ds = this.getDistinctValues(this.dataColl, rule.field);
             }
@@ -2985,8 +2985,8 @@ let QueryBuilder = class QueryBuilder extends Component {
             }
             const value = this.selectedColumn.field;
             let isFetched = false;
-            if (this.dataColl[1]) {
-                if (Object.keys(this.dataColl[1]).indexOf(value) > -1) {
+            if (this.dataColl[0]) {
+                if (Object.keys(this.dataColl[0]).indexOf(value) > -1) {
                     isFetched = true;
                 }
                 const isNest = value.indexOf(this.separator);
@@ -3006,15 +3006,13 @@ let QueryBuilder = class QueryBuilder extends Component {
     getMultiSelectData(element, value) {
         let dummyData;
         const deferred = new Deferred();
-        const userQuery = (this.valueModel && this.valueModel.multiSelectModel && this.valueModel.multiSelectModel.query)
-            ? this.valueModel.multiSelectModel.query
-            : null;
+        const multiselectObj = getComponent(element, 'multiselect');
+        const userQuery = multiselectObj.query ? multiselectObj.query : null;
         const dataQuery = (userQuery && typeof userQuery.clone === 'function')
             ? userQuery.clone()
             : new Query();
         dataQuery.select([value]);
         const data = this.dataManager.executeQuery(dataQuery);
-        const multiselectObj = getComponent(element, 'multiselect');
         multiselectObj.hideSpinner();
         this.createSpinner(closest(element, '.e-multi-select-wrapper').parentElement);
         showSpinner(closest(element, '.e-multi-select-wrapper').parentElement);
@@ -3026,7 +3024,12 @@ let QueryBuilder = class QueryBuilder extends Component {
                 dummyData = e.result;
             }
             this.dataColl = extend(this.dataColl, dummyData, [], true);
-            multiselectObj.dataSource = this.getDistinctValues(this.dataColl, value);
+            const newData = this.getDistinctValues(this.dataColl, value);
+            const current = multiselectObj.dataSource;
+            if ((current.length !== newData.length &&
+                (JSON.stringify(current) !== JSON.stringify(newData)))) {
+                multiselectObj.dataSource = newData;
+            }
             this.isGetNestedData = true;
             hideSpinner(closest(element, '.e-multi-select-wrapper').parentElement);
         }).catch((e) => {