@syncfusion/ej2-querybuilder 20.4.48 → 21.1.35

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (50) hide show
  1. package/CHANGELOG.md +3 -8
  2. package/dist/ej2-querybuilder.min.js +2 -2
  3. package/dist/ej2-querybuilder.umd.min.js +2 -2
  4. package/dist/ej2-querybuilder.umd.min.js.map +1 -1
  5. package/dist/es6/ej2-querybuilder.es2015.js +57 -18
  6. package/dist/es6/ej2-querybuilder.es2015.js.map +1 -1
  7. package/dist/es6/ej2-querybuilder.es5.js +57 -18
  8. package/dist/es6/ej2-querybuilder.es5.js.map +1 -1
  9. package/dist/global/ej2-querybuilder.min.js +2 -2
  10. package/dist/global/ej2-querybuilder.min.js.map +1 -1
  11. package/dist/global/index.d.ts +1 -1
  12. package/package.json +12 -12
  13. package/src/query-builder/query-builder.d.ts +20 -10
  14. package/src/query-builder/query-builder.js +57 -18
  15. package/styles/bootstrap-dark.css +17 -9
  16. package/styles/bootstrap.css +9 -9
  17. package/styles/bootstrap4.css +10 -10
  18. package/styles/bootstrap5-dark.css +11 -11
  19. package/styles/bootstrap5.css +11 -11
  20. package/styles/fabric-dark.css +15 -9
  21. package/styles/fabric.css +9 -9
  22. package/styles/fluent-dark.css +12 -12
  23. package/styles/fluent.css +12 -12
  24. package/styles/highcontrast-light.css +9 -30
  25. package/styles/highcontrast.css +9 -9
  26. package/styles/material-dark.css +9 -9
  27. package/styles/material.css +9 -9
  28. package/styles/query-builder/_bootstrap5-definition.scss +3 -3
  29. package/styles/query-builder/_fluent-definition.scss +3 -3
  30. package/styles/query-builder/_layout.scss +13 -3
  31. package/styles/query-builder/_tailwind-definition.scss +3 -3
  32. package/styles/query-builder/_theme.scss +14 -14
  33. package/styles/query-builder/bootstrap-dark.css +17 -9
  34. package/styles/query-builder/bootstrap.css +9 -9
  35. package/styles/query-builder/bootstrap4.css +10 -10
  36. package/styles/query-builder/bootstrap5-dark.css +11 -11
  37. package/styles/query-builder/bootstrap5.css +11 -11
  38. package/styles/query-builder/fabric-dark.css +15 -9
  39. package/styles/query-builder/fabric.css +9 -9
  40. package/styles/query-builder/fluent-dark.css +12 -12
  41. package/styles/query-builder/fluent.css +12 -12
  42. package/styles/query-builder/highcontrast-light.css +9 -30
  43. package/styles/query-builder/highcontrast.css +9 -9
  44. package/styles/query-builder/material-dark.css +9 -9
  45. package/styles/query-builder/material.css +9 -9
  46. package/styles/query-builder/tailwind-dark.css +9 -9
  47. package/styles/query-builder/tailwind.css +9 -9
  48. package/styles/tailwind-dark.css +9 -9
  49. package/styles/tailwind.css +9 -9
  50. package/styles/query-builder/_material3-definition.scss +0 -108
