@syncfusion/ej2-querybuilder 31.1.22 → 31.2.4

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 31.1.22
+*  version : 31.2.4
 *  Copyright Syncfusion Inc. 2001 - 2025. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@syncfusion/ej2-querybuilder",
-  "version": "31.1.22",
+  "version": "31.2.4",
   "description": "Essential JS 2 QueryBuilder",
   "author": "Syncfusion Inc.",
   "license": "SEE LICENSE IN license",
@@ -8,12 +8,12 @@
   "module": "./index.js",
   "es2015": "./dist/es6/ej2-querybuilder.es5.js",
   "dependencies": {
-    "@syncfusion/ej2-base": "~31.1.22",
-    "@syncfusion/ej2-buttons": "~31.1.21",
-    "@syncfusion/ej2-calendars": "~31.1.22",
-    "@syncfusion/ej2-dropdowns": "~31.1.22",
-    "@syncfusion/ej2-inputs": "~31.1.22",
-    "@syncfusion/ej2-splitbuttons": "~31.1.17"
+    "@syncfusion/ej2-base": "~31.2.4",
+    "@syncfusion/ej2-buttons": "~31.2.3",
+    "@syncfusion/ej2-calendars": "~31.2.4",
+    "@syncfusion/ej2-dropdowns": "~31.2.4",
+    "@syncfusion/ej2-inputs": "~31.2.4",
+    "@syncfusion/ej2-splitbuttons": "~31.2.2"
   },
   "devDependencies": {},
   "keywords": [

package/src/query-builder/query-builder-model.d.ts

@@ -285,6 +285,13 @@ export interface QueryBuilderModel extends ComponentModel{
      */
     created?: EmitType<Event>;
 
+    /**
+     * Triggers when the component is destroyed.
+     *
+     * @event destroyed
+     */
+    destroyed?: EmitType<Object>;
+
     /**
      * Triggers when field, operator, value is change.
      *

package/src/query-builder/query-builder.d.ts

@@ -349,6 +349,7 @@ export declare class QueryBuilder extends Component<HTMLDivElement> implements I
     private isDragEventPrevent;
     private isValueEmpty;
     private isPropChange;
+    private isRuleClicked;
     private ddTree;
     /**
      * Triggers when the component is created.
@@ -357,6 +358,12 @@ export declare class QueryBuilder extends Component<HTMLDivElement> implements I
      * @blazorProperty 'Created'
      */
     created: EmitType<Event>;
+    /**
+     * Triggers when the component is destroyed.
+     *
+     * @event destroyed
+     */
+    destroyed: EmitType<Object>;
     /**
      * Triggers when field, operator, value is change.
      *
@@ -672,6 +679,7 @@ export declare class QueryBuilder extends Component<HTMLDivElement> implements I
     private changeValue;
     private filterValue;
     private changeValueSuccessCallBack;
+    private setSecondDateMinFromFirst;
     private fieldClose;
     private changeField;
     private changeRule;

package/src/query-builder/query-builder.js

@@ -219,6 +219,7 @@ var QueryBuilder = /** @class */ (function (_super) {
         _this.cloneRuleBtnClick = false;
         _this.isValueEmpty = false;
         _this.isPropChange = false;
+        _this.isRuleClicked = false;
         MultiSelect.Inject(CheckBoxSelection);
         return _this;
     }
@@ -583,6 +584,7 @@ var QueryBuilder = /** @class */ (function (_super) {
                 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:
@@ -596,6 +598,7 @@ var QueryBuilder = /** @class */ (function (_super) {
                 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:
@@ -755,9 +758,11 @@ var QueryBuilder = /** @class */ (function (_super) {
             }
         }
         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);
         }
     };
@@ -959,6 +964,10 @@ var QueryBuilder = /** @class */ (function (_super) {
             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;
             var ruleCount = this.rule.rules.length;
             if (!column || (column && !column.ruleTemplate) || !rule.field) {
                 if (ruleCount > 20) {
@@ -2350,11 +2359,46 @@ var QueryBuilder = /** @class */ (function (_super) {
     QueryBuilder.prototype.changeValueSuccessCallBack = function (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' });
             }
         }
     };
+    QueryBuilder.prototype.setSecondDateMinFromFirst = function (element, valueIndex) {
+        if (valueIndex !== 0) {
+            return;
+        }
+        var ruleElem = closest(element, '.e-rule-container');
+        if (!ruleElem) {
+            return;
+        }
+        var operatorDropdownElement = ruleElem.querySelector('.e-rule-operator .e-dropdownlist');
+        if (!operatorDropdownElement) {
+            return;
+        }
+        var operatorDropdown = getComponent(operatorDropdownElement, 'dropdownlist');
+        var operatorValue = operatorDropdown && operatorDropdown.value ? operatorDropdown.value.toString().toLowerCase() : '';
+        if (operatorValue.indexOf('between') < 0) {
+            return;
+        }
+        var firstDateElement = document.getElementById(ruleElem.id + '_valuekey0');
+        var secondDateElement = document.getElementById(ruleElem.id + '_valuekey1');
+        if (!firstDateElement || !secondDateElement) {
+            return;
+        }
+        var firstDatePicker = getComponent(firstDateElement, 'datepicker');
+        var secondDatePicker = getComponent(secondDateElement, 'datepicker');
+        if (!firstDatePicker || !secondDatePicker || !(firstDatePicker.value instanceof Date)) {
+            return;
+        }
+        var 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;
+        }
+    };
     QueryBuilder.prototype.fieldClose = function (id) {
         if (this.isFieldChange || this.isDestroy) {
             return;
@@ -3341,6 +3385,12 @@ var QueryBuilder = /** @class */ (function (_super) {
                                     selVal = (length_1 > 1) ? rule.value[i] : rule.value;
                                     selectedValue = this.parseDate(selVal, format) || new Date();
                                 }
+                                if (!isNullOrUndefined(itemData) && itemData.value && !isTemplate) {
+                                    var 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) {
@@ -3382,6 +3432,19 @@ var QueryBuilder = /** @class */ (function (_super) {
                                             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) {
+                                            var parsedDate = this.parseDate(column.values[i], format);
+                                            if (!isNullOrUndefined(parsedDate) && parsedDate instanceof Date) {
+                                                datePicker.value = parsedDate;
+                                                if (i === 1) {
+                                                    var 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 = __assign({}, datePicker, this.valueModel.datePickerModel);
                                         }
@@ -4112,6 +4175,7 @@ var QueryBuilder = /** @class */ (function (_super) {
         }
         classList(this.element, [], ['e-rtl', 'e-responsive', 'e-device']);
         this.isDestroy = false;
+        _super.prototype.destroy.call(this);
     };
     /**
      * Adds single or multiple rules.
@@ -7510,6 +7574,9 @@ var QueryBuilder = /** @class */ (function (_super) {
     __decorate([
         Event()
     ], QueryBuilder.prototype, "created", void 0);
+    __decorate([
+        Event()
+    ], QueryBuilder.prototype, "destroyed", void 0);
     __decorate([
         Event()
     ], QueryBuilder.prototype, "actionBegin", void 0);

package/styles/bds-lite.css

@@ -836,7 +836,7 @@
   color: #d92c20;
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/bds.css

@@ -836,7 +836,7 @@
   color: #d92c20;
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/bootstrap-dark-lite.css

@@ -733,7 +733,7 @@
   color: #f44336;
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/bootstrap-dark.css

@@ -733,7 +733,7 @@
   color: #f44336;
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/bootstrap-lite.css

@@ -718,7 +718,7 @@
   color: #f44336;
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/bootstrap.css

@@ -718,7 +718,7 @@
   color: #f44336;
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/bootstrap4-lite.css

@@ -794,7 +794,7 @@
   color: #f44336;
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/bootstrap4.css

@@ -794,7 +794,7 @@
   color: #f44336;
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/bootstrap5-dark-lite.css

@@ -773,7 +773,7 @@
   color: #dc3545;
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/bootstrap5-dark.css

@@ -773,7 +773,7 @@
   color: #dc3545;
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/bootstrap5-lite.css

@@ -773,7 +773,7 @@
   color: #dc3545;
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/bootstrap5.3-lite.css

@@ -784,7 +784,7 @@
           box-shadow: inset 0 0 0 1px var(--color-sf-shadow-color), inset 0 0 0 2px var(--color-sf-shadow-color1) !important; /* stylelint-disable-line declaration-no-important */
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/bootstrap5.3.css

@@ -784,7 +784,7 @@
           box-shadow: inset 0 0 0 1px var(--color-sf-shadow-color), inset 0 0 0 2px var(--color-sf-shadow-color1) !important; /* stylelint-disable-line declaration-no-important */
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/bootstrap5.css

@@ -773,7 +773,7 @@
   color: #dc3545;
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/fabric-dark-lite.css

@@ -695,7 +695,7 @@
   color: #f44336;
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/fabric-dark.css

@@ -695,7 +695,7 @@
   color: #f44336;
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/fabric-lite.css

@@ -684,7 +684,7 @@
   color: #f44336;
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/fabric.css

@@ -684,7 +684,7 @@
   color: #f44336;
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/fluent-dark-lite.css

@@ -764,7 +764,7 @@
   color: #d13438;
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/fluent-dark.css

@@ -764,7 +764,7 @@
   color: #d13438;
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/fluent-lite.css

@@ -764,7 +764,7 @@
   color: #d13438;
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/fluent.css

@@ -764,7 +764,7 @@
   color: #d13438;
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/fluent2-lite.css

@@ -776,7 +776,7 @@
   background: var(--color-sf-content-bg-color-alt1) !important; /* stylelint-disable-line declaration-no-important */
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/fluent2.css

@@ -776,7 +776,7 @@
   background: var(--color-sf-content-bg-color-alt1) !important; /* stylelint-disable-line declaration-no-important */
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/highcontrast-light-lite.css

@@ -778,7 +778,7 @@
   color: #000;
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/highcontrast-light.css

@@ -778,7 +778,7 @@
   color: #000;
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/highcontrast-lite.css

@@ -806,7 +806,7 @@
   color: #fff;
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/highcontrast.css

@@ -806,7 +806,7 @@
   color: #fff;
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/material-dark-lite.css

@@ -730,7 +730,7 @@
   color: #f44336;
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/material-dark.css

@@ -730,7 +730,7 @@
   color: #f44336;
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/material-lite.css

@@ -745,7 +745,7 @@
   color: #f44336;
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/material.css

@@ -745,7 +745,7 @@
   color: #f44336;
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;

package/styles/material3-dark-lite.css

@@ -743,7 +743,7 @@
   color: rgba(var(--color-sf-error));
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;
@@ -751,8 +751,8 @@
           transform: translateX(-50%);
   width: 16px;
   height: 16px;
-  border: 2px solid var(--color-sf-primary-container);
-  border-top: 2px solid var(--color-sf-primary);
+  border: 2px solid rgba(var(--color-sf-primary-container));
+  border-top: 2px solid rgba(var(--color-sf-primary));
   border-radius: 50%;
   -webkit-animation: spin 1s linear infinite;
           animation: spin 1s linear infinite;

package/styles/material3-dark.css

@@ -743,7 +743,7 @@
   color: rgba(var(--color-sf-error));
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;
@@ -751,8 +751,8 @@
           transform: translateX(-50%);
   width: 16px;
   height: 16px;
-  border: 2px solid var(--color-sf-primary-container);
-  border-top: 2px solid var(--color-sf-primary);
+  border: 2px solid rgba(var(--color-sf-primary-container));
+  border-top: 2px solid rgba(var(--color-sf-primary));
   border-radius: 50%;
   -webkit-animation: spin 1s linear infinite;
           animation: spin 1s linear infinite;

package/styles/material3-lite.css

@@ -745,7 +745,7 @@
   color: rgba(var(--color-sf-error));
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;
@@ -753,8 +753,8 @@
           transform: translateX(-50%);
   width: 16px;
   height: 16px;
-  border: 2px solid var(--color-sf-primary-container);
-  border-top: 2px solid var(--color-sf-primary);
+  border: 2px solid rgba(var(--color-sf-primary-container));
+  border-top: 2px solid rgba(var(--color-sf-primary));
   border-radius: 50%;
   -webkit-animation: spin 1s linear infinite;
           animation: spin 1s linear infinite;

package/styles/material3.css

@@ -745,7 +745,7 @@
   color: rgba(var(--color-sf-error));
 }
 
-.querybuilder-spinner::before {
+.e-querybuilder-spinner::before {
   content: "";
   position: absolute;
   left: 50%;
@@ -753,8 +753,8 @@
           transform: translateX(-50%);
   width: 16px;
   height: 16px;
-  border: 2px solid var(--color-sf-primary-container);
-  border-top: 2px solid var(--color-sf-primary);
+  border: 2px solid rgba(var(--color-sf-primary-container));
+  border-top: 2px solid rgba(var(--color-sf-primary));
   border-radius: 50%;
   -webkit-animation: spin 1s linear infinite;
           animation: spin 1s linear infinite;

package/styles/query-builder/_bds-definition.scss

@@ -112,3 +112,5 @@ $qrybldr-drag-grp-list-heg: 29px !default;
 $qrybldr-drag-grp-big-list-heg: 35px !default;
 $qrybldr-drag-grp-big-icon-pad: 10px 10px 10px 5px !default;
 $qryblr-drag-icon-color: $secondary-text-color !default;
+$spinner-border-light-color: $primary-light !default;
+$spinner-border-color: $primary !default;

package/styles/query-builder/_bootstrap-dark-definition.scss

@@ -110,5 +110,5 @@ $qrybldr-drag-grp-list-heg: 29px !default;
 $qrybldr-drag-grp-big-list-heg: 35px !default;
 $qrybldr-drag-grp-big-icon-pad: 10px 10px 10px 5px !default;
 $qryblr-drag-icon-color: $grey-dark-font !default;
-$primary-light: $brand-primary-lighten-40;
-$primary: $brand-primary;
+$spinner-border-light-color: $brand-primary-lighten-40 !default;
+$spinner-border-color: $brand-primary !default;

package/styles/query-builder/_bootstrap-definition.scss

@@ -112,3 +112,5 @@ $qrybldr-drag-grp-big-icon-pad: 10px 10px 10px 5px !default;
 $qryblr-drag-icon-color: $grey-light-font !default;
 $primary: $brand-primary;
 $primary-light: $brand-info;
+$spinner-border-light-color: $primary-light !default;
+$spinner-border-color: $primary !default;