@syncfusion/ej2-querybuilder 27.2.2 → 27.2.5

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 27.2.2
+*  version : 27.2.5
 *  Copyright Syncfusion Inc. 2001 - 2023. 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,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-querybuilder@*",
-  "_id": "@syncfusion/ej2-querybuilder@27.1.58",
+  "_id": "@syncfusion/ej2-querybuilder@27.2.3",
   "_inBundle": false,
-  "_integrity": "sha512-GP3/eO4mDiKkSUrJ9OILXUzhsBJ4TkETBnMfKw6MYL26oyTtYKp2UerbWggfsCzQmHonq30eE4VkEFOfxntbsQ==",
+  "_integrity": "sha512-pQbPQ9au6eCFMjmbiVUUq+zlocT/uOCUgrYU1buGLIfP3Djgzy87yzYmar3pFm6/tR2IGhULLNmqS7CHak0nLA==",
   "_location": "/@syncfusion/ej2-querybuilder",
   "_phantomChildren": {},
   "_requested": {
@@ -23,8 +23,8 @@
     "/@syncfusion/ej2-react-querybuilder",
     "/@syncfusion/ej2-vue-querybuilder"
   ],
-  "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-querybuilder/-/ej2-querybuilder-27.1.58.tgz",
-  "_shasum": "157b3f75eb335fa1d7dc22bd89e1472b1759869d",
+  "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-querybuilder/-/ej2-querybuilder-27.2.3.tgz",
+  "_shasum": "80108ed5967328c86d788cb1776fc6fca6e918c9",
   "_spec": "@syncfusion/ej2-querybuilder@*",
   "_where": "/jenkins/workspace/elease-automation_release_27.1.1/packages/included",
   "author": {
@@ -32,11 +32,11 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~27.2.2",
-    "@syncfusion/ej2-buttons": "~27.2.2",
-    "@syncfusion/ej2-calendars": "~27.2.2",
-    "@syncfusion/ej2-dropdowns": "~27.2.2",
-    "@syncfusion/ej2-inputs": "~27.2.2",
+    "@syncfusion/ej2-base": "~27.2.5",
+    "@syncfusion/ej2-buttons": "~27.2.4",
+    "@syncfusion/ej2-calendars": "~27.2.3",
+    "@syncfusion/ej2-dropdowns": "~27.2.5",
+    "@syncfusion/ej2-inputs": "~27.2.4",
     "@syncfusion/ej2-splitbuttons": "~27.2.2"
   },
   "deprecated": false,
@@ -66,7 +66,7 @@
     "url": "https://github.com/syncfusion/ej2-javascript-ui-controls/tree/master/controls/querybuilder"
   },
   "typings": "index.d.ts",
-  "version": "27.2.2",
+  "version": "27.2.5",
   "sideEffects": false,
   "homepage": "https://www.syncfusion.com/javascript-ui-controls"
 }

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