@@ -1,6 +1,6 @@
1
1
  /*!
2
2
  * filename: index.d.ts
3
- * version : 20.4.48
3
+ * version : 21.1.35
4
4
  * Copyright Syncfusion Inc. 2001 - 2020. All rights reserved.
5
5
  * Use of this code is subject to the terms of our license.
6
6
  * A copy of the current license can be obtained at any time by e-mailing
package/package.json CHANGED
@@ -1,8 +1,8 @@
1
1
  {
2
2
  "_from": "@syncfusion/ej2-querybuilder@*",
3
- "_id": "@syncfusion/ej2-querybuilder@20.4.42",
3
+ "_id": "@syncfusion/ej2-querybuilder@18.23.1",
4
4
  "_inBundle": false,
5
- "_integrity": "sha512-xiK1sHxtz9LtDZp3H96rIWpV9zWOtbSj5EBHXg8Yv3Iniyc/rjFA2GycBWFmWWfBDgBmmuc++ipDtjhQRKiWhA==",
5
+ "_integrity": "sha512-02uJQ5uBN6/DujdhEV5MIylwpxYrGckneCGZeaNxcwWAAH3F6rgzssgjDLHxta6+g3Dn0EBcnW70ndSU6zmY6Q==",
6
6
  "_location": "/@syncfusion/ej2-querybuilder",
7
7
  "_phantomChildren": {},
8
8
  "_requested": {
@@ -23,21 +23,21 @@
23
23
  "/@syncfusion/ej2-react-querybuilder",
24
24
  "/@syncfusion/ej2-vue-querybuilder"
25
25
  ],
26
- "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-querybuilder/-/ej2-querybuilder-20.4.42.tgz",
27
- "_shasum": "8cec09b8309415ed37b2fb39acbdf55794a48a64",
26
+ "_resolved": "https://nexus.syncfusion.com/repository/ej2-release/@syncfusion/ej2-querybuilder/-/ej2-querybuilder-18.23.1.tgz",
27
+ "_shasum": "c887735acecaa148d8b68486299ac8034822896b",
28
28
  "_spec": "@syncfusion/ej2-querybuilder@*",
29
- "_where": "/jenkins/workspace/ease-automation_release_19.1.0.1/packages/included",
29
+ "_where": "/jenkins/workspace/elease-automation_release_21.1.1/packages/included",
30
30
  "author": {
31
31
  "name": "Syncfusion Inc."
32
32
  },
33
33
  "bundleDependencies": false,
34
34
  "dependencies": {
35
- "@syncfusion/ej2-base": "~20.4.48",
36
- "@syncfusion/ej2-buttons": "~20.4.48",
37
- "@syncfusion/ej2-calendars": "~20.4.48",
38
- "@syncfusion/ej2-dropdowns": "~20.4.48",
39
- "@syncfusion/ej2-inputs": "~20.4.48",
40
- "@syncfusion/ej2-splitbuttons": "~20.4.48"
35
+ "@syncfusion/ej2-base": "~21.1.35",
36
+ "@syncfusion/ej2-buttons": "~21.1.35",
37
+ "@syncfusion/ej2-calendars": "~21.1.35",
38
+ "@syncfusion/ej2-dropdowns": "~21.1.35",
39
+ "@syncfusion/ej2-inputs": "~21.1.35",
40
+ "@syncfusion/ej2-splitbuttons": "~21.1.35"
41
41
  },
42
42
  "deprecated": false,
43
43
  "description": "Essential JS 2 QueryBuilder",
@@ -66,7 +66,7 @@
66
66
  "url": "https://github.com/syncfusion/ej2-javascript-ui-controls/tree/master/controls/querybuilder"
67
67
  },
68
68
  "typings": "index.d.ts",
69
- "version": "20.4.48",
69
+ "version": "21.1.35",
70
70
  "sideEffects": false,
71
71
  "homepage": "https://www.syncfusion.com/javascript-ui-controls"
72
72
  }
@@ -217,7 +217,11 @@ export interface FormatObject {
217
217
  skeleton?: string;
218
218
  }
219
219
  /**
220
- * Specifies the fieldMode as DropDownList or DropDownTree.
220
+ * Defines the fieldMode of Dropdown control.
221
+ * ```props
222
+ * Default :- To Specifies the fieldMode as DropDownList.
223
+ * DropdownTree :- To Specifies the fieldMode as DropdownTree.
224
+ * ```
221
225
  */
222
226
  export declare type FieldMode =
223
227
  /** Display the DropdownList */
@@ -225,7 +229,11 @@ export declare type FieldMode =
225
229
  /** Display the DropdownTree */
226
230
  'DropdownTree';
227
231
  /**
228
- * Specifies the displayMode as Horizontal or Vertical.
232
+ * Defines the display mode of the control.
233
+ * ```props
234
+ * Horizontal :- To display the control in a horizontal UI.
235
+ * Vertical :- To display the control in a vertical UI.
236
+ * ```
229
237
  */
230
238
  export declare type DisplayMode =
231
239
  /** Display the Horizontal UI */
@@ -233,10 +241,12 @@ export declare type DisplayMode =
233
241
  /** Display the Vertical UI */
234
242
  'Vertical';
235
243
  /**
236
- * Specifies the sort direction of the field names. They are
237
- * * Default
238
- * * Ascending
239
- * * Descending
244
+ * Defines the sorting direction of the field names in a control.
245
+ * ```props
246
+ * Default :- Specifies the field names in default sorting order.
247
+ * Ascending :- Specifies the field names in ascending order.
248
+ * Descending :- Specifies the field names in descending order.
249
+ * ```
240
250
  */
