@syncfusion/ej2-querybuilder 31.1.22 → 31.2.4

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

@@ -161,6 +161,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         this.cloneRuleBtnClick = false;
         this.isValueEmpty = false;
         this.isPropChange = false;
+        this.isRuleClicked = false;
         MultiSelect.Inject(CheckBoxSelection);
     }
     getPersistData() {
@@ -516,6 +517,7 @@ let QueryBuilder = class QueryBuilder extends Component {
                 case target.className.indexOf('e-clone-rule-btn') > -1:
                     this.actionButton = target;
                     this.cloneRuleBtnClick = true;
+                    this.isRuleClicked = true;
                     this.ruleClone(target);
                     break;
                 case target.className.indexOf('e-lock-rule-btn') > -1:
@@ -529,6 +531,7 @@ let QueryBuilder = class QueryBuilder extends Component {
                 case target.className.indexOf('e-clone-grp-btn') > -1:
                     this.actionButton = target;
                     this.cloneGrpBtnClick = true;
+                    this.isRuleClicked = true;
                     this.groupClone(closest(target, '.e-group-container'));
                     break;
                 case target.className.indexOf('e-deletegroup') > -1:
@@ -688,9 +691,11 @@ let QueryBuilder = class QueryBuilder extends Component {
             }
         }
         else if (event.element.children[0].className.indexOf('e-addrule') > -1) {
+            this.isRuleClicked = true;
             this.addRuleElement(closest(target, '.e-group-container'), {});
         }
         else if (event.element.children[0].className.indexOf('e-addgroup') > -1) {
+            this.isRuleClicked = true;
             this.addGroupElement(true, closest(target, '.e-group-container'), '', true);
         }
     }
@@ -889,6 +894,10 @@ let QueryBuilder = class QueryBuilder extends Component {
             if (!this.isImportRules) {
                 this.updateAddedRule(trgt, rule, newRule, isRlTmp, pId, this.enableSeparateConnector ? true : null);
             }
+            if (this.rule.condition === '' && (this.isRuleClicked || this.rule.rules.length > 1)) {
+                this.rule.condition = 'and';
+            }
+            this.isRuleClicked = false;
             const ruleCount = this.rule.rules.length;
             if (!column || (column && !column.ruleTemplate) || !rule.field) {
                 if (ruleCount > 20) {
@@ -2274,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;
@@ -3258,6 +3302,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) {
@@ -3299,6 +3349,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);
                                         }
@@ -4028,6 +4091,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         }
         classList(this.element, [], ['e-rtl', 'e-responsive', 'e-device']);
         this.isDestroy = false;
+        super.destroy();
     }
     /**
      * Adds single or multiple rules.
@@ -7418,6 +7482,9 @@ let QueryBuilder = class QueryBuilder extends Component {
 __decorate([
     Event()
 ], QueryBuilder.prototype, "created", void 0);
+__decorate([
+    Event()
+], QueryBuilder.prototype, "destroyed", void 0);
 __decorate([
     Event()
 ], QueryBuilder.prototype, "actionBegin", void 0);