@syncfusion/ej2-querybuilder 31.2.2 → 31.2.12

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

@@ -2283,11 +2283,46 @@ let QueryBuilder = class QueryBuilder extends Component {
     changeValueSuccessCallBack(args, element, i, groupID, ruleID) {
         if (!args.cancel) {
             this.updateRules(element, args.value, i);
+            this.setSecondDateMinFromFirst(element, i);
             if (!this.isImportRules) {
                 this.trigger('change', { groupID: groupID, ruleID: ruleID, value: args.value, cancel: false, type: 'value' });
             }
         }
     }
+    setSecondDateMinFromFirst(element, valueIndex) {
+        if (valueIndex !== 0) {
+            return;
+        }
+        const ruleElem = closest(element, '.e-rule-container');
+        if (!ruleElem) {
+            return;
+        }
+        const operatorDropdownElement = ruleElem.querySelector('.e-rule-operator .e-dropdownlist');
+        if (!operatorDropdownElement) {
+            return;
+        }
+        const operatorDropdown = getComponent(operatorDropdownElement, 'dropdownlist');
+        const operatorValue = operatorDropdown && operatorDropdown.value ? operatorDropdown.value.toString().toLowerCase() : '';
+        if (operatorValue.indexOf('between') < 0) {
+            return;
+        }
+        const firstDateElement = document.getElementById(ruleElem.id + '_valuekey0');
+        const secondDateElement = document.getElementById(ruleElem.id + '_valuekey1');
+        if (!firstDateElement || !secondDateElement) {
+            return;
+        }
+        const firstDatePicker = getComponent(firstDateElement, 'datepicker');
+        const secondDatePicker = getComponent(secondDateElement, 'datepicker');
+        if (!firstDatePicker || !secondDatePicker || !(firstDatePicker.value instanceof Date)) {
+            return;
+        }
+        const nextDay = new Date(firstDatePicker.value.getTime());
+        nextDay.setDate(nextDay.getDate() + 1);
+        secondDatePicker.min = nextDay;
+        if (secondDatePicker.value instanceof Date && secondDatePicker.value.getTime() < nextDay.getTime()) {
+            secondDatePicker.value = nextDay;
+        }
+    }
     fieldClose(id) {
         if (this.isFieldChange || this.isDestroy) {
             return;
@@ -2903,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,
@@ -2956,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);
@@ -3267,6 +3323,12 @@ let QueryBuilder = class QueryBuilder extends Component {
                                     selVal = (length > 1) ? rule.value[i] : rule.value;
                                     selectedValue = this.parseDate(selVal, format) || new Date();
                                 }
+                                if (!isNullOrUndefined(itemData) && itemData.value && !isTemplate) {
+                                    const parsedDate = this.parseDate(itemData.value.toString(), itemData.format);
+                                    if (parsedDate && !isNaN(parsedDate.getTime())) {
+                                        selectedValue = parsedDate;
+                                    }
+                                }
                                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                                 if (!itemData.field && !itemData.key && itemData.value) {
                                     if (itemData.value instanceof Date) {
@@ -3308,6 +3370,19 @@ let QueryBuilder = class QueryBuilder extends Component {
                                             value: selectedValue, locale: this.getLocale(), placeholder: place,
                                             format: formatObj.format, change: this.changeValue.bind(this, i)
                                         };
+                                        if (!isNullOrUndefined(column) && !isNullOrUndefined(column.values) && column.values.length > 0) {
+                                            const parsedDate = this.parseDate(column.values[i], format);
+                                            if (!isNullOrUndefined(parsedDate) && parsedDate instanceof Date) {
+                                                datePicker.value = parsedDate;
+                                                if (i === 1) {
+                                                    const parsedMinDate = this.parseDate(column.values[0], format);
+                                                    if (parsedMinDate instanceof Date && !isNaN(parsedMinDate.getTime())) {
+                                                        parsedMinDate.setDate(parsedMinDate.getDate() + 1);
+                                                        datePicker.min = parsedMinDate;
+                                                    }
+                                                }
+                                            }
+                                        }
                                         if (this.valueModel && this.valueModel.datePickerModel) {
                                             datePicker = Object.assign({}, datePicker, this.valueModel.datePickerModel);
                                         }