241
251
  export declare type SortDirection =
242
252
  /** Show the field names in default */
@@ -515,7 +525,7 @@ export declare class QueryBuilder extends Component<HTMLDivElement> implements I
515
525
  private addGroupSuccess;
516
526
  private headerTemplateFn;
517
527
  /**
518
- * notify the changes to component.
528
+ * Notify the changes to component.
519
529
  *
520
530
  * @param {string | number | boolean | Date | string[] | number[] | Date[]} value - 'value' to be passed to update the rule value.
521
531
  * @param {Element} element - 'element' to be passed to update the rule.
@@ -541,7 +551,7 @@ export declare class QueryBuilder extends Component<HTMLDivElement> implements I
541
551
  private destroyControls;
542
552
  private templateDestroy;
543
553
  /**
544
- * return values bound to the column.
554
+ * Return values bound to the column.
545
555
  *
546
556
  * @param {string} field - 'field' to be passed to get the field values.
547
557
  * @returns {object[]} - Values bound to the column
@@ -674,7 +684,7 @@ export declare class QueryBuilder extends Component<HTMLDivElement> implements I
674
684
  */
675
685
  deleteGroups(groupIdColl: string[]): void;
676
686
  /**
677
- * return the Query from current rules collection.
687
+ * Return the Query from current rules collection.
678
688
  *
679
689
  * @returns {Promise} - Query from current rules collection
680
690
  * @blazorType object
@@ -704,7 +714,7 @@ export declare class QueryBuilder extends Component<HTMLDivElement> implements I
704
714
  private getLocale;
705
715
  private getColumn;
706
716
  /**
707
- * return the operator bound to the column.
717
+ * Return the operator bound to the column.
708
718
  *
709
719
  * @returns {[key: string]: Object}[] - Operator bound to the column
710
720
  */
