@syncfusion/ej2-querybuilder 25.1.37 → 25.1.40

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 25.1.37
+*  version : 25.1.40
 *  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@25.1.35",
+  "_id": "@syncfusion/ej2-querybuilder@25.1.38",
   "_inBundle": false,
-  "_integrity": "sha512-itzx26EEksco0ikM5WSKDvdr+daQYFbcCSvJGxL/Finvn8TRjL5ciEiJ/0LxbjEiebmlVirur+3ayzAXVJCL/g==",
+  "_integrity": "sha512-RLUddm+Ql/CK4B9L75aovBZ1SksSfwr8nonX77H2Q5jI20+6I8TLJAZo8MBSmybIpl6GA2/1JARXa24aDC322w==",
   "_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-25.1.35.tgz",
-  "_shasum": "50afc2d04e3d9b232ebdba93d347a14572aea4d5",
+  "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-querybuilder/-/ej2-querybuilder-25.1.38.tgz",
+  "_shasum": "9901505552698bdd0ad97442067588722a2d4556",
   "_spec": "@syncfusion/ej2-querybuilder@*",
   "_where": "/jenkins/workspace/elease-automation_release_25.1.1/packages/included",
   "author": {
@@ -33,11 +33,11 @@
   "bundleDependencies": false,
   "dependencies": {
     "@syncfusion/ej2-base": "~25.1.35",
-    "@syncfusion/ej2-buttons": "~25.1.35",
-    "@syncfusion/ej2-calendars": "~25.1.37",
-    "@syncfusion/ej2-dropdowns": "~25.1.37",
-    "@syncfusion/ej2-inputs": "~25.1.37",
-    "@syncfusion/ej2-splitbuttons": "~25.1.37"
+    "@syncfusion/ej2-buttons": "~25.1.39",
+    "@syncfusion/ej2-calendars": "~25.1.40",
+    "@syncfusion/ej2-dropdowns": "~25.1.40",
+    "@syncfusion/ej2-inputs": "~25.1.40",
+    "@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.37",
+  "version": "25.1.40",
   "sideEffects": false,
   "homepage": "https://www.syncfusion.com/javascript-ui-controls"
 }

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

@@ -1802,13 +1802,12 @@ var QueryBuilder = /** @class */ (function (_super) {
         var subFieldElem = this.createElement('input', { attrs: { type: 'text', id: ruleId + '_subfilterkey' + this.subFilterCounter } });
         tempElem.appendChild(subFieldElem);
         var height = (this.element.className.indexOf('e-device') > -1) ? '250px' : '200px';
-        var subFieldData = Object.keys(this.selectedColumn.columns[0]);
         var ddlField;
         ddlField = {
             dataSource: this.selectedColumn.columns,
             fields: this.fields,
             placeholder: this.l10n.getConstant('SelectField'),
-            popupHeight: ((subFieldData.length > 5) ? height : 'auto'),
+            popupHeight: ((this.selectedColumn.columns.length > 5) ? height : 'auto'),
             change: this.changeField.bind(this),
             index: 0,
             open: this.popupOpen.bind(this, false)
@@ -1822,7 +1821,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;
@@ -2327,7 +2326,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 {
@@ -2366,7 +2365,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);
@@ -2502,6 +2501,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) {
@@ -2602,7 +2605,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];
@@ -2619,7 +2630,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) {
@@ -5275,9 +5286,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;
         }