@syncfusion/ej2-querybuilder 19.4.55 → 20.1.48

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 19.4.55
+*  version : 20.1.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@19.4.53",
+  "_id": "@syncfusion/ej2-querybuilder@20.1.47",
   "_inBundle": false,
-  "_integrity": "sha512-wjydgzJ6JoacRoDcF7M7iXFfMoQbz2yvFWFdm5GBdcIMocU9H006IRzsODPTN/chUwep6Z/FglbDrx/e/uiLfg==",
+  "_integrity": "sha512-Jb8Qv+wKPB9KkZuvy+pHquwUod46+o3tUe8woYlLR19vY7zvi7pT91lHKHz9f/4Mc/5FHNDpuW5mNZN/63F+Zw==",
   "_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-hotfix-new/@syncfusion/ej2-querybuilder/-/ej2-querybuilder-19.4.53.tgz",
-  "_shasum": "0483a7a0bbce16c90279e698024edb294ad25e78",
+  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-querybuilder/-/ej2-querybuilder-20.1.47.tgz",
+  "_shasum": "a9395a3817be3ef13a7f4f0da76a9f7f1302db96",
   "_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.52",
-    "@syncfusion/ej2-buttons": "~19.4.55",
-    "@syncfusion/ej2-calendars": "~19.4.55",
-    "@syncfusion/ej2-dropdowns": "~19.4.55",
-    "@syncfusion/ej2-inputs": "~19.4.52",
-    "@syncfusion/ej2-splitbuttons": "~19.4.52"
+    "@syncfusion/ej2-base": "~20.1.48",
+    "@syncfusion/ej2-buttons": "~20.1.47",
+    "@syncfusion/ej2-calendars": "~20.1.47",
+    "@syncfusion/ej2-dropdowns": "~20.1.47",
+    "@syncfusion/ej2-inputs": "~20.1.48",
+    "@syncfusion/ej2-splitbuttons": "~20.1.47"
   },
   "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.55",
+  "version": "20.1.48",
   "sideEffects": false
 }

package/src/query-builder/query-builder-model.d.ts

@@ -1,4 +1,4 @@
-import { Component, INotifyPropertyChanged, NotifyPropertyChanges, getComponent, MouseEventArgs, Browser } from '@syncfusion/ej2-base';import { Property, ChildProperty, Complex, L10n, closest, extend, isNullOrUndefined, Collection, cldrData } from '@syncfusion/ej2-base';import { getInstance, addClass, removeClass, rippleEffect, detach, classList } from '@syncfusion/ej2-base';import { Internationalization, DateFormatOptions, KeyboardEventArgs, getUniqueID, select } from '@syncfusion/ej2-base';import { Button, CheckBox, RadioButton, ChangeEventArgs as ButtonChangeEventArgs, RadioButtonModel } from '@syncfusion/ej2-buttons';import { DropDownList, ChangeEventArgs as DropDownChangeEventArgs, FieldSettingsModel, CheckBoxSelection, DropDownTreeModel, DropDownTree } from '@syncfusion/ej2-dropdowns';import { MultiSelect, MultiSelectChangeEventArgs, PopupEventArgs, MultiSelectModel, DropDownListModel } from '@syncfusion/ej2-dropdowns';import { EmitType, Event, EventHandler, getValue, Animation, BaseEventArgs } from '@syncfusion/ej2-base';import { Query, Predicate, DataManager, Deferred } from '@syncfusion/ej2-data';import { TextBox, NumericTextBox, InputEventArgs, ChangeEventArgs as InputChangeEventArgs } from '@syncfusion/ej2-inputs';import { TextBoxModel, NumericTextBoxModel } from '@syncfusion/ej2-inputs';import { DatePicker, ChangeEventArgs as CalendarChangeEventArgs, DatePickerModel } from '@syncfusion/ej2-calendars';import { DropDownButton, ItemModel, MenuEventArgs } from '@syncfusion/ej2-splitbuttons';import { Tooltip, createSpinner, showSpinner, hideSpinner } from '@syncfusion/ej2-popups';import { compile as templateCompiler } from '@syncfusion/ej2-base';
+import { Component, INotifyPropertyChanged, NotifyPropertyChanges, getComponent, MouseEventArgs, Browser, compile } from '@syncfusion/ej2-base';import { Property, ChildProperty, Complex, L10n, closest, extend, isNullOrUndefined, Collection, cldrData } from '@syncfusion/ej2-base';import { getInstance, addClass, removeClass, rippleEffect, detach, classList } from '@syncfusion/ej2-base';import { Internationalization, DateFormatOptions, KeyboardEventArgs, getUniqueID, select } from '@syncfusion/ej2-base';import { Button, CheckBox, RadioButton, ChangeEventArgs as ButtonChangeEventArgs, RadioButtonModel } from '@syncfusion/ej2-buttons';import { DropDownList, ChangeEventArgs as DropDownChangeEventArgs, FieldSettingsModel, CheckBoxSelection, DropDownTreeModel, DropDownTree } from '@syncfusion/ej2-dropdowns';import { MultiSelect, MultiSelectChangeEventArgs, PopupEventArgs, MultiSelectModel, DropDownListModel } from '@syncfusion/ej2-dropdowns';import { EmitType, Event, EventHandler, getValue, Animation, BaseEventArgs } from '@syncfusion/ej2-base';import { Query, Predicate, DataManager, Deferred } from '@syncfusion/ej2-data';import { TextBox, NumericTextBox, InputEventArgs, ChangeEventArgs as InputChangeEventArgs } from '@syncfusion/ej2-inputs';import { TextBoxModel, NumericTextBoxModel } from '@syncfusion/ej2-inputs';import { DatePicker, ChangeEventArgs as CalendarChangeEventArgs, DatePickerModel } from '@syncfusion/ej2-calendars';import { DropDownButton, ItemModel, MenuEventArgs } from '@syncfusion/ej2-splitbuttons';import { Tooltip, createSpinner, showSpinner, hideSpinner } from '@syncfusion/ej2-popups';import { compile as templateCompiler } from '@syncfusion/ej2-base';
 import {TemplateColumn,Validation,FormatObject,ActionEventArgs,ChangeEventArgs,RuleChangeEventArgs,FieldMode,DisplayMode,SortDirection} from "./query-builder";
 import {ComponentModel} from '@syncfusion/ej2-base';
 

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

