@syncfusion/ej2-querybuilder 23.2.7 → 24.1.43

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 23.2.7
+*  version : 24.1.43
 *  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@23.2.4",
+  "_id": "@syncfusion/ej2-querybuilder@24.1.41",
   "_inBundle": false,
-  "_integrity": "sha512-QShQPKYcMRmx/uLBbdZIGcDer+cS7KR7ryqWrEOd6240Y/b/IT/iCTRqgl+Rgx2s+yDRVSwI4Cf3gvtkhykZOw==",
+  "_integrity": "sha512-uh2ZZrNsgQTIzHQ7MhtlQ5FaOoR/mdzxs9uHI6ZIlNSzVSkifZ6EZyGqU2FC4n+REW7omIJN/8X0O2SHGt3GQw==",
   "_location": "/@syncfusion/ej2-querybuilder",
   "_phantomChildren": {},
   "_requested": {
@@ -23,21 +23,21 @@
     "/@syncfusion/ej2-react-querybuilder",
     "/@syncfusion/ej2-vue-querybuilder"
   ],
-  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-querybuilder/-/ej2-querybuilder-23.2.4.tgz",
-  "_shasum": "f9547c67f74a0a2fb9cee784e62eeaf1c1d0d1ef",
+  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-querybuilder/-/ej2-querybuilder-24.1.41.tgz",
+  "_shasum": "670a8ab18778360df7d1c656bee7e0e281183e27",
   "_spec": "@syncfusion/ej2-querybuilder@*",
-  "_where": "/jenkins/workspace/elease-automation_release_23.1.1/packages/included",
+  "_where": "/jenkins/workspace/elease-automation_release_24.1.1/packages/included",
   "author": {
     "name": "Syncfusion Inc."
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~23.2.6",
-    "@syncfusion/ej2-buttons": "~23.2.7",
-    "@syncfusion/ej2-calendars": "~23.2.7",
-    "@syncfusion/ej2-dropdowns": "~23.2.7",
-    "@syncfusion/ej2-inputs": "~23.2.4",
-    "@syncfusion/ej2-splitbuttons": "~23.2.4"
+    "@syncfusion/ej2-base": "~24.1.42",
+    "@syncfusion/ej2-buttons": "~24.1.41",
+    "@syncfusion/ej2-calendars": "~24.1.43",
+    "@syncfusion/ej2-dropdowns": "~24.1.43",
+    "@syncfusion/ej2-inputs": "~24.1.41",
+    "@syncfusion/ej2-splitbuttons": "~24.1.41"
   },
   "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": "23.2.7",
+  "version": "24.1.43",
   "sideEffects": false,
   "homepage": "https://www.syncfusion.com/javascript-ui-controls"
 }

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

