@syncfusion/ej2-querybuilder 31.2.4 → 31.2.15

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

@@ -2938,9 +2938,23 @@ let QueryBuilder = class QueryBuilder extends Component {
             isValues = true;
         }
         let multiSelectValue;
+        const multiSelectUserQuery = (this.valueModel && this.valueModel.multiSelectModel && this.valueModel.multiSelectModel.query)
+            ? this.valueModel.multiSelectModel.query
+            : null;
+        const multiSelectQuery = (multiSelectUserQuery && typeof multiSelectUserQuery.clone === 'function')
+            ? multiSelectUserQuery.clone()
+            : new Query();
+        const selectedField = rule.field;
+        if (selectedField) {
+            multiSelectQuery.select([selectedField]);
+        }
+        let resolvedQuery = new Query([rule.field]);
+        if (!isValues && !isFetched && (this.dataManager instanceof DataManager || this.dataSource instanceof DataManager)) {
+            resolvedQuery = multiSelectQuery;
+        }
         multiSelectValue = {
             dataSource: isValues ? values : (isFetched ? ds : this.dataManager),
-            query: new Query([rule.field]),
+            query: resolvedQuery,
             fields: { text: this.selectedRule.field, value: this.selectedRule.field },
             placeholder: this.l10n.getConstant('SelectValue'),
             value: selectedValue,
@@ -2991,7 +3005,14 @@ let QueryBuilder = class QueryBuilder extends Component {
     getMultiSelectData(element, value) {
         let dummyData;
         const deferred = new Deferred();
-        const data = this.dataManager.executeQuery(new Query().select(value));
+        const userQuery = (this.valueModel && this.valueModel.multiSelectModel && this.valueModel.multiSelectModel.query)
+            ? this.valueModel.multiSelectModel.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);
@@ -4613,7 +4634,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);
@@ -4636,7 +4663,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