@@ -31,7 +31,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 /**
  * Query Builder Source
  */
-import { Component, NotifyPropertyChanges, getComponent, Browser } from '@syncfusion/ej2-base';
+import { Component, NotifyPropertyChanges, getComponent, Browser, compile } from '@syncfusion/ej2-base';
 import { Property, ChildProperty, Complex, L10n, closest, extend, isNullOrUndefined, Collection, cldrData } from '@syncfusion/ej2-base';
 import { getInstance, addClass, removeClass, rippleEffect, detach, classList } from '@syncfusion/ej2-base';
 import { Internationalization, getUniqueID, select } from '@syncfusion/ej2-base';
@@ -565,6 +565,9 @@ var QueryBuilder = /** @class */ (function (_super) {
             var template = void 0;
             args.fields = this.fields;
             args.columns = this.columns;
+            if (rule.field === "") {
+                rule.field = column.field;
+            }
             args.operators = this.getOperators(rule.field);
             args.operatorFields = { text: 'key', value: 'value' };
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -3325,6 +3328,9 @@ var QueryBuilder = /** @class */ (function (_super) {
                 if (document.querySelectorAll(template).length) {
                     return templateCompiler(document.querySelector(template).innerHTML.trim());
                 }
+                else {
+                    return compile(template);
+                }
             }
             catch (error) {
                 return templateCompiler(template);
@@ -3934,6 +3940,11 @@ var QueryBuilder = /** @class */ (function (_super) {
                 }
             }
         }
+        if (this.dataSource instanceof DataManager) {
+            if (!isNullOrUndefined(pred) && (pred.operator === "isnull" || pred.operator === "notnull")) {
+                pred.operator = pred.operator === "isnull" ? "equal" : "notequal";
+            }
+        }
         return pred;
     };
     QueryBuilder.prototype.getLocale = function () {
@@ -4194,6 +4205,9 @@ var QueryBuilder = /** @class */ (function (_super) {
                 }
             }
         }
+        if (rule.rules.length === 0 && this.headerTemplate) {
+            rule.rules[0] = { 'label': '', 'field': '', 'operator': '', 'type': '', 'value': '' };
+        }
         var ruleColl = rule.rules;
         if (!isNullOrUndefined(ruleColl)) {
             for (var i = 0, len = ruleColl.length; i < len; i++) {

package/styles/bootstrap5-dark.css

@@ -90,6 +90,13 @@
   color: #adb5bd;
 }
 
+.e-input-group.e-ddl.e-readonly .e-input[readonly] ~ span.e-input-group-icon.e-ddl-icon.e-search-icon,
+.e-input-group.e-control-wrapper.e-readonly .e-input[readonly] ~ span.e-input-group-icon.e-ddl-icon.e-search-icon,
+.e-float-input.e-ddl.e-readonly .e-input[readonly] ~ span.e-input-group-icon.e-ddl-icon.e-search-icon,
+.e-float-input.e-control-wrapper.e-ddl.e-readonly .e-input[readonly] ~ span.e-input-group-icon.e-ddl-icon.e-search-icon {
+  background: #343a40;
+}
+
 .e-input-group:not(.e-disabled) .e-control.e-dropdownlist ~ .e-ddl-icon,
 .e-input-group.e-disabled.e-ddl .e-control.e-dropdownlist ~ .e-input-group-icon,
 .e-control.e-dropdownlist .e-input-group.e-disabled.e-ddl .e-input-group-icon,
@@ -152,7 +159,7 @@
 }
 
 .e-multiselect .e-input-group-icon.e-ddl-icon {
-  border-radius: 0 4px 4px 0;
+  border-radius: 0 2px 2px 0;
   border-right-width: 0;
 }
 
@@ -200,7 +207,7 @@
 }
 
 .e-query-builder .e-collapse-rule::before {
-  content: '\e853';
+  content: '\e80e';
 }
 
 .e-query-builder {
@@ -326,7 +333,7 @@
 
 .e-query-builder .e-rule-list > ::after,
 .e-query-builder .e-rule-list > ::before {
-  border-style: dashed;
+  border-style: dotted;
   content: '';
   left: -12px;
   position: absolute;
@@ -500,8 +507,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: dashed;
-  border-top-width: 1px;
+  border-top-style: dotted;
+  border-top-width: 2px;
   margin-top: 0;
 }
 
@@ -510,12 +517,12 @@
 }
 
 .e-query-builder .e-group-body .e-rule-container .e-rule-filter {
-  padding: 8px 0 8px 8px;
+  padding: 8px 8px 8px 8px;
   width: auto;
 }
 
 .e-query-builder .e-group-body .e-rule-container .e-rule-sub-filter {
-  padding: 8px 0 8px 8px;
+  padding: 8px 8px 8px 8px;
   width: auto;
 }
 
@@ -541,7 +548,7 @@
 
 .e-query-builder .e-group-body .e-rule-container .e-operator,
 .e-query-builder .e-group-body .e-rule-container .e-value {
-  padding: 8px 0 8px 8px;
+  padding: 8px 8px 8px 8px;
 }
 
 .e-query-builder .e-group-body .e-rule-container .e-operator .e-radio-wrapper,
@@ -808,7 +815,7 @@
 .e-bigger.e-query-builder .e-group-body .e-horizontal-mode .e-rule-delete,
 .e-bigger .e-query-builder .e-group-body .e-horizontal-mode .e-rule-delete {
   display: inline-block;
-  margin-left: 10px;
+  margin-left: 16px;
 }
 
 .e-query-builder.e-device .e-group-body .e-horizontal-mode .e-rule-filter,
@@ -879,7 +886,7 @@
 *.e-bigger .e-group-body .e-rule-container .e-rule-sub-filter,
 *.e-bigger .e-group-body .e-rule-container .e-operator,
 *.e-bigger .e-group-body .e-rule-container .e-value {
-  padding: 10px 0 10px 10px;
+  padding: 16px 16px 16px 16px;
 }
 
 .e-query-builder {
@@ -891,6 +898,13 @@
   border-color: #444c54;
 }
 
+.e-query-builder .e-group-header .e-dropdown-btn.e-add-btn,
+.e-query-builder .e-deletegroup {
+  background-color: #212529;
+  box-shadow: none;
+  color: #adb5bd;
+}
+
 .e-query-builder .e-group-container {
   border-color: #444c54;
 }
@@ -922,6 +936,8 @@
 
 .e-query-builder .e-removerule.e-btn.e-round {
   background-color: #6c757d;
+  background-color: #212529;
+  color: #adb5bd;
 }
 
 .e-query-builder .e-removerule.e-btn.e-round.e-readonly {

package/styles/bootstrap5.css

@@ -90,6 +90,13 @@
   color: #6c757d;
 }
 
+.e-input-group.e-ddl.e-readonly .e-input[readonly] ~ span.e-input-group-icon.e-ddl-icon.e-search-icon,
+.e-input-group.e-control-wrapper.e-readonly .e-input[readonly] ~ span.e-input-group-icon.e-ddl-icon.e-search-icon,
+.e-float-input.e-ddl.e-readonly .e-input[readonly] ~ span.e-input-group-icon.e-ddl-icon.e-search-icon,
+.e-float-input.e-control-wrapper.e-ddl.e-readonly .e-input[readonly] ~ span.e-input-group-icon.e-ddl-icon.e-search-icon {
+  background: #e9ecef;
+}
+
 .e-input-group:not(.e-disabled) .e-control.e-dropdownlist ~ .e-ddl-icon,
 .e-input-group.e-disabled.e-ddl .e-control.e-dropdownlist ~ .e-input-group-icon,
 .e-control.e-dropdownlist .e-input-group.e-disabled.e-ddl .e-input-group-icon,
@@ -152,7 +159,7 @@
 }
 
 .e-multiselect .e-input-group-icon.e-ddl-icon {
-  border-radius: 0 4px 4px 0;
+  border-radius: 0 2px 2px 0;
   border-right-width: 0;
 }
 
