@syncfusion/ej2-querybuilder 25.1.35 → 25.1.38

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 25.1.35
+*  version : 25.1.38
 *  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@18.24.1",
+  "_id": "@syncfusion/ej2-querybuilder@25.1.37",
   "_inBundle": false,
-  "_integrity": "sha512-ujZuYcmKu3KsFyS06QnLCHFo2iAoP/xGSfn5H5+Bz72cs7gO8fkLxDHEGZ/FAq5d3H5knyxsbczY4M/T4d/A0g==",
+  "_integrity": "sha512-82Ugl8XToVyBNpReqvpq6VltiaoMT+MCsZYQwT+vBYxBWBhnXgQJ4iZ5r6HyF7EePtMZhYgeRZED0K0AbGpRWw==",
   "_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-release/@syncfusion/ej2-querybuilder/-/ej2-querybuilder-18.24.1.tgz",
-  "_shasum": "9c720eb30d9ffdbd3b0fdff5462862a88930b6ed",
+  "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-querybuilder/-/ej2-querybuilder-25.1.37.tgz",
+  "_shasum": "db89eb0ea98202e49522c04dd6bfdba7db0c030f",
   "_spec": "@syncfusion/ej2-querybuilder@*",
   "_where": "/jenkins/workspace/elease-automation_release_25.1.1/packages/included",
   "author": {
@@ -34,10 +34,10 @@
   "dependencies": {
     "@syncfusion/ej2-base": "~25.1.35",
     "@syncfusion/ej2-buttons": "~25.1.35",
-    "@syncfusion/ej2-calendars": "~25.1.35",
-    "@syncfusion/ej2-dropdowns": "~25.1.35",
-    "@syncfusion/ej2-inputs": "~25.1.35",
-    "@syncfusion/ej2-splitbuttons": "~25.1.35"
+    "@syncfusion/ej2-calendars": "~25.1.37",
+    "@syncfusion/ej2-dropdowns": "~25.1.37",
+    "@syncfusion/ej2-inputs": "~25.1.38",
+    "@syncfusion/ej2-splitbuttons": "~25.1.38"
   },
   "deprecated": false,
   "description": "Essential JS 2 QueryBuilder",
@@ -66,7 +66,7 @@
     "url": "https://github.com/syncfusion/ej2-javascript-ui-controls/tree/master/controls/querybuilder"
   },
   "typings": "index.d.ts",
-  "version": "25.1.35",
+  "version": "25.1.38",
   "sideEffects": false,
   "homepage": "https://www.syncfusion.com/javascript-ui-controls"
 }

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

