@syncfusion/ej2-querybuilder 19.4.38 → 19.4.48

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 19.4.38
+*  version : 19.4.48
 *  Copyright Syncfusion Inc. 2001 - 2020. 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.18.0",
+  "_id": "@syncfusion/ej2-querybuilder@19.4.47",
   "_inBundle": false,
-  "_integrity": "sha512-V/1TAHOi/B44XRrDIv7wUSzU5mjecpLeCO9Xe1XrJM8KrIlWdwXNZiBx+emb4Ikd/OUqrHZH+AavlWBpt6jtCA==",
+  "_integrity": "sha512-xyq6hZflXTBUMYgdhvcaM1XhoXfguRw0+36nGgpXKMfoFh5E2xtYA+GESbgYM4W+fxUQ7K2HjwYJXhHJTK1SYA==",
   "_location": "/@syncfusion/ej2-querybuilder",
   "_phantomChildren": {},
   "_requested": {
@@ -23,8 +23,8 @@
     "/@syncfusion/ej2-react-querybuilder",
     "/@syncfusion/ej2-vue-querybuilder"
   ],
-  "_resolved": "http://nexus.syncfusion.com/repository/ej2-release/@syncfusion/ej2-querybuilder/-/ej2-querybuilder-18.18.0.tgz",
-  "_shasum": "f0660f48b9bcc0eda79e3a1f9cfad41a1b78c23b",
+  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-querybuilder/-/ej2-querybuilder-19.4.47.tgz",
+  "_shasum": "530487879dd8d5b1a49db2933ab5de33804c9b93",
   "_spec": "@syncfusion/ej2-querybuilder@*",
   "_where": "/jenkins/workspace/automation_release_19.1.0.1-ZPMUBNQ6AUYH6YGEFBPVYMEQLRRW2SLD4XCZ6GATNZJFYJ3RIAOA/packages/included",
   "author": {
@@ -32,12 +32,12 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~19.4.38",
-    "@syncfusion/ej2-buttons": "~19.4.38",
-    "@syncfusion/ej2-calendars": "~19.4.38",
-    "@syncfusion/ej2-dropdowns": "~19.4.38",
-    "@syncfusion/ej2-inputs": "~19.4.38",
-    "@syncfusion/ej2-splitbuttons": "~19.4.38"
+    "@syncfusion/ej2-base": "~19.4.48",
+    "@syncfusion/ej2-buttons": "~19.4.48",
+    "@syncfusion/ej2-calendars": "~19.4.48",
+    "@syncfusion/ej2-dropdowns": "~19.4.48",
+    "@syncfusion/ej2-inputs": "~19.4.48",
+    "@syncfusion/ej2-splitbuttons": "~19.4.48"
   },
   "deprecated": false,
   "description": "Essential JS 2 QueryBuilder",
@@ -69,6 +69,6 @@
     "url": "https://github.com/syncfusion/ej2-javascript-ui-controls/tree/master/controls/querybuilder"
   },
   "typings": "index.d.ts",
-  "version": "19.4.38",
+  "version": "19.4.48",
   "sideEffects": false
 }

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