@@ -200,7 +207,7 @@
 }
 
 .e-query-builder .e-collapse-rule::before {
-  content: '\e853';
+  content: '\e80e';
 }
 
 .e-query-builder {
@@ -326,7 +333,7 @@
 
 .e-query-builder .e-rule-list > ::after,
 .e-query-builder .e-rule-list > ::before {
-  border-style: dashed;
+  border-style: dotted;
   content: '';
   left: -12px;
   position: absolute;
@@ -500,8 +507,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: dashed;
-  border-top-width: 1px;
+  border-top-style: dotted;
+  border-top-width: 2px;
   margin-top: 0;
 }
 
@@ -510,12 +517,12 @@
 }
 
 .e-query-builder .e-group-body .e-rule-container .e-rule-filter {
-  padding: 8px 0 8px 8px;
+  padding: 8px 8px 8px 8px;
   width: auto;
 }
 
 .e-query-builder .e-group-body .e-rule-container .e-rule-sub-filter {
-  padding: 8px 0 8px 8px;
+  padding: 8px 8px 8px 8px;
   width: auto;
 }
 
@@ -541,7 +548,7 @@
 
 .e-query-builder .e-group-body .e-rule-container .e-operator,
 .e-query-builder .e-group-body .e-rule-container .e-value {
-  padding: 8px 0 8px 8px;
+  padding: 8px 8px 8px 8px;
 }
 
 .e-query-builder .e-group-body .e-rule-container .e-operator .e-radio-wrapper,