@@ -236,7 +236,7 @@ var QueryBuilder = /** @class */ (function (_super) {
         }
         bodyElem.appendChild(this.createElement('div', { attrs: { class: 'e-rule-list' } }));
         this.levelColl[this.element.id + '_group0'] = [0];
-        this.rule = { condition: 'and', not: false, rules: [] };
+        this.setProperties({ rule: { condition: 'and', not: false, rules: [] } }, true);
         this.disableRuleCondition(bodyElem.parentElement);
     };
     QueryBuilder.prototype.getWrapper = function () {
@@ -883,7 +883,7 @@ var QueryBuilder = /** @class */ (function (_super) {
                     if (rule.rules[index].value instanceof Array) {
                         valArray = rule.rules[index].value;
                     }
-                    if (excludeOprs.indexOf(rule.rules[index].operator) < 0 &&
+                    if (excludeOprs.indexOf(rule.rules[index].operator) < -1 &&
                         (isNullOrUndefined(rule.rules[index].value) &&
                             rule.rules[index].type !== 'date') || rule.rules[index].value === '' ||
                         (rule.rules[index].value instanceof Array && valArray.length < 1)) {
@@ -1337,12 +1337,20 @@ var QueryBuilder = /** @class */ (function (_super) {
         var groupID = groupElem && groupElem.id.replace(this.element.id + '_', '');
         var ruleID = ruleElem.id.replace(this.element.id + '_', '');
         var dateElement = args;
+        var dropDownObj;
         if (dateElement.element && dateElement.element.className.indexOf('e-datepicker') > -1) {
             element = dateElement.element;
+            dropDownObj = getComponent(closest(element, '.e-rule-container').querySelector('.e-filter-input'), 'dropdownlist');
+            if (dropDownObj) {
+                this.selectedColumn = dropDownObj.getDataByValue(dropDownObj.value);
+            }
+            dropDownObj = getComponent(closest(element, '.e-rule-container').querySelector('.e-filter-input'), 'dropdowntree');
+            if (dropDownObj) {
+                this.selectedColumn = this.getColumn(dropDownObj.value[0]);
+            }
         }
         var value;
         var rbValue;
-        var dropDownObj;
         if (element.className.indexOf('e-radio') > -1) {
             // eslint-disable-next-line
             rbValue = parseInt(element.id.split('valuekey')[1], 0);
@@ -1630,7 +1638,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) > -1) {
                     dropDownList.value = subField[i].field;
                     this.selectedColumn = subField[i];
                     subFieldValue = true;
@@ -2463,7 +2471,7 @@ var QueryBuilder = /** @class */ (function (_super) {
         }
         var operator = tempRule.operator.toString();
         var isTempRendered = false;
-        if (!(operator.indexOf('null') > -1 || operator.indexOf('empty') > -1)) {
+        if (!(operator.indexOf('null') > -1 || operator.indexOf('isempty') > -1 || operator.indexOf('isnotempty') > -1)) {
             var parentId = closest(target, '.e-rule-container').id;
             prevItemData = this.getPreviousItemData(prevItemData, column);
             if (prevItemData && prevItemData.template === undefined) {
@@ -2592,7 +2600,6 @@ var QueryBuilder = /** @class */ (function (_super) {
                 var valElemColl = this.columnTemplateFn(args, this, ruleID, templateID);
                 valElem = (valElemColl[0].nodeType === 3) ? valElemColl[1] : valElemColl[0];
                 target.nextElementSibling.appendChild(valElem);
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
             }
             else if (this.isVue3) {
                 valElem = this.columnTemplateFn(args, this, 'Template', templateID);
@@ -3173,7 +3180,7 @@ var QueryBuilder = /** @class */ (function (_super) {
                 this.groupElem.querySelector('.e-qb-toggle').remove();
             }
         }
-        this.rule = this.checkNotGroup(this.rule);
+        this.setProperties({ rule: this.checkNotGroup(this.rule) }, true);
         this.initWrapper();
     };
     QueryBuilder.prototype.notGroupRtl = function () {
@@ -3295,7 +3302,7 @@ var QueryBuilder = /** @class */ (function (_super) {
                     if (this.rule.rules.length == 0 && !isNullOrUndefined(this.rule)) {
                         this.reset();
                     }
-                    this.rule = newProp.rule;
+                    this.setProperties({ rule: newProp.rule }, true);
                     newProp.rule = this.getRuleCollection(this.rule, false);
                     this.setRules(this.rule);
                     break;
@@ -3703,7 +3710,7 @@ var QueryBuilder = /** @class */ (function (_super) {
         this.groupIdCounter = 1;
         this.ruleIdCounter = 0;
         this.isImportRules = true;
-        this.rule = rule;
+        this.setProperties({ rule: rule }, true);
         rule = this.getRuleCollection(this.rule, false);
         this.importRules(this.rule, this.element.querySelector('.e-group-container'), true, this.rule.not, isRoot);
         this.isImportRules = false;
@@ -4663,7 +4670,7 @@ var QueryBuilder = /** @class */ (function (_super) {
     QueryBuilder.prototype.getRulesFromSql = function (sqlString, sqlLocale) {
         this.parser = [];
         this.sqlParser(sqlString, sqlLocale);
-        this.rule = { condition: 'and', not: false, rules: [] };
+        this.setProperties({ rule: { condition: 'and', not: false, rules: [] } }, true);
         var rule = this.processParser(this.parser, this.rule, [0], sqlLocale);
         if (this.enableNotCondition) {
             return { condition: rule.condition, not: rule.not, rules: rule.rules };
@@ -4844,9 +4851,14 @@ var QueryBuilder = /** @class */ (function (_super) {
         }
         else {
             var secParser = this.parser[this.parser.length - 2];
+            var betweenParser = this.parser[this.parser.length - 3];
             if (lastParser[0] === 'Left' && (secParser && secParser[0] === 'Conditions')) {
                 return true;
             }
+            var betweenOperator = 'between';
+            if (lastParser[0] === 'Conditions' && (betweenParser && betweenParser[1].indexOf(betweenOperator) < 0)) {
+                return true;
+            }
         }
         return false;
     };