@@ -741,12 +741,19 @@ var QueryBuilder = /** @class */ (function (_super) {
         else {
             groupElem = closest(target, '.e-group-container');
             rules = this.getParentGroup(groupElem);
+            var custom = rule.custom;
             if (Object.keys(rule).length) {
                 rules.rules.push({
                     'field': rule.field, 'type': rule.type, 'label': rule.label, 'operator': rule.operator, value: rule.value
                 });
+                if (custom) {
+                    rules.rules[rules.rules.length - 1].custom = custom;
+                }
             }
             else {
+                if (custom) {
+                    newRule.custom = custom;
+                }
                 rules.rules.push(newRule);
             }
         }
@@ -1367,6 +1374,7 @@ var QueryBuilder = /** @class */ (function (_super) {
                     ruleElem = ruleElem.previousElementSibling;
                     index++;
                 }
+                rules.rules[index].value = '';
                 this.changeRule(rules.rules[index], args);
             }
         }
@@ -1456,6 +1464,9 @@ var QueryBuilder = /** @class */ (function (_super) {
             getComponent(tooltipElem[i], 'tooltip').destroy();
         }
         if (!args.cancel) {
+            if (this.selectedColumn === null) {
+                return;
+            }
             tempRule.type = this.selectedColumn.type;
             if (ruleElem.querySelector('.e-template')) {
                 rule.value = '';
@@ -1490,7 +1501,8 @@ var QueryBuilder = /** @class */ (function (_super) {
         tempElem.appendChild(subFieldElem);
         var height = (this.element.className.indexOf('e-device') > -1) ? '250px' : '200px';
         var subFieldData = Object.keys(this.selectedColumn.columns[0]);
-        var dropDownList = new DropDownList({
+        var ddlField;
+        ddlField = {
             dataSource: this.selectedColumn.columns,
             fields: this.fields,
             placeholder: this.l10n.getConstant('SelectField'),
@@ -1498,7 +1510,11 @@ var QueryBuilder = /** @class */ (function (_super) {
             change: this.changeField.bind(this),
             index: 0,
             open: this.popupOpen.bind(this, false)
-        });
+        };
+        if (this.fieldModel) {
+            ddlField = __assign({}, ddlField, this.fieldModel);
+        }
+        var dropDownList = new DropDownList(ddlField);
         dropDownList.appendTo('#' + ruleId + '_subfilterkey' + this.subFilterCounter);
         if (this.isImportRules) {
             var subField = this.selectedColumn.columns;
@@ -1896,8 +1912,10 @@ var QueryBuilder = /** @class */ (function (_super) {
     };
     QueryBuilder.prototype.closePopup = function (i, args) {
         var element = document.getElementById(args.popup.element.id.replace('_popup', ''));
-        var value = getComponent(element, 'multiselect').value;
-        this.updateRules(element, value, i);
+        if (element) {
+            var value = getComponent(element, 'multiselect').value;
+            this.updateRules(element, value, i);
+        }
     };
     QueryBuilder.prototype.processTemplate = function (target, itemData, rule, tempRule) {
         var container = closest(target, '.e-rule-container');
@@ -3450,7 +3468,11 @@ var QueryBuilder = /** @class */ (function (_super) {
                 }
             }
             var isTemplateRendered = clnruleElem.querySelector('.e-template-value');
-            detach(clnruleElem);
+            try {
+                detach(clnruleElem);
+            }
+            catch (err) {
+            }
             if (column && column.ruleTemplate) {
                 this.clearQBTemplate([clnruleElem.id]);
             }
@@ -3570,10 +3592,14 @@ var QueryBuilder = /** @class */ (function (_super) {
                 }
             }
             if ((this.isRefreshed && this.enablePersistence) || (this.rule.field !== '' && rule.operator !== '' && (rule.value !== '' &&
-                rule.value !== undefined))) {
+                rule.value !== undefined)) || (customObj && customObj.isQuestion)) {
+                var condition = rule.condition;
                 rule = {
                     'label': rule.label, 'field': rule.field, 'operator': rule.operator, 'type': rule.type, 'value': rule.value
                 };
+                if (condition) {
+                    rule.condition = condition;
+                }
                 if (customObj) {
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     rule.custom = customObj;
@@ -3882,6 +3908,12 @@ var QueryBuilder = /** @class */ (function (_super) {
                     break;
                 }
             }
+            else if (field.indexOf(this.separator) > -1) {
+                if (columns[i].field === field.split(this.separator)[0]) {
+                    column = columns[i];
+                    break;
+                }
+            }
         }
         return column;
     };
@@ -3971,7 +4003,7 @@ var QueryBuilder = /** @class */ (function (_super) {
         }
         if (!(operator.indexOf('null') > -1 || operator.indexOf('empty') > -1)) {
             for (var j = 0, jLen = value.length; j < jLen; j++) {
-                if (value[j] !== '') {
+                if (value[j] !== '' || ((operator === 'in' || operator === 'notin') && column.type === 'string')) {
                     if (j === 0) {
                         var gte = 'greaterthanorequal';
                         switch (operator) {
@@ -4113,7 +4145,7 @@ var QueryBuilder = /** @class */ (function (_super) {
         if (!isNullOrUndefined(ruleColl)) {
             for (var i = 0, len = ruleColl.length; i < len; i++) {
                 var keys = Object.keys(ruleColl[i]);
-                if (!isNullOrUndefined(ruleColl[i].rules) && keys.indexOf('rules') > -1) {
+                if (!isNullOrUndefined(ruleColl[i].rules) && keys.indexOf('rules') > -1 && (ruleColl[i].rules.length !== 0)) {
                     parentElem = this.renderGroup(ruleColl[i], ruleColl[i].condition, parentElem, ruleColl[i].not);
                     parentElem = this.importRules(ruleColl[i], parentElem, true);
                 }
@@ -4350,8 +4382,14 @@ var QueryBuilder = /** @class */ (function (_super) {
                     }
                     queryStr += rule.field + ' ' + this.operators[rule.operator] + ' ' + valueStr;
                 }
+                if (rule.condition && rule.condition != '') {
+                    condition = rule.condition;
+                }
             }
             if (j !== jLen - 1) {
+                if (condition === '') {
+                    condition = rules.rules[j].condition;
+                }
                 queryStr += ' ' + condition.toUpperCase() + ' ';
             }
         }

package/styles/bootstrap5-dark.css

@@ -326,7 +326,7 @@
 
 .e-query-builder .e-rule-list > ::after,
 .e-query-builder .e-rule-list > ::before {
-  border-style: dotted;
+  border-style: dashed;
   content: '';
   left: -12px;
   position: absolute;
@@ -500,8 +500,8 @@
 .e-query-builder .e-group-body .e-rule-container.e-joined-rule {
   border-top-left-radius: 0;
   border-top-right-radius: 0;
-  border-top-style: dotted;
-  border-top-width: 2px;
+  border-top-style: dashed;
+  border-top-width: 1px;
   margin-top: 0;
 }
 

package/styles/bootstrap5.css

@@ -326,7 +326,7 @@
 
 .e-query-builder .e-rule-list > ::after,
 .e-query-builder .e-rule-list > ::before {
-  border-style: dotted;
+  border-style: dashed;
   content: '';
   left: -12px;
   position: absolute;
@@ -500,8 +500,8 @@
 .e-query-builder .e-group-body .e-rule-container.e-joined-rule {
   border-top-left-radius: 0;
   border-top-right-radius: 0;
-  border-top-style: dotted;
-  border-top-width: 2px;
+  border-top-style: dashed;
+  border-top-width: 1px;
   margin-top: 0;
 }
 

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

@@ -29,7 +29,7 @@ $qrybldr-rule-list-after-border: 0 0 0 2px !default;
 $qrybldr-rule-list-before-border: 0 0 2px 2px !default;
 $qrybldr-rule-list-rtl-after-border: 0 2px 0 0 !default;
 $qrybldr-rule-list-rtl-before-border: 0 2px 2px 0 !default;
-$qrybldr-rule-list-border-style: dotted !default;
+$qrybldr-rule-list-border-style: dashed !default;
 $before-border-height: calc(50% + 14px) !default;
 $after-border-height: calc(50% + 8px) !default;
 $qrybldr-add-icon: '\e805' !default;

package/styles/query-builder/_layout.scss

@@ -309,7 +309,12 @@
           border-top-left-radius: 0;
           border-top-right-radius: 0;
           border-top-style: $qrybldr-rule-list-border-style;
-          border-top-width: 2px;
+          @if $skin-name == 'tailwind' or $skin-name == 'bootstrap5' {
+            border-top-width: 1px;
+          }
+          @else {
+            border-top-width: 2px;
+          }
           margin-top: 0;
         }
 

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

@@ -29,7 +29,7 @@ $qrybldr-rule-list-after-border: 0 0 0 2px !default;
 $qrybldr-rule-list-before-border: 0 0 2px 2px !default;
 $qrybldr-rule-list-rtl-after-border: 0 2px 0 0 !default;
 $qrybldr-rule-list-rtl-before-border: 0 2px 2px 0 !default;
-$qrybldr-rule-list-border-style: solid !default;
+$qrybldr-rule-list-border-style: dashed !default;
 $before-border-height: calc(50% + 14px) !default;
 $after-border-height: calc(50% + 8px) !default;
 $qrybldr-add-icon: '\e78a' !default;

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

@@ -326,7 +326,7 @@
 
 .e-query-builder .e-rule-list > ::after,
 .e-query-builder .e-rule-list > ::before {
-  border-style: dotted;
+  border-style: dashed;
   content: '';
   left: -12px;
   position: absolute;
@@ -500,8 +500,8 @@
 .e-query-builder .e-group-body .e-rule-container.e-joined-rule {
   border-top-left-radius: 0;
   border-top-right-radius: 0;
-  border-top-style: dotted;
-  border-top-width: 2px;
+  border-top-style: dashed;
+  border-top-width: 1px;
   margin-top: 0;
 }
 

package/styles/query-builder/bootstrap5.css

@@ -326,7 +326,7 @@
 
 .e-query-builder .e-rule-list > ::after,
 .e-query-builder .e-rule-list > ::before {
-  border-style: dotted;
+  border-style: dashed;
   content: '';
   left: -12px;
   position: absolute;
@@ -500,8 +500,8 @@
 .e-query-builder .e-group-body .e-rule-container.e-joined-rule {
   border-top-left-radius: 0;
   border-top-right-radius: 0;
-  border-top-style: dotted;
-  border-top-width: 2px;
+  border-top-style: dashed;
+  border-top-width: 1px;
   margin-top: 0;
 }
 

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

@@ -326,7 +326,7 @@
 
 .e-query-builder .e-rule-list > ::after,
 .e-query-builder .e-rule-list > ::before {
-  border-style: solid;
+  border-style: dashed;
   content: '';
   left: -12px;
   position: absolute;
@@ -500,8 +500,8 @@
 .e-query-builder .e-group-body .e-rule-container.e-joined-rule {
   border-top-left-radius: 0;
   border-top-right-radius: 0;
-  border-top-style: solid;
-  border-top-width: 2px;
+  border-top-style: dashed;
+  border-top-width: 1px;
   margin-top: 0;
 }
 

package/styles/query-builder/tailwind.css

@@ -326,7 +326,7 @@
 
 .e-query-builder .e-rule-list > ::after,
 .e-query-builder .e-rule-list > ::before {
-  border-style: solid;
+  border-style: dashed;
   content: '';
   left: -12px;
   position: absolute;
@@ -500,8 +500,8 @@
 .e-query-builder .e-group-body .e-rule-container.e-joined-rule {
   border-top-left-radius: 0;
   border-top-right-radius: 0;
-  border-top-style: solid;
-  border-top-width: 2px;
+  border-top-style: dashed;
+  border-top-width: 1px;
   margin-top: 0;
 }
 

package/styles/tailwind-dark.css

@@ -326,7 +326,7 @@
 
 .e-query-builder .e-rule-list > ::after,
 .e-query-builder .e-rule-list > ::before {
-  border-style: solid;
+  border-style: dashed;
   content: '';
   left: -12px;
   position: absolute;
@@ -500,8 +500,8 @@
 .e-query-builder .e-group-body .e-rule-container.e-joined-rule {
   border-top-left-radius: 0;
   border-top-right-radius: 0;
-  border-top-style: solid;
-  border-top-width: 2px;
+  border-top-style: dashed;
+  border-top-width: 1px;
   margin-top: 0;
 }
 

package/styles/tailwind.css

@@ -326,7 +326,7 @@
 
 .e-query-builder .e-rule-list > ::after,
 .e-query-builder .e-rule-list > ::before {
-  border-style: solid;
+  border-style: dashed;
   content: '';
   left: -12px;
   position: absolute;
@@ -500,8 +500,8 @@
 .e-query-builder .e-group-body .e-rule-container.e-joined-rule {
   border-top-left-radius: 0;
   border-top-right-radius: 0;
-  border-top-style: solid;
-  border-top-width: 2px;
+  border-top-style: dashed;
+  border-top-width: 1px;
   margin-top: 0;
 }