@@ -808,7 +815,7 @@
 .e-bigger.e-query-builder .e-group-body .e-horizontal-mode .e-rule-delete,
 .e-bigger .e-query-builder .e-group-body .e-horizontal-mode .e-rule-delete {
   display: inline-block;
-  margin-left: 10px;
+  margin-left: 16px;
 }
 
 .e-query-builder.e-device .e-group-body .e-horizontal-mode .e-rule-filter,
@@ -879,7 +886,7 @@
 *.e-bigger .e-group-body .e-rule-container .e-rule-sub-filter,
 *.e-bigger .e-group-body .e-rule-container .e-operator,
 *.e-bigger .e-group-body .e-rule-container .e-value {
-  padding: 10px 0 10px 10px;
+  padding: 16px 16px 16px 16px;
 }
 
 .e-query-builder {
@@ -891,6 +898,13 @@
   border-color: #dee2e6;
 }
 
+.e-query-builder .e-group-header .e-dropdown-btn.e-add-btn,
+.e-query-builder .e-deletegroup {
+  background-color: #fff;
+  box-shadow: none;
+  color: #6c757d;
+}
+
 .e-query-builder .e-group-container {
   border-color: #dee2e6;
 }
@@ -922,6 +936,8 @@
 
 .e-query-builder .e-removerule.e-btn.e-round {
   background-color: #6c757d;
+  background-color: #fff;
+  color: #6c757d;
 }
 
 .e-query-builder .e-removerule.e-btn.e-round.e-readonly {