@@ -673,7 +673,13 @@ var QueryBuilder = /** @class */ (function (_super) {
673
673
  if (!column || (column && !column.ruleTemplate) || !rule.field) {
674
674
  if (this.fieldMode === 'Default') {
675
675
  var ddlField = void 0;
676
- var ddlValue = this.isImportRules ? this.GetRootColumnName(rule.field) : rule.field;
676
+ var ddlValue = void 0;
677
+ if (this.separator && rule.field) {
678
+ ddlValue = this.GetRootColumnName(rule.field);
679
+ }
680
+ else {
681
+ ddlValue = this.isImportRules ? this.GetRootColumnName(rule.field) : rule.field;
682
+ }
677
683
  ddlField = {
678
684
  dataSource: this.columns,
679
685
  fields: this.fields, placeholder: this.l10n.getConstant('SelectField'),
@@ -685,8 +691,13 @@ var QueryBuilder = /** @class */ (function (_super) {
685
691
  }
686
692
  dropDownList = new DropDownList(ddlField);
687
693
  dropDownList.appendTo('#' + ruleElem.id + '_filterkey');
688
- var ddlVal = this.isImportRules ?
689
- this.GetRootColumnName(rule.field) : dropDownList.value;
694
+ var ddlVal = void 0;
695
+ if (this.separator && rule.field) {
696
+ ddlVal = this.GetRootColumnName(rule.field);
697
+ }
698
+ else {
699
+ ddlVal = this.isImportRules ? this.GetRootColumnName(rule.field) : dropDownList.value;
700
+ }
690
701
  this.selectedColumn = dropDownList.getDataByValue(ddlVal);
691
702
  if (Object.keys(rule).length) {
692
703
  this.changeRule(rule, {
@@ -702,7 +713,7 @@ var QueryBuilder = /** @class */ (function (_super) {
702
713
  value: 'field', text: 'label', child: 'columns', expanded: 'expanded' },
703
714
  placeholder: this.l10n.getConstant('SelectField'), showClearButton: false,
704
715
  popupHeight: ((this.columns.length > 5) ? height : 'auto'), changeOnBlur: false,
705
- change: this.changeField.bind(this), value: this.isImportRules ? [ddlValue] : null,
716
+ change: this.changeField.bind(this), value: !isNullOrUndefined(ddlValue) ? [ddlValue] : null,
706
717
  open: this.popupOpen.bind(this, false)
707
718
  };
708
719
  if (this.fieldModel) {
@@ -715,7 +726,7 @@ var QueryBuilder = /** @class */ (function (_super) {
715
726
  dropdowntree.element.value = value;
716
727
  }
717
728
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
718
- var ddlVal = this.isImportRules ?
729
+ var ddlVal = !isNullOrUndefined(rule.field) ?
719
730
  this.GetRootColumnName(rule.field) : dropdowntree.value;
720
731
  this.selectedColumn = this.getColumn(ddlVal);
721
732
  if (Object.keys(rule).length) {
@@ -792,7 +803,6 @@ var QueryBuilder = /** @class */ (function (_super) {
792
803
  var tooltip = new Tooltip({ content: this.l10n.getConstant('ValidationMessage'),
793
804
  position: 'BottomCenter', cssClass: 'e-querybuilder-error' });
794
805
  tooltip.appendTo(element);
795
- // eslint-disable-next-line
796
806
  tooltip.open(element);
797
807
  };
798
808
  /**
@@ -1130,7 +1140,7 @@ var QueryBuilder = /** @class */ (function (_super) {
1130
1140
  return groupElem;
1131
1141
  };
1132
1142
  /**
1133
- * notify the changes to component.
1143
+ * Notify the changes to component.
1134
1144
  *
1135
1145
  * @param {string | number | boolean | Date | string[] | number[] | Date[]} value - 'value' to be passed to update the rule value.
1136
1146
  * @param {Element} element - 'element' to be passed to update the rule.
@@ -1410,6 +1420,9 @@ var QueryBuilder = /** @class */ (function (_super) {
1410
1420
  if (column && column.ruleTemplate) {
1411
1421
  this.templateChange(args.element, column.field, 'field');
1412
1422
  }
1423
+ else if (column && column.columns && column.columns[0].ruleTemplate) {
1424
+ this.templateChange(args.element, column.columns[0].field, 'field');
1425
+ }
1413
1426
  else {
1414
1427
  var groupElem = closest(args.element, '.e-group-container');
1415
1428
  var rules = this.getParentGroup(groupElem);
@@ -1565,7 +1578,8 @@ var QueryBuilder = /** @class */ (function (_super) {
1565
1578
  }
1566
1579
  var dropDownList = new DropDownList(ddlField);
1567
1580
  dropDownList.appendTo('#' + ruleId + '_subfilterkey' + this.subFilterCounter);
1568
- if (this.isImportRules) {
1581
+ if (this.isImportRules || (this.previousColumn && this.previousColumn.ruleTemplate &&
1582
+ this.GetRootColumnName(rule.field) === this.GetRootColumnName(this.previousColumn.field))) {
1569
1583
  var subField = this.selectedColumn.columns;
1570
1584
  for (var i = 0; i < subField.length; i++) {
1571
1585
  if (rule.field === subField[i].field || rule.field.indexOf(subField[i].field) > -1) {
@@ -1580,12 +1594,13 @@ var QueryBuilder = /** @class */ (function (_super) {
1580
1594
  this.subFieldElem = subFieldElem;
1581
1595
  // eslint-disable-next-line
1582
1596
  ddlArgs.itemData = ddlArgs.itemData;
1583
- if (!this.isImportRules || (!subFieldValue && this.selectedColumn.columns)) {
1597
+ if (!subFieldValue && this.selectedColumn.columns) {
1584
1598
  if (!subFieldValue && this.isImportRules) {
1585
1599
  dropDownList.value = null;
1586
1600
  }
1587
1601
  this.selectedColumn = this.selectedColumn.columns[0];
1588
1602
  }
1603
+ this.previousColumn = this.selectedColumn;
1589
1604
  if (!this.selectedColumn.columns) {
1590
1605
  this.changeRuleValues(tempElem, rule, tempRule, ddlArgs);
1591
1606
  }
@@ -1797,7 +1812,7 @@ var QueryBuilder = /** @class */ (function (_super) {
1797
1812
  }
1798
1813
  };
1799
1814
  /**
1800
- * return values bound to the column.
1815
+ * Return values bound to the column.
1801
1816
  *
1802
1817
  * @param {string} field - 'field' to be passed to get the field values.
1803
1818
  * @returns {object[]} - Values bound to the column
@@ -3859,7 +3874,7 @@ var QueryBuilder = /** @class */ (function (_super) {
3859
3874
  }
3860
3875
  };
3861
3876
  /**
3862
- * return the Query from current rules collection.
3877
+ * Return the Query from current rules collection.
3863
3878
  *
3864
3879
  * @returns {Promise} - Query from current rules collection
3865
3880
  * @blazorType object
@@ -4017,7 +4032,7 @@ var QueryBuilder = /** @class */ (function (_super) {
4017
4032
  }
4018
4033
  }
4019
4034
  if (this.dataSource instanceof DataManager) {
4020
- if (!isNullOrUndefined(pred) && (pred.operator === 'isnull' || pred.operator === 'notnull')) {
4035
+ if (!isNullOrUndefined(pred) && (pred.operator === 'isnull' || pred.operator === 'isnotnull')) {
4021
4036
  pred.operator = pred.operator === 'isnull' ? 'equal' : 'notequal';
4022
4037
  }
4023
4038
  }
@@ -4059,7 +4074,7 @@ var QueryBuilder = /** @class */ (function (_super) {
4059
4074
  };
4060
4075
  /* eslint-disable */
4061
4076
  /**
4062
- * return the operator bound to the column.
4077
+ * Return the operator bound to the column.
4063
4078
  *
4064
4079
  * @returns {[key: string]: Object}[] - Operator bound to the column
4065
4080
  */
@@ -4131,7 +4146,7 @@ var QueryBuilder = /** @class */ (function (_super) {
4131
4146
  pred = new Predicate(ruleColl.field, 'isnull', nullValue);
4132
4147
  break;
4133
4148
  case 'isnotnull':
4134
- pred = new Predicate(ruleColl.field, 'notnull', nullValue);
4149
+ pred = new Predicate(ruleColl.field, 'isnotnull', nullValue);
4135
4150
  break;
4136
4151
  case 'isempty':
4137
4152
  pred = new Predicate(ruleColl.field, 'equal', '');
@@ -4707,10 +4722,22 @@ var QueryBuilder = /** @class */ (function (_super) {
4707
4722
  if (/^'((?:[^\\']+?|\\.|'')*)'(?!')/.exec(sqlString)) {
4708
4723
  // eslint-disable-next-line
4709
4724
  matchValue = /^'((?:[^\\']+?|\\.|'')*)'(?!')/.exec(sqlString)[0];
4725
+ if (matchValue[matchValue.length - 2] === '(') {
4726
+ var isClosed = false;
4727
+ for (var j = matchValue.length; j < sqlString.length; j++) {
4728
+ matchValue += sqlString[j];
4729
+ if (sqlString[j] === ')') {
4730
+ isClosed = true;
4731
+ }
4732
+ if (isClosed && sqlString[j] === '\'') {
4733
+ break;
4734
+ }
4735
+ }
4736
+ }
4710
4737
  this.parser.push(['String', matchValue]);
4711
4738
  return matchValue.length;
4712
4739
  }
4713
- //Double String
4740
+ // Double String
4714
4741
  // eslint-disable-next-line
4715
4742
  if (/^"([^\\"]*(?:\\.[^\\"]*)*)"/.exec(sqlString)) {
4716
4743
  // eslint-disable-next-line
@@ -4907,7 +4934,11 @@ var QueryBuilder = /** @class */ (function (_super) {
4907
4934
  break;
4908
4935
  }
4909
4936
  if (operator.indexOf('like') > -1 && parser[j][0] === 'String') {
4910
- var val = parser[j][1] ? parser[j][1].replace(/'/g, '').replace(/%/g, '') : parser[j][1];
4937
+ var val = parser[j][1];
4938
+ if (parser[j][1] && parser[j][1][0] === '\'') {
4939
+ val = parser[j][1].substring(1, parser[j][1].length - 1);
4940
+ }
4941
+ val = val ? val.replace(/%/g, '') : parser[j][1];
4911
4942
  rule.value = val;
4912
4943
  rule.type = 'string';
4913
4944
  }
@@ -4919,7 +4950,11 @@ var QueryBuilder = /** @class */ (function (_super) {
4919
4950
  numVal.push(Number(parser[j][1]));
4920
4951
  }
4921
4952
  else if (parser[j][0] === 'String') {
4922
- strVal.push(parser[j][1].replace(/'/g, ''));
4953
+ var val = parser[j][1];
4954
+ if (parser[j][1] && parser[j][1][0] === '\'') {
4955
+ val = parser[j][1].substring(1, parser[j][1].length - 1);
4956
+ }
4957
+ strVal.push(val);
4923
4958
  }
4924
4959
  }
4925
4960
  else {
@@ -4927,7 +4962,11 @@ var QueryBuilder = /** @class */ (function (_super) {
4927
4962
  numVal.push(Number(parser[j][1]));
4928
4963
  }
4929
4964
  else if (parser[j][0] === 'String') {
4930
- strVal.push(parser[j][1].replace(/'/g, ''));
4965
+ var val = parser[j][1];
4966
+ if (parser[j][1] && parser[j][1][0] === '\'') {
4967
+ val = parser[j][1].substring(1, parser[j][1].length - 1);
4968
+ }
4969
+ strVal.push(val);
4931
4970
  }
4932
4971
  }
4933
4972
  rule.type = this.getTypeFromColumn(rule);
@@ -385,7 +385,7 @@
385
385
  border-top-left-radius: 0;
386
386
  border-top-right-radius: 0;
387
387
  border-top-style: dotted;
388
- border-top-width: 2px;
388
+ border-top-width: 1px;
389
389
  margin-top: 0;
390
390
  }
391
391
  .e-query-builder .e-group-body .e-rule-container.e-separate-rule {
@@ -678,12 +678,20 @@
678
678
  }
679
679
 
680
680
  .e-query-builder {
681
- background-color: #1a1a1a;
681
+ background: #1a1a1a;
682
682
  border-color: #484848;
683
683
  }
684
684
  .e-query-builder .e-group-header .e-btn-group {
685
685
  border-color: #484848;
686
686
  }
687
+ .e-query-builder.e-rtl .e-btn-group.e-rtl .e-qb-toggle.e-btn.e-small {
688
+ border-left: 1px solid #484848;
689
+ border-right: 1px solid #484848;
690
+ }
691
+ .e-query-builder.e-rtl .e-btn-group.e-rtl .e-qb-toggle.e-btn.e-small.e-active-toggle {
692
+ border-left: 1px solid #0070f0;
693
+ border-right: 1px solid #0070f0;
694
+ }
687
695
  .e-query-builder.e-rtl .e-btn-group.e-rtl .e-btn.e-btngroup-and-lbl.e-not {
688
696
  border-right: transparent;
689
697
  }
@@ -691,14 +699,14 @@
691
699
  border-color: #484848;
692
700
  }
693
701
  .e-query-builder .e-rule-container {
694
- background-color: #131313;
702
+ background: #131313;
695
703
  border-color: #484848;
696
704
  }
697
705
  .e-query-builder .e-rule-container.e-joined-rule {
698
706
  border-top-color: #9c9c9c;
699
707
  }
700
708
  .e-query-builder .e-rule-list .e-group-container {
701
- background-color: #1a1a1a;
709
+ background: #1a1a1a;
702
710
  }
703
711
  .e-query-builder .e-rule-list > ::after, .e-query-builder .e-rule-list > ::before {
704
712
  border-color: #9c9c9c;
@@ -712,27 +720,27 @@
712
720
  border-right: transparent;
713
721
  }
714
722
  .e-query-builder .e-removerule.e-btn.e-round {
715
- background-color: #131313;
723
+ background: #131313;
716
724
  }
717
725
  .e-query-builder .e-removerule.e-btn.e-round.e-readonly {
718
726
  display: none;
719
727
  }
720
728
  .e-query-builder .e-summary-content textarea {
721
- background-color: #1a1a1a;
729
+ background: #1a1a1a;
722
730
  color: #f0f0f0;
723
731
  }
724
732
  .e-query-builder .e-collapse-rule {
725
- background-color: #1a1a1a;
733
+ background: #1a1a1a;
726
734
  border-color: #acacac;
727
735
  color: #f0f0f0;
728
736
  }
729
737
  .e-query-builder .e-collapse-rule:focus, .e-query-builder .e-collapse-rule:active, .e-query-builder .e-collapse-rule:hover {
730
- background-color: #484848;
738
+ background: #484848;
731
739
  }
732
740
 
733
741
  .e-tooltip-wrap.e-querybuilder-error,
734
742
  .e-control.e-tooltip-wrap.e-popup.e-querybuilder-error {
735
- background-color: #fcdbe4;
743
+ background: #fcdbe4;
736
744
  border-color: #fcdbe4;
737
745
  }
738
746
 
@@ -383,7 +383,7 @@
383
383
  border-top-left-radius: 0;
384
384
  border-top-right-radius: 0;
385
385
  border-top-style: dotted;
386
- border-top-width: 2px;
386
+ border-top-width: 1px;
387
387
  margin-top: 0;
388
388
  }
389
389
  .e-query-builder .e-group-body .e-rule-container.e-separate-rule {
@@ -676,7 +676,7 @@
676
676
  }
677
677
 
678
678
  .e-query-builder {
679
- background-color: #fff;
679
+ background: #fff;
680
680
  border-color: #ddd;
681
681
  }
682
682
  .e-query-builder .e-group-header .e-btn-group {
@@ -689,14 +689,14 @@
689
689
  border-color: #ddd;
690
690
  }
691
691
  .e-query-builder .e-rule-container {
692
- background-color: #f8f8f8;
692
+ background: #f8f8f8;
693
693
  border-color: #ddd;
694
694
  }
695
695
  .e-query-builder .e-rule-container.e-joined-rule {
696
696
  border-top-color: #ddd;
697
697
  }
698
698
  .e-query-builder .e-rule-list .e-group-container {
699
- background-color: #fff;
699
+ background: #fff;
700
700
  }
701
701
  .e-query-builder .e-rule-list > ::after, .e-query-builder .e-rule-list > ::before {
702
702
  border-color: #ddd;
@@ -710,27 +710,27 @@
710
710
  border-right: transparent;
711
711
  }
712
712
  .e-query-builder .e-removerule.e-btn.e-round {
713
- background-color: #f8f8f8;
713
+ background: #f8f8f8;
714
714
  }
715
715
  .e-query-builder .e-removerule.e-btn.e-round.e-readonly {
716
716
  display: none;
717
717
  }
718
718
  .e-query-builder .e-summary-content textarea {
719
- background-color: #fff;
719
+ background: #fff;
720
720
  color: #333;
721
721
  }
722
722
  .e-query-builder .e-collapse-rule {
723
- background-color: #fff;
723
+ background: #fff;
724
724
  border-color: #ccc;
725
725
  color: #333;
726
726
  }
727
727
  .e-query-builder .e-collapse-rule:focus, .e-query-builder .e-collapse-rule:active, .e-query-builder .e-collapse-rule:hover {
728
- background-color: #ddd;
728
+ background: #ddd;
729
729
  }
730
730
 
731
731
  .e-tooltip-wrap.e-querybuilder-error,
732
732
  .e-control.e-tooltip-wrap.e-popup.e-querybuilder-error {
733
- background-color: #fcdbe4;
733
+ background: #fcdbe4;
734
734
  border-color: #fcdbe4;
735
735
  }
736
736
 
@@ -463,7 +463,7 @@
463
463
  border-top-left-radius: 0;
464
464
  border-top-right-radius: 0;
465
465
  border-top-style: dotted;
466
- border-top-width: 2px;
466
+ border-top-width: 1px;
467
467
  margin-top: 0;
468
468
  }
469
469
  .e-query-builder .e-group-body .e-rule-container.e-separate-rule {
@@ -756,7 +756,7 @@
756
756
  }
757
757
 
758
758
  .e-query-builder {
759
- background-color: #fff;
759
+ background: #fff;
760
760
  border-color: #dee2e6;
761
761
  }
762
762
  .e-query-builder .e-group-header .e-btn-group {
@@ -777,14 +777,14 @@
777
777
  border-color: #dee2e6;
778
778
  }
779
779
  .e-query-builder .e-rule-container {
780
- background-color: #f8f9fa;
780
+ background: #f8f9fa;
781
781
  border-color: #dee2e6;
782
782
  }
783
783
  .e-query-builder .e-rule-container.e-joined-rule {
784
784
  border-top-color: #dee2e6;
785
785
  }
786
786
  .e-query-builder .e-rule-list .e-group-container {
787
- background-color: #fff;
787
+ background: #fff;
788
788
  }
789
789
  .e-query-builder .e-rule-list > ::after, .e-query-builder .e-rule-list > ::before {
790
790
  border-color: #dee2e6;
@@ -803,28 +803,28 @@
803
803
  color: #495057;
804
804
  }
805
805
  .e-query-builder .e-removerule.e-btn.e-round {
806
- background-color: #6c757d;
807
- background-color: #fff;
806
+ background: #6c757d;
807
+ background: #fff;
808
808
  }
809
809
  .e-query-builder .e-removerule.e-btn.e-round.e-readonly {
810
810
  display: none;
811
811
  }
812
812
  .e-query-builder .e-summary-content textarea {
813
- background-color: #fff;
813
+ background: #fff;
814
814
  color: #212529;
815
815
  }
816
816
  .e-query-builder .e-collapse-rule {
817
- background-color: #fff;
817
+ background: #fff;
818
818
  border-color: #dee2e6;
819
819
  color: #212529;
820
820
  }
821
821
  .e-query-builder .e-collapse-rule:focus, .e-query-builder .e-collapse-rule:active, .e-query-builder .e-collapse-rule:hover {
822
- background-color: #dee2e6;
822
+ background: #dee2e6;
823
823
  }
824
824
 
825
825
  .e-tooltip-wrap.e-querybuilder-error,
826
826
  .e-control.e-tooltip-wrap.e-popup.e-querybuilder-error {
827
- background-color: #fcdbe4;
827
+ background: #fcdbe4;
828
828
  border-color: #fcdbe4;
829
829
  }
830
830
 
@@ -433,7 +433,7 @@
433
433
  border-top-left-radius: 0;
434
434
  border-top-right-radius: 0;
435
435
  border-top-style: dotted;
436
- border-top-width: 2px;
436
+ border-top-width: 1px;
437
437
  margin-top: 0;
438
438
  }
439
439
  .e-query-builder .e-group-body .e-rule-container.e-separate-rule {
@@ -726,7 +726,7 @@
726
726
  }
727
727
 
728
728
  .e-query-builder {
729
- background-color: transparent;
729
+ background: transparent;
730
730
  border-color: #444c54;
731
731
  }
732
732
  .e-query-builder .e-group-header .e-btn-group {
@@ -734,7 +734,7 @@
734
734
  }
735
735
  .e-query-builder .e-group-header .e-dropdown-btn.e-add-btn,
736
736
  .e-query-builder .e-deletegroup {
737
- background-color: #212529;
737
+ background: #212529;
738
738
  box-shadow: none;
739
739
  color: #adb5bd;
740
740
  }
@@ -742,14 +742,14 @@
742
742
  border-color: #444c54;
743
743
  }
744
744
  .e-query-builder .e-rule-container {
745
- background-color: #282d31;
745
+ background: #282d31;
746
746
  border-color: #444c54;
747
747
  }
748
748
  .e-query-builder .e-rule-container.e-joined-rule {
749
749
  border-top-color: #444c54;
750
750
  }
751
751
  .e-query-builder .e-rule-list .e-group-container {
752
- background-color: transparent;
752
+ background: transparent;
753
753
  }
754
754
  .e-query-builder .e-rule-list > ::after, .e-query-builder .e-rule-list > ::before {
755
755
  border-color: #444c54;
@@ -760,29 +760,29 @@
760
760
  color: #fff;
761
761
  }
762
762
  .e-query-builder .e-removerule.e-btn.e-round {
763
- background-color: #6c757d;
764
- background-color: #212529;
763
+ background: #6c757d;
764
+ background: #212529;
765
765
  color: #adb5bd;
766
766
  }
767
767
  .e-query-builder .e-removerule.e-btn.e-round.e-readonly {
768
768
  display: none;
769
769
  }
770
770
  .e-query-builder .e-summary-content textarea {
771
- background-color: transparent;
771
+ background: transparent;
772
772
  color: #6c757d;
773
773
  }
774
774
  .e-query-builder .e-collapse-rule {
775
- background-color: transparent;
775
+ background: transparent;
776
776
  border-color: #444c54;
777
777
  color: #6c757d;
778
778
  }
779
779
  .e-query-builder .e-collapse-rule:focus, .e-query-builder .e-collapse-rule:active, .e-query-builder .e-collapse-rule:hover {
780
- background-color: #444c54;
780
+ background: #444c54;
781
781
  }
782
782
 
783
783
  .e-tooltip-wrap.e-querybuilder-error,
784
784
  .e-control.e-tooltip-wrap.e-popup.e-querybuilder-error {
785
- background-color: #fadfe2;
785
+ background: #fadfe2;
786
786
  border-color: #fadfe2;
787
787
  }
788
788