@@ -1822,7 +1822,7 @@ var QueryBuilder = /** @class */ (function (_super) {
             this.GetRootColumnName(rule.field) === this.GetRootColumnName(this.previousColumn.field))) {
             var subField = this.selectedColumn.columns;
             for (var i = 0; i < subField.length; i++) {
-                if (rule.field === subField[i].field) {
+                if (rule.field === subField[i].field || rule.field.indexOf(subField[i].field + this.separator) > -1) {
                     dropDownList.value = subField[i].field;
                     this.selectedColumn = subField[i];
                     subFieldValue = true;
@@ -2192,17 +2192,11 @@ var QueryBuilder = /** @class */ (function (_super) {
         if (!this.dataColl.length && values.length) {
             isValues = true;
         }
-        var fieldValue = this.selectedRule.field;
-        var isNested = this.selectedRule.field.indexOf(this.separator);
-        if (isNested !== 0 && this.fieldMode !== 'DropdownTree') {
-            var nest = this.selectedRule.field.split(this.separator);
-            fieldValue = nest[nest.length - 1];
-        }
         var multiSelectValue;
         multiSelectValue = {
             dataSource: isValues ? values : (isFetched ? ds : this.dataManager),
             query: new Query([rule.field]),
-            fields: { text: fieldValue, value: fieldValue },
+            fields: { text: this.selectedRule.field, value: this.selectedRule.field },
             placeholder: this.l10n.getConstant('SelectValue'),
             value: selectedValue,
             mode: 'CheckBox',
@@ -2333,7 +2327,7 @@ var QueryBuilder = /** @class */ (function (_super) {
         var columnData = this.getItemData(parentId);
         var selectedValue;
         var isTemplate = (typeof columnData.template === 'string');
-        if (this.isImportRules || this.ruleIndex > -1 || this.groupIndex > -1 || this.isPublic || isTemplate) {
+        if (this.isImportRules || this.ruleIndex > -1 || this.groupIndex > -1 || this.isPublic || isTemplate || rule.value != '') {
             selectedValue = rule.value;
         }
         else {
@@ -2372,7 +2366,7 @@ var QueryBuilder = /** @class */ (function (_super) {
     QueryBuilder.prototype.renderNumberValue = function (parentId, rule, operator, idx, ruleValElem, itemData, length) {
         var columnData = this.getItemData(parentId);
         var isTemplate = (typeof columnData.template === 'string');
-        var selectedVal = (this.isImportRules || this.ruleIndex > -1 || this.groupIndex > -1 || this.isPublic || isTemplate) ? rule.value : this.setDefaultValue(parentId, false, true);
+        var selectedVal = (this.isImportRules || this.ruleIndex > -1 || this.groupIndex > -1 || this.isPublic || isTemplate || typeof rule.value === 'number') ? rule.value : this.setDefaultValue(parentId, false, true);
         if ((operator === 'in' || operator === 'notin') && (this.dataColl.length || columnData.values)) {
             selectedVal = (this.isImportRules || this.ruleIndex > -1 || this.groupIndex > -1) ? rule.value : this.setDefaultValue(parentId, true, false);
             this.renderMultiSelect(columnData, parentId, idx, selectedVal, columnData.values);
@@ -2508,6 +2502,10 @@ var QueryBuilder = /** @class */ (function (_super) {
                                 var datePicker = void 0;
                                 var place = this.l10n.getConstant('SelectValue');
                                 var isTemplate = (typeof itemData.template === 'string');
+                                if (rule.value && !isNullOrUndefined(format)) {
+                                    selVal = (length_1 > 1) ? rule.value[i] : rule.value;
+                                    selectedValue = this.parseDate(selVal, format) || new Date();
+                                }
                                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                                 if (!itemData.field && !itemData.key && itemData.value) {
                                     if (itemData.value instanceof Date) {
@@ -2608,7 +2606,15 @@ var QueryBuilder = /** @class */ (function (_super) {
                 isCheck = values[i].toString().toLowerCase() === itemData.value.toString().toLowerCase();
             }
             else if (i === 0) {
-                isCheck = true;
+                if (typeof rule.value === 'boolean') {
+                    isCheck = rule.value ? true : false;
+                }
+                else {
+                    isCheck = true;
+                }
+            }
+            if (typeof rule.value === 'boolean' && i === 1) {
+                isCheck = !rule.value ? true : false;
             }
             value = values[i].toString();
             orgValue = values[i];
@@ -2625,7 +2631,7 @@ var QueryBuilder = /** @class */ (function (_super) {
         var radiobutton = new RadioButton(radioBtn);
         radiobutton.appendTo('#' + parentId + '_valuekey' + i);
         if (isCheck) {
-            this.updateRules(radiobutton.element, orgValue, 0);
+            this.updateRules(radiobutton.element, orgValue, 0, true);
         }
     };
     QueryBuilder.prototype.getOperatorIndex = function (ddlObj, rule) {
@@ -5127,6 +5133,7 @@ var QueryBuilder = /** @class */ (function (_super) {
      */
     QueryBuilder.prototype.cloneRule = function (ruleID, groupID, index) {
         var getRule = this.getRule(ruleID.replace(this.element.id + '_', ''));
+        var isCloneRule = this.showButtons.cloneRule;
         groupID = groupID.replace(this.element.id + '_', '');
         this.ruleIndex = index;
         this.cloneRuleBtnClick = true;
@@ -5137,7 +5144,8 @@ var QueryBuilder = /** @class */ (function (_super) {
             }], groupID);
         this.ruleIndex = -1;
         this.cloneRuleBtnClick = false;
-        this.showButtons.cloneRule = false;
+        this.showButtons.cloneRule = isCloneRule;
+        isCloneRule = false;
     };
     /**
      * Clones the group based on the group ID to the specific group.
@@ -5150,6 +5158,7 @@ var QueryBuilder = /** @class */ (function (_super) {
     QueryBuilder.prototype.cloneGroup = function (groupID, parentGroupID, index) {
         parentGroupID = parentGroupID.replace(this.element.id + '_', '');
         var group = this.getGroup(parentGroupID);
+        var isCloneGroup = this.showButtons.cloneGroup;
         groupID = groupID.replace(this.element.id + '_', '');
         this.groupIndex = index;
         this.cloneGrpBtnClick = true;
@@ -5157,7 +5166,8 @@ var QueryBuilder = /** @class */ (function (_super) {
         this.addGroups([{ 'condition': group.condition, 'not': group.not, 'rules': group.rules }], groupID);
         this.groupIndex = -1;
         this.cloneGrpBtnClick = false;
-        this.showButtons.cloneGroup = false;
+        this.showButtons.cloneGroup = isCloneGroup;
+        isCloneGroup = false;
     };
     /**
      * Locks the rule based on the rule ID.
@@ -5166,6 +5176,9 @@ var QueryBuilder = /** @class */ (function (_super) {
      * @returns {void}
      */
     QueryBuilder.prototype.lockRule = function (ruleID) {
+        if (ruleID.indexOf(this.element.id) < 0) {
+            ruleID = this.element.id + '_' + ruleID;
+        }
         var target = document.getElementById(ruleID).querySelectorAll('.e-lock-rule-btn')[0];
         this.ruleLock(target);
     };
@@ -5176,6 +5189,9 @@ var QueryBuilder = /** @class */ (function (_super) {
      * @returns {void}
      */
     QueryBuilder.prototype.lockGroup = function (groupID) {
+        if (groupID.indexOf(this.element.id) < 0) {
+            groupID = this.element.id + '_' + groupID;
+        }
         var target = document.getElementById(groupID).querySelectorAll('.e-lock-grp-btn')[0];
         this.groupLock(target);
     };
@@ -5271,9 +5287,9 @@ var QueryBuilder = /** @class */ (function (_super) {
             return matchValue.length;
         }
         // eslint-disable-next-line
-        if (this.checkLiteral() && /^'?([a-z_][a-z0-9 _.\[\]\(\)]{0,}(\:(number|float|string|date|boolean))?)'?/i.exec(sqlString)) {
+        if (this.checkLiteral() && /^'?([a-z_][a-z0-9 _.\[\]\(\)-]{0,}(\:(number|float|string|date|boolean))?)'?/i.exec(sqlString)) {
             // eslint-disable-next-line
-            matchValue = /^'?([a-z_][a-z0-9 _.\[\]\(\)]{0,}(\:(number|float|string|date|boolean))?)'?/i.exec(sqlString)[1];
+            matchValue = /^'?([a-z_][a-z0-9 _.\[\]\(\)-]{0,}(\:(number|float|string|date|boolean))?)'?/i.exec(sqlString)[1];
             this.parser.push(['Literal', matchValue]);
             return matchValue.length + 2;
         }

package/styles/bootstrap5-dark.css

@@ -757,7 +757,9 @@
   border-color: #444c54;
 }
 .e-query-builder .e-group-header .e-dropdown-btn.e-add-btn,
-.e-query-builder .e-deletegroup {
+.e-query-builder .e-deletegroup,
+.e-query-builder .e-clone-grp-btn,
+.e-query-builder .e-lock-grp-btn {
   background: #212529;
   box-shadow: none;
   color: #adb5bd;

package/styles/bootstrap5.css

@@ -757,7 +757,9 @@
   border-color: #dee2e6;
 }
 .e-query-builder .e-group-header .e-dropdown-btn.e-add-btn,
-.e-query-builder .e-deletegroup {
+.e-query-builder .e-deletegroup,
+.e-query-builder .e-clone-grp-btn,
+.e-query-builder .e-lock-grp-btn {
   background: #fff;
   box-shadow: none;
   color: #6c757d;

package/styles/fluent-dark.css

@@ -162,7 +162,7 @@
 
 .e-bigger .e-multiselect.e-control-container .e-multi-select-wrapper.e-down-icon .e-clear-icon,
 .e-bigger.e-multiselect.e-control-container .e-multi-select-wrapper.e-down-icon .e-clear-icon {
-  margin-top: -1.5em;
+  margin-top: -1.6em;
 }
 
 /* stylelint-disable-line no-empty-source */
@@ -742,7 +742,9 @@
   border-color: #292827;
 }
 .e-query-builder .e-group-header .e-dropdown-btn.e-add-btn,
-.e-query-builder .e-deletegroup {
+.e-query-builder .e-deletegroup,
+.e-query-builder .e-clone-grp-btn,
+.e-query-builder .e-lock-grp-btn {
   background: #252423;
   border: 0 solid #252423;
 }

package/styles/fluent.css

@@ -162,7 +162,7 @@
 
 .e-bigger .e-multiselect.e-control-container .e-multi-select-wrapper.e-down-icon .e-clear-icon,
 .e-bigger.e-multiselect.e-control-container .e-multi-select-wrapper.e-down-icon .e-clear-icon {
-  margin-top: -1.5em;
+  margin-top: -1.6em;
 }
 
 /* stylelint-disable-line no-empty-source */
@@ -742,7 +742,9 @@
   border-color: #edebe9;
 }
 .e-query-builder .e-group-header .e-dropdown-btn.e-add-btn,
-.e-query-builder .e-deletegroup {
+.e-query-builder .e-deletegroup,
+.e-query-builder .e-clone-grp-btn,
+.e-query-builder .e-lock-grp-btn {
   background: #f3f2f1;
   border: 0 solid #f3f2f1;
 }

package/styles/material-dark.css

@@ -104,6 +104,15 @@
   padding: 5px 5px 5px 12px;
 }
 
+.e-multiselect.e-input-group.e-checkbox .e-multi-select-wrapper input[type=text] {
+  padding: 1px 0;
+}
+
+.e-small .e-multiselect.e-input-group.e-checkbox .e-multi-select-wrapper input[type=text],
+.e-small.e-multiselect.e-input-group.e-checkbox .e-multi-select-wrapper input[type=text] {
+  padding: 0;
+}
+
 /* stylelint-disable-line no-empty-source */
 /* stylelint-disable property-no-vendor-prefix */
 @keyframes material-spinner-rotate {

package/styles/material.css

@@ -129,6 +129,15 @@
   padding: 4px 8px;
 }
 
+.e-multiselect.e-input-group.e-checkbox .e-multi-select-wrapper input[type=text] {
+  padding: 1px 0;
+}
+
+.e-small .e-multiselect.e-input-group.e-checkbox .e-multi-select-wrapper input[type=text],
+.e-small.e-multiselect.e-input-group.e-checkbox .e-multi-select-wrapper input[type=text] {
+  padding: 0;
+}
+
 /* stylelint-disable-line no-empty-source */
 /* stylelint-disable property-no-vendor-prefix */
 @keyframes material-spinner-rotate {

package/styles/query-builder/_theme.scss

@@ -8,7 +8,9 @@
     }
 
     & .e-group-header .e-dropdown-btn.e-add-btn,
-    .e-deletegroup {
+    .e-deletegroup,
+    .e-clone-grp-btn,
+    .e-lock-grp-btn {
       @if $skin-name == 'bootstrap5' {
         background: $qrybldr-btngroup-bgcolor;
         box-shadow: none;

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

@@ -757,7 +757,9 @@
   border-color: #444c54;
 }
 .e-query-builder .e-group-header .e-dropdown-btn.e-add-btn,
-.e-query-builder .e-deletegroup {
+.e-query-builder .e-deletegroup,
+.e-query-builder .e-clone-grp-btn,
+.e-query-builder .e-lock-grp-btn {
   background: #212529;
   box-shadow: none;
   color: #adb5bd;

package/styles/query-builder/bootstrap5.css

@@ -757,7 +757,9 @@
   border-color: #dee2e6;
 }
 .e-query-builder .e-group-header .e-dropdown-btn.e-add-btn,
-.e-query-builder .e-deletegroup {
+.e-query-builder .e-deletegroup,
+.e-query-builder .e-clone-grp-btn,
+.e-query-builder .e-lock-grp-btn {
   background: #fff;
   box-shadow: none;
   color: #6c757d;

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

@@ -162,7 +162,7 @@
 
 .e-bigger .e-multiselect.e-control-container .e-multi-select-wrapper.e-down-icon .e-clear-icon,
 .e-bigger.e-multiselect.e-control-container .e-multi-select-wrapper.e-down-icon .e-clear-icon {
-  margin-top: -1.5em;
+  margin-top: -1.6em;
 }
 
 /* stylelint-disable-line no-empty-source */
@@ -742,7 +742,9 @@
   border-color: #292827;
 }
 .e-query-builder .e-group-header .e-dropdown-btn.e-add-btn,
-.e-query-builder .e-deletegroup {
+.e-query-builder .e-deletegroup,
+.e-query-builder .e-clone-grp-btn,
+.e-query-builder .e-lock-grp-btn {
   background: #252423;
   border: 0 solid #252423;
 }

package/styles/query-builder/fluent.css

@@ -162,7 +162,7 @@
 
 .e-bigger .e-multiselect.e-control-container .e-multi-select-wrapper.e-down-icon .e-clear-icon,
 .e-bigger.e-multiselect.e-control-container .e-multi-select-wrapper.e-down-icon .e-clear-icon {
-  margin-top: -1.5em;
+  margin-top: -1.6em;
 }
 
 /* stylelint-disable-line no-empty-source */
@@ -742,7 +742,9 @@
   border-color: #edebe9;
 }
 .e-query-builder .e-group-header .e-dropdown-btn.e-add-btn,
-.e-query-builder .e-deletegroup {
+.e-query-builder .e-deletegroup,
+.e-query-builder .e-clone-grp-btn,
+.e-query-builder .e-lock-grp-btn {
   background: #f3f2f1;
   border: 0 solid #f3f2f1;
 }

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

@@ -104,6 +104,15 @@
   padding: 5px 5px 5px 12px;
 }
 
+.e-multiselect.e-input-group.e-checkbox .e-multi-select-wrapper input[type=text] {
+  padding: 1px 0;
+}
+
+.e-small .e-multiselect.e-input-group.e-checkbox .e-multi-select-wrapper input[type=text],
+.e-small.e-multiselect.e-input-group.e-checkbox .e-multi-select-wrapper input[type=text] {
+  padding: 0;
+}
+
 /* stylelint-disable-line no-empty-source */
 /* stylelint-disable property-no-vendor-prefix */
 @keyframes material-spinner-rotate {

package/styles/query-builder/material.css

@@ -129,6 +129,15 @@
   padding: 4px 8px;
 }
 
+.e-multiselect.e-input-group.e-checkbox .e-multi-select-wrapper input[type=text] {
+  padding: 1px 0;
+}
+
+.e-small .e-multiselect.e-input-group.e-checkbox .e-multi-select-wrapper input[type=text],
+.e-small.e-multiselect.e-input-group.e-checkbox .e-multi-select-wrapper input[type=text] {
+  padding: 0;
+}
+
 /* stylelint-disable-line no-empty-source */
 /* stylelint-disable property-no-vendor-prefix */
 @keyframes material-spinner-rotate {