@syncfusion/ej2-querybuilder 26.1.38 → 26.1.40

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 (14) hide show
  1. package/dist/ej2-querybuilder.min.js +2 -2
  2. package/dist/ej2-querybuilder.umd.min.js +2 -2
  3. package/dist/ej2-querybuilder.umd.min.js.map +1 -1
  4. package/dist/es6/ej2-querybuilder.es2015.js +30 -2
  5. package/dist/es6/ej2-querybuilder.es2015.js.map +1 -1
  6. package/dist/es6/ej2-querybuilder.es5.js +30 -2
  7. package/dist/es6/ej2-querybuilder.es5.js.map +1 -1
  8. package/dist/global/ej2-querybuilder.min.js +2 -2
  9. package/dist/global/ej2-querybuilder.min.js.map +1 -1
  10. package/dist/global/index.d.ts +1 -1
  11. package/package.json +9 -9
  12. package/src/query-builder/query-builder.js +30 -2
  13. package/styles/fluent2.css +5 -5
  14. package/styles/query-builder/fluent2.css +5 -5
package/dist/global/index.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  /*!
2
2
  * filename: index.d.ts
3
- * version : 26.1.38
3
+ * version : 26.1.40
4
4
  * Copyright Syncfusion Inc. 2001 - 2023. 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@26.1.35",
3
+ "_id": "@syncfusion/ej2-querybuilder@26.1.38",
4
4
  "_inBundle": false,
5
- "_integrity": "sha512-OFo8+MEPI/tvAjZH5lLh3fjoH02CZ2Pq1A3Fw8O2uzXfEM+EGaFgPaQJ9n9vwDdI+gvK6/+FoZMVv7z9C5sHlA==",
5
+ "_integrity": "sha512-y2TXi+cToTo+9XkQ/WMfnmOI8EpW3J/Kr/pr+NPNYr8f3fD849jog2zIBQWi0FkDXLDnDQl/sGuNh0VIvJI//g==",
6
6
  "_location": "/@syncfusion/ej2-querybuilder",
7
7
  "_phantomChildren": {},
8
8
  "_requested": {
@@ -23,8 +23,8 @@
23
23
  "/@syncfusion/ej2-react-querybuilder",
24
24
  "/@syncfusion/ej2-vue-querybuilder"
25
25
  ],
26
- "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-querybuilder/-/ej2-querybuilder-26.1.35.tgz",
27
- "_shasum": "49f3e1ef5da4c1d0c6256072bbacb2873cf88e33",
26
+ "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-querybuilder/-/ej2-querybuilder-26.1.38.tgz",
27
+ "_shasum": "f125e6c4c1da213648fbb5fed3055c673a3e0597",
28
28
  "_spec": "@syncfusion/ej2-querybuilder@*",
29
29
  "_where": "/jenkins/workspace/elease-automation_release_26.1.1/packages/included",
30
30
  "author": {
@@ -33,10 +33,10 @@
33
33
  "bundleDependencies": false,
34
34
  "dependencies": {
35
35
  "@syncfusion/ej2-base": "~26.1.37",
36
- "@syncfusion/ej2-buttons": "~26.1.35",
37
- "@syncfusion/ej2-calendars": "~26.1.38",
38
- "@syncfusion/ej2-dropdowns": "~26.1.38",
39
- "@syncfusion/ej2-inputs": "~26.1.38",
36
+ "@syncfusion/ej2-buttons": "~26.1.40",
37
+ "@syncfusion/ej2-calendars": "~26.1.40",
38
+ "@syncfusion/ej2-dropdowns": "~26.1.40",
39
+ "@syncfusion/ej2-inputs": "~26.1.40",
40
40
  "@syncfusion/ej2-splitbuttons": "~26.1.35"
41
41
  },
42
42
  "deprecated": false,
@@ -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": "26.1.38",
69
+ "version": "26.1.40",
70
70
  "sideEffects": false,
71
71
  "homepage": "https://www.syncfusion.com/javascript-ui-controls"
72
72
  }
package/src/query-builder/query-builder.js CHANGED
@@ -1218,11 +1218,13 @@ var QueryBuilder = /** @class */ (function (_super) {
1218
1218
  QueryBuilder.prototype.updateDropdowntreeDS = function (columns) {
1219
1219
  for (var i = 0; i < columns.length; i++) {
1220
1220
  if (columns[parseInt(i.toString(), 10)].type === 'object') {
1221
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
1221
1222
  if (this.isAngular && columns[parseInt(i.toString(), 10)].template) {
1222
1223
  delete columns[parseInt(i.toString(), 10)].template;
1223
1224
  }
1224
1225
  columns[parseInt(i.toString(), 10)].selectable = false;
1225
1226
  this.updateDropdowntreeDS(columns[parseInt(i.toString(), 10)].columns);
1227
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
1226
1228
  }
1227
1229
  else if (this.isAngular && columns[parseInt(i.toString(), 10)].template) {
1228
1230
  delete columns[parseInt(i.toString(), 10)].template;
@@ -1387,10 +1389,12 @@ var QueryBuilder = /** @class */ (function (_super) {
1387
1389
  }
1388
1390
  if (excludeOprs.indexOf(rule.rules[index].operator) < -1 &&
1389
1391
  (isNullOrUndefined(rule.rules[index].value) &&
1390
- rule.rules[index].type !== 'date') || rule.rules[index].value === '' ||
1392
+ rule.rules[index].type !== 'date') || rule.rules[index].value === '' || rule.rules[index].value === null ||
1391
1393
  (rule.rules[index].value instanceof Array && valArray.length < 1)) {
1392
1394
  var valElem = tempElem.querySelectorAll('.e-rule-value .e-control');
1393
- isValid = false;
1395
+ if (excludeOprs.indexOf(rule.rules[index].operator) < 0) {
1396
+ isValid = false;
1397
+ }
1394
1398
  for (var j = 0, jLen = valElem.length; j < jLen; j++) {
1395
1399
  var element = valElem[j];
1396
1400
  var elem = void 0;
@@ -1405,6 +1409,18 @@ var QueryBuilder = /** @class */ (function (_super) {
1405
1409
  }
1406
1410
  j++;
1407
1411
  }
1412
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
1413
+ }
1414
+ else if (rule.rules[index].type === 'date' && (rule.rules[index].value === null || rule.rules[index].value.indexOf(null) > -1)) {
1415
+ var valElem = tempElem.querySelectorAll('.e-rule-value .e-control');
1416
+ if (excludeOprs.indexOf(rule.rules[index].operator) < 0) {
1417
+ isValid = false;
1418
+ }
1419
+ for (var j = 0, jLen = valElem.length; j < jLen; j++) {
1420
+ if (valElem[j].parentElement.className.indexOf('e-tooltip') < 0 && valElem[j].className.indexOf('e-tooltip') < 0 && (isNullOrUndefined(rule.rules[index].value) || rule.rules[index].value[j] == null)) {
1421
+ this.renderToolTip(valElem[j].parentElement);
1422
+ }
1423
+ }
1408
1424
  }
1409
1425
  }
1410
1426
  else if ((dropDownObj && dropDownObj.element && isNullOrUndefined(dropDownObj.index)) ||
@@ -2159,6 +2175,9 @@ var QueryBuilder = /** @class */ (function (_super) {
2159
2175
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
2160
2176
  element = args.element;
2161
2177
  }
2178
+ if (!element) {
2179
+ return;
2180
+ }
2162
2181
  if (element.className.indexOf('e-day') > -1 || element.className.indexOf('e-today') > -1 || element.className.indexOf('e-cell') > -1) {
2163
2182
  var calenderArgs = args;
2164
2183
  element = calenderArgs.element;
@@ -3793,6 +3812,9 @@ var QueryBuilder = /** @class */ (function (_super) {
3793
3812
  if (valElem[1] && valElem[1].parentElement.className.indexOf('e-tooltip') > -1) {
3794
3813
  getComponent(valElem[1].parentElement, 'tooltip').destroy();
3795
3814
  }
3815
+ if (valElem[2] && valElem[2].parentElement.className.indexOf('e-tooltip') > -1) {
3816
+ getComponent(valElem[2].parentElement, 'tooltip').destroy();
3817
+ }
3796
3818
  }
3797
3819
  }
3798
3820
  };
@@ -6565,6 +6587,7 @@ var QueryBuilder = /** @class */ (function (_super) {
6565
6587
  var grpCount;
6566
6588
  var operator;
6567
6589
  var isLeftOpened = false;
6590
+ var isNotOpened = false;
6568
6591
  for (var i = 0, iLen = parser.length; i < iLen; i++) {
6569
6592
  if (parser[i][0] === 'Literal') {
6570
6593
  var column = this.getColumn(parser[i][1]);
@@ -6700,6 +6723,7 @@ var QueryBuilder = /** @class */ (function (_super) {
6700
6723
  }
6701
6724
  else if (parser[i][0] === 'Left') {
6702
6725
  if (!(parser[0][0] === 'Left') && (parser[i - 1][1] === 'not' || sqlLocale && this.l10n.getConstant('NOT').toLowerCase() === parser[i - 1][1])) {
6726
+ isNotOpened = true;
6703
6727
  continue;
6704
6728
  }
6705
6729
  this.parser = parser.splice(i + 1, iLen - (i + 1));
@@ -6730,6 +6754,10 @@ var QueryBuilder = /** @class */ (function (_super) {
6730
6754
  }
6731
6755
  }
6732
6756
  else if (parser[i][0] === 'Right') {
6757
+ if (isNotOpened && parser[i + 1][0] === 'Right') {
6758
+ isNotOpened = false;
6759
+ continue;
6760
+ }
6733
6761
  this.parser = parser.splice(i + 1, iLen - (i + 1));
6734
6762
  levelColl.pop(); //To get the parent Group
6735
6763
  rules = this.rule;
package/styles/fluent2.css CHANGED
@@ -207,7 +207,7 @@
207
207
  --color-sf-info-outline: var(--color-sf-info-border-color);
208
208
  --color-sf-tooltip-bg-color: var(--color-sf-content-bg-color-alt1);
209
209
  --color-sf-tooltip-border: var(--color-sf-content-bg-color-alt1);
210
- --color-sf-toooltip-text-color: var(--color-sf-content-text-color);
210
+ --color-sf-tooltip-text-color: var(--color-sf-content-text-color);
211
211
  --color-sf-toast-text-color: var(--color-sf-content-text-color);
212
212
  --color-sf-toast-alt-text-color: var(--color-sf-content-text-color-alt1);
213
213
  --color-sf-appbar-bg-color-alt1: var(--color-sf-content-bg-color-alt2);
@@ -478,7 +478,7 @@
478
478
  --color-sf-success-bg-color: #218c21;
479
479
  --color-sf-success-border-color: var(--color-sf-success-bg-color);
480
480
  --color-sf-success-text: var(--color-sf-primary-text-color);
481
- --color-sf-success-bg-color-hover: var(--color-sf-success-bg-color);
481
+ --color-sf-success-bg-color-hover: #0e700e;
482
482
  --color-sf-success-border-color-hover: var(--color-sf-success-bg-color-hover);
483
483
  --color-sf-success-text-hover: var(--color-sf-primary-text-color);
484
484
  --color-sf-success-bg-color-pressed: #052505;
@@ -496,7 +496,7 @@
496
496
  --color-sf-warning-bg-color: #f87528;
497
497
  --color-sf-warning-border-color: var(--color-sf-warning-bg-color);
498
498
  --color-sf-warning-text: #242424;
499
- --color-sf-warning-bg-color-hover: var(--color-sf-warning-bg-color);
499
+ --color-sf-warning-bg-color-hover: #de590b;
500
500
  --color-sf-warning-border-color-hover: var(--color-sf-warning-bg-color-hover);
501
501
  --color-sf-warning-text-hover: var(--color-sf-primary-text-color);
502
502
  --color-sf-warning-bg-color-pressed: #4a1e04;
@@ -555,7 +555,7 @@
555
555
  --color-sf-info-outline: #0099bc;
556
556
  --color-sf-tooltip-bg-color: var(--color-sf-content-bg-color-alt1);
557
557
  --color-sf-tooltip-border: var(--color-sf-tooltip-bg-color);
558
- --color-sf-toooltip-text-color: var(--color-sf-content-text-color);
558
+ --color-sf-tooltip-text-color: var(--color-sf-content-text-color);
559
559
  --color-sf-toast-text-color: var(--color-sf-content-text-color);
560
560
  --color-sf-toast-alt-text-color: var(--color-sf-content-text-color-alt1);
561
561
  --color-sf-appbar-bg-color-alt1: var(--color-sf-content-bg-color-alt2);
@@ -897,7 +897,7 @@
897
897
  --color-sf-info-outline: #0099bc;
898
898
  --color-sf-tooltip-bg-color: var(--color-sf-content-bg-color-alt1);
899
899
  --color-sf-tooltip-border: var(--color-sf-border-light);
900
- --color-sf-toooltip-text-color: var(--color-sf-content-text-color);
900
+ --color-sf-tooltip-text-color: var(--color-sf-content-text-color);
901
901
  --color-sf-toast-text-color: var(--color-sf-content-text-color);
902
902
  --color-sf-toast-alt-text-color: var(--color-sf-content-text-color);
903
903
  --color-sf-appbar-bg-color-alt1: #fff;
package/styles/query-builder/fluent2.css CHANGED
@@ -207,7 +207,7 @@
207
207
  --color-sf-info-outline: var(--color-sf-info-border-color);
208
208
  --color-sf-tooltip-bg-color: var(--color-sf-content-bg-color-alt1);
209
209
  --color-sf-tooltip-border: var(--color-sf-content-bg-color-alt1);
210
- --color-sf-toooltip-text-color: var(--color-sf-content-text-color);
210
+ --color-sf-tooltip-text-color: var(--color-sf-content-text-color);
211
211
  --color-sf-toast-text-color: var(--color-sf-content-text-color);
212
212
  --color-sf-toast-alt-text-color: var(--color-sf-content-text-color-alt1);
213
213
  --color-sf-appbar-bg-color-alt1: var(--color-sf-content-bg-color-alt2);
@@ -478,7 +478,7 @@
478
478
  --color-sf-success-bg-color: #218c21;
479
479
  --color-sf-success-border-color: var(--color-sf-success-bg-color);
480
480
  --color-sf-success-text: var(--color-sf-primary-text-color);
481
- --color-sf-success-bg-color-hover: var(--color-sf-success-bg-color);
481
+ --color-sf-success-bg-color-hover: #0e700e;
482
482
  --color-sf-success-border-color-hover: var(--color-sf-success-bg-color-hover);
483
483
  --color-sf-success-text-hover: var(--color-sf-primary-text-color);
484
484
  --color-sf-success-bg-color-pressed: #052505;
@@ -496,7 +496,7 @@
496
496
  --color-sf-warning-bg-color: #f87528;
497
497
  --color-sf-warning-border-color: var(--color-sf-warning-bg-color);
498
498
  --color-sf-warning-text: #242424;
499
- --color-sf-warning-bg-color-hover: var(--color-sf-warning-bg-color);
499
+ --color-sf-warning-bg-color-hover: #de590b;
500
500
  --color-sf-warning-border-color-hover: var(--color-sf-warning-bg-color-hover);
501
501
  --color-sf-warning-text-hover: var(--color-sf-primary-text-color);
502
502
  --color-sf-warning-bg-color-pressed: #4a1e04;
@@ -555,7 +555,7 @@
555
555
  --color-sf-info-outline: #0099bc;
556
556
  --color-sf-tooltip-bg-color: var(--color-sf-content-bg-color-alt1);
557
557
  --color-sf-tooltip-border: var(--color-sf-tooltip-bg-color);
558
- --color-sf-toooltip-text-color: var(--color-sf-content-text-color);
558
+ --color-sf-tooltip-text-color: var(--color-sf-content-text-color);
559
559
  --color-sf-toast-text-color: var(--color-sf-content-text-color);
560
560
  --color-sf-toast-alt-text-color: var(--color-sf-content-text-color-alt1);
561
561
  --color-sf-appbar-bg-color-alt1: var(--color-sf-content-bg-color-alt2);
@@ -897,7 +897,7 @@
897
897
  --color-sf-info-outline: #0099bc;
898
898
  --color-sf-tooltip-bg-color: var(--color-sf-content-bg-color-alt1);
899
899
  --color-sf-tooltip-border: var(--color-sf-border-light);
900
- --color-sf-toooltip-text-color: var(--color-sf-content-text-color);
900
+ --color-sf-tooltip-text-color: var(--color-sf-content-text-color);
901
901
  --color-sf-toast-text-color: var(--color-sf-content-text-color);
902
902
  --color-sf-toast-alt-text-color: var(--color-sf-content-text-color);
903
903
  --color-sf-appbar-bg-color-alt1: #fff;