@@ -2853,9 +2853,17 @@ var QueryBuilder = /** @class */ (function (_super) {
     };
     QueryBuilder.prototype.getItemData = function (parentId) {
         var fieldObj = getComponent(document.getElementById(parentId + '_filterkey'), 'dropdownlist');
+        var parentFieldObj = this.element.querySelector("#" + parentId);
         if (this.fieldMode === 'DropdownTree') {
             fieldObj = getComponent(document.getElementById(parentId + '_filterkey'), 'dropdowntree');
         }
+        else if (parentFieldObj) {
+            var subFieldObjList = parentFieldObj.querySelectorAll('.e-rule-sub-filter');
+            if (subFieldObjList.length > 0) {
+                var lastSubFieldObj = subFieldObjList[subFieldObjList.length - 1].querySelector('.e-dropdownlist');
+                fieldObj = getComponent(lastSubFieldObj, 'dropdownlist');
+            }
+        }
         return this.fieldMode === 'DropdownTree' ? this.getColumn(fieldObj.value[0]) : this.getColumn(fieldObj.value);
     };
     QueryBuilder.prototype.setDefaultValue = function (parentId, isArryValue, isNumber) {
@@ -2904,6 +2912,11 @@ var QueryBuilder = /** @class */ (function (_super) {
                     this.setDefaultValue(parentId, true, false);
                 selectedValue = selectedVal.join(',');
             }
+            if (operator === 'between' || operator === 'notbetween') {
+                if (selectedValue.length > 1) {
+                    selectedValue = selectedValue[idx];
+                }
+            }
             var txtBox = void 0;
             txtBox = {
                 placeholder: this.l10n.getConstant('SelectValue'),
@@ -3207,7 +3220,7 @@ var QueryBuilder = /** @class */ (function (_super) {
     QueryBuilder.prototype.getPreviousItemData = function (prevItemData, column) {
         if (this.isFieldClose && prevItemData) {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            prevItemData = this.getColumn(prevItemData.value);
+            prevItemData = this.getColumn(prevItemData.value ? prevItemData.value : prevItemData.field);
         }
         if (column && column.template && prevItemData && Object.keys(prevItemData).length < 4) {
             prevItemData.template = column.template;
@@ -3642,6 +3655,12 @@ var QueryBuilder = /** @class */ (function (_super) {
                         rule.rules[index].value = this.processValueString(selectedValue, rule.rules[index].type);
                     }
                 }
+                else if (oper === 'between' || oper === 'notbetween') {
+                    if (typeof rule.rules[index].value === 'string') {
+                        rule.rules[index].value = [];
+                    }
+                    rule.rules[index].value[i] = selectedValue;
+                }
                 else {
                     rule.rules[index].value = selectedValue;
                 }
@@ -5223,6 +5242,10 @@ var QueryBuilder = /** @class */ (function (_super) {
                 if ((rule.operator === 'in' || rule.operator === 'notin') && rule.value && rule.value.length === 0) {
                     rule = {};
                 }
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                if ((rule.operator === 'between' || rule.operator === 'notbetween') && Array.isArray(rule.value) && (rule.value.length < 2 || rule.value.some(function (val) { return val === '' || val === null; }))) {
+                    rule = {};
+                }
             }
             else {
                 rule = {};

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

@@ -277,6 +277,7 @@ var QueryLibrary = /** @class */ (function () {
         var stringValue;
         var key;
         var betweenValue;
+        var fieldType;
         var condition;
         var value;
         var subRules;
@@ -448,7 +449,14 @@ var QueryLibrary = /** @class */ (function () {
                                 ruleValue = stringValue.replace('$', '');
                                 type = 'string';
                             }
-                            if (!isNaN(Date.parse(stringValue))) { // Date type operators
+                            for (var _i = 0, _a = this.parent.columns; _i < _a.length; _i++) {
+                                var column = _a[_i];
+                                if (column.field === condition) {
+                                    fieldType = column.type;
+                                    break;
+                                }
+                            }
+                            if (!isNaN(Date.parse(stringValue)) || fieldType === 'date') { // Date type operators
                                 operatorValue = operatorValue || this.getOperatorFromMongoOperator(key);
                                 type = 'date';
                                 ruleValue = stringValue;

package/styles/bootstrap5-dark-lite.css

@@ -125,6 +125,10 @@
   border-left-width: 0;
 }
 
+.e-float-input.e-control-wrapper.e-multiselect input[readonly] {
+  background: transparent;
+}
+
 /* stylelint-disable-line no-empty-source */
 /* stylelint-disable property-no-vendor-prefix */
 @-webkit-keyframes material-spinner-rotate {

package/styles/bootstrap5-dark.css

@@ -125,6 +125,10 @@
   border-left-width: 0;
 }
 
+.e-float-input.e-control-wrapper.e-multiselect input[readonly] {
+  background: transparent;
+}
+
 /* stylelint-disable-line no-empty-source */
 /* stylelint-disable property-no-vendor-prefix */
 @-webkit-keyframes material-spinner-rotate {

package/styles/bootstrap5-lite.css

@@ -125,6 +125,10 @@
   border-left-width: 0;
 }
 
+.e-float-input.e-control-wrapper.e-multiselect input[readonly] {
+  background: transparent;
+}
+
 /* stylelint-disable-line no-empty-source */
 /* stylelint-disable property-no-vendor-prefix */
 @-webkit-keyframes material-spinner-rotate {

package/styles/bootstrap5.3-lite.css

@@ -129,6 +129,10 @@
   border-left-width: 0;
 }
 
+.e-float-input.e-control-wrapper.e-multiselect input[readonly] {
+  background: transparent;
+}
+
 /* stylelint-disable-line no-empty-source */
 /* stylelint-disable property-no-vendor-prefix */
 @-webkit-keyframes material-spinner-rotate {

package/styles/bootstrap5.3.css

@@ -129,6 +129,10 @@
   border-left-width: 0;
 }
 
+.e-float-input.e-control-wrapper.e-multiselect input[readonly] {
+  background: transparent;
+}
+
 /* stylelint-disable-line no-empty-source */
 /* stylelint-disable property-no-vendor-prefix */
 @-webkit-keyframes material-spinner-rotate {

package/styles/bootstrap5.css

@@ -125,6 +125,10 @@
   border-left-width: 0;
 }
 
+.e-float-input.e-control-wrapper.e-multiselect input[readonly] {
+  background: transparent;
+}
+
 /* stylelint-disable-line no-empty-source */
 /* stylelint-disable property-no-vendor-prefix */
 @-webkit-keyframes material-spinner-rotate {

package/styles/query-builder/bootstrap5-dark.css

@@ -125,6 +125,10 @@
   border-left-width: 0;
 }
 
+.e-float-input.e-control-wrapper.e-multiselect input[readonly] {
+  background: transparent;
+}
+
 /* stylelint-disable-line no-empty-source */
 /* stylelint-disable property-no-vendor-prefix */
 @-webkit-keyframes material-spinner-rotate {

package/styles/query-builder/bootstrap5.3.css

@@ -129,6 +129,10 @@
   border-left-width: 0;
 }
 
+.e-float-input.e-control-wrapper.e-multiselect input[readonly] {
+  background: transparent;
+}
+
 /* stylelint-disable-line no-empty-source */
 /* stylelint-disable property-no-vendor-prefix */
 @-webkit-keyframes material-spinner-rotate {

package/styles/query-builder/bootstrap5.css

@@ -125,6 +125,10 @@
   border-left-width: 0;
 }
 
+.e-float-input.e-control-wrapper.e-multiselect input[readonly] {
+  background: transparent;
+}
+
 /* stylelint-disable-line no-empty-source */
 /* stylelint-disable property-no-vendor-prefix */
 @-webkit-keyframes material-spinner-rotate {