@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.
- package/dist/ej2-querybuilder.min.js +2 -2
- package/dist/ej2-querybuilder.umd.min.js +2 -2
- package/dist/ej2-querybuilder.umd.min.js.map +1 -1
- package/dist/es6/ej2-querybuilder.es2015.js +30 -2
- package/dist/es6/ej2-querybuilder.es2015.js.map +1 -1
- package/dist/es6/ej2-querybuilder.es5.js +30 -2
- package/dist/es6/ej2-querybuilder.es5.js.map +1 -1
- package/dist/global/ej2-querybuilder.min.js +2 -2
- package/dist/global/ej2-querybuilder.min.js.map +1 -1
- package/dist/global/index.d.ts +1 -1
- package/package.json +9 -9
- package/src/query-builder/query-builder.js +30 -2
- package/styles/fluent2.css +5 -5
- package/styles/query-builder/fluent2.css +5 -5
|
@@ -1206,11 +1206,13 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
|
|
|
1206
1206
|
QueryBuilder.prototype.updateDropdowntreeDS = function (columns) {
|
|
1207
1207
|
for (var i = 0; i < columns.length; i++) {
|
|
1208
1208
|
if (columns[parseInt(i.toString(), 10)].type === 'object') {
|
|
1209
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
1209
1210
|
if (this.isAngular && columns[parseInt(i.toString(), 10)].template) {
|
|
1210
1211
|
delete columns[parseInt(i.toString(), 10)].template;
|
|
1211
1212
|
}
|
|
1212
1213
|
columns[parseInt(i.toString(), 10)].selectable = false;
|
|
1213
1214
|
this.updateDropdowntreeDS(columns[parseInt(i.toString(), 10)].columns);
|
|
1215
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
1214
1216
|
}
|
|
1215
1217
|
else if (this.isAngular && columns[parseInt(i.toString(), 10)].template) {
|
|
1216
1218
|
delete columns[parseInt(i.toString(), 10)].template;
|
|
@@ -1375,10 +1377,12 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
|
|
|
1375
1377
|
}
|
|
1376
1378
|
if (excludeOprs.indexOf(rule.rules[index].operator) < -1 &&
|
|
1377
1379
|
(isNullOrUndefined(rule.rules[index].value) &&
|
|
1378
|
-
rule.rules[index].type !== 'date') || rule.rules[index].value === '' ||
|
|
1380
|
+
rule.rules[index].type !== 'date') || rule.rules[index].value === '' || rule.rules[index].value === null ||
|
|
1379
1381
|
(rule.rules[index].value instanceof Array && valArray.length < 1)) {
|
|
1380
1382
|
var valElem = tempElem.querySelectorAll('.e-rule-value .e-control');
|
|
1381
|
-
|
|
1383
|
+
if (excludeOprs.indexOf(rule.rules[index].operator) < 0) {
|
|
1384
|
+
isValid = false;
|
|
1385
|
+
}
|
|
1382
1386
|
for (var j = 0, jLen = valElem.length; j < jLen; j++) {
|
|
1383
1387
|
var element = valElem[j];
|
|
1384
1388
|
var elem = void 0;
|
|
@@ -1393,6 +1397,18 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
|
|
|
1393
1397
|
}
|
|
1394
1398
|
j++;
|
|
1395
1399
|
}
|
|
1400
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
1401
|
+
}
|
|
1402
|
+
else if (rule.rules[index].type === 'date' && (rule.rules[index].value === null || rule.rules[index].value.indexOf(null) > -1)) {
|
|
1403
|
+
var valElem = tempElem.querySelectorAll('.e-rule-value .e-control');
|
|
1404
|
+
if (excludeOprs.indexOf(rule.rules[index].operator) < 0) {
|
|
1405
|
+
isValid = false;
|
|
1406
|
+
}
|
|
1407
|
+
for (var j = 0, jLen = valElem.length; j < jLen; j++) {
|
|
1408
|
+
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)) {
|
|
1409
|
+
this.renderToolTip(valElem[j].parentElement);
|
|
1410
|
+
}
|
|
1411
|
+
}
|
|
1396
1412
|
}
|
|
1397
1413
|
}
|
|
1398
1414
|
else if ((dropDownObj && dropDownObj.element && isNullOrUndefined(dropDownObj.index)) ||
|
|
@@ -2147,6 +2163,9 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
|
|
|
2147
2163
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
2148
2164
|
element = args.element;
|
|
2149
2165
|
}
|
|
2166
|
+
if (!element) {
|
|
2167
|
+
return;
|
|
2168
|
+
}
|
|
2150
2169
|
if (element.className.indexOf('e-day') > -1 || element.className.indexOf('e-today') > -1 || element.className.indexOf('e-cell') > -1) {
|
|
2151
2170
|
var calenderArgs = args;
|
|
2152
2171
|
element = calenderArgs.element;
|
|
@@ -3781,6 +3800,9 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
|
|
|
3781
3800
|
if (valElem[1] && valElem[1].parentElement.className.indexOf('e-tooltip') > -1) {
|
|
3782
3801
|
getComponent(valElem[1].parentElement, 'tooltip').destroy();
|
|
3783
3802
|
}
|
|
3803
|
+
if (valElem[2] && valElem[2].parentElement.className.indexOf('e-tooltip') > -1) {
|
|
3804
|
+
getComponent(valElem[2].parentElement, 'tooltip').destroy();
|
|
3805
|
+
}
|
|
3784
3806
|
}
|
|
3785
3807
|
}
|
|
3786
3808
|
};
|
|
@@ -6551,6 +6573,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
|
|
|
6551
6573
|
var grpCount;
|
|
6552
6574
|
var operator;
|
|
6553
6575
|
var isLeftOpened = false;
|
|
6576
|
+
var isNotOpened = false;
|
|
6554
6577
|
for (var i = 0, iLen = parser.length; i < iLen; i++) {
|
|
6555
6578
|
if (parser[i][0] === 'Literal') {
|
|
6556
6579
|
var column = this.getColumn(parser[i][1]);
|
|
@@ -6686,6 +6709,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
|
|
|
6686
6709
|
}
|
|
6687
6710
|
else if (parser[i][0] === 'Left') {
|
|
6688
6711
|
if (!(parser[0][0] === 'Left') && (parser[i - 1][1] === 'not' || sqlLocale && this.l10n.getConstant('NOT').toLowerCase() === parser[i - 1][1])) {
|
|
6712
|
+
isNotOpened = true;
|
|
6689
6713
|
continue;
|
|
6690
6714
|
}
|
|
6691
6715
|
this.parser = parser.splice(i + 1, iLen - (i + 1));
|
|
@@ -6716,6 +6740,10 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
|
|
|
6716
6740
|
}
|
|
6717
6741
|
}
|
|
6718
6742
|
else if (parser[i][0] === 'Right') {
|
|
6743
|
+
if (isNotOpened && parser[i + 1][0] === 'Right') {
|
|
6744
|
+
isNotOpened = false;
|
|
6745
|
+
continue;
|
|
6746
|
+
}
|
|
6719
6747
|
this.parser = parser.splice(i + 1, iLen - (i + 1));
|
|
6720
6748
|
levelColl.pop(); //To get the parent Group
|
|
6721
6749
|
rules = this.rule;
|