@syncfusion/ej2-querybuilder 23.2.7-52849 → 24.1.41
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/CHANGELOG.md +2 -24
- 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 +17 -5
- package/dist/es6/ej2-querybuilder.es2015.js.map +1 -1
- package/dist/es6/ej2-querybuilder.es5.js +17 -5
- 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 +26 -22
- package/src/query-builder/query-builder.js +17 -5
package/dist/global/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/*!
|
|
2
2
|
* filename: index.d.ts
|
|
3
|
-
* version :
|
|
3
|
+
* version : 24.1.41
|
|
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,45 +1,48 @@
|
|
|
1
1
|
{
|
|
2
|
-
"_from": "@syncfusion/ej2-querybuilder
|
|
3
|
-
"_id": "@syncfusion/ej2-querybuilder@
|
|
2
|
+
"_from": "@syncfusion/ej2-querybuilder@*",
|
|
3
|
+
"_id": "@syncfusion/ej2-querybuilder@18.24.1",
|
|
4
4
|
"_inBundle": false,
|
|
5
|
-
"_integrity": "sha512-
|
|
5
|
+
"_integrity": "sha512-kTDiokauao3Cyp5pEh0aBGQGjQ3JwZtIBkJiTnLDlOHoEmjx4eZ07vcxxG5HvyYu1Dk17xYY/oDi+3yk4WRTXQ==",
|
|
6
6
|
"_location": "/@syncfusion/ej2-querybuilder",
|
|
7
7
|
"_phantomChildren": {},
|
|
8
8
|
"_requested": {
|
|
9
|
-
"type": "
|
|
9
|
+
"type": "range",
|
|
10
10
|
"registry": true,
|
|
11
|
-
"raw": "@syncfusion/ej2-querybuilder
|
|
11
|
+
"raw": "@syncfusion/ej2-querybuilder@*",
|
|
12
12
|
"name": "@syncfusion/ej2-querybuilder",
|
|
13
13
|
"escapedName": "@syncfusion%2fej2-querybuilder",
|
|
14
14
|
"scope": "@syncfusion",
|
|
15
|
-
"rawSpec": "
|
|
15
|
+
"rawSpec": "*",
|
|
16
16
|
"saveSpec": null,
|
|
17
|
-
"fetchSpec": "
|
|
17
|
+
"fetchSpec": "*"
|
|
18
18
|
},
|
|
19
19
|
"_requiredBy": [
|
|
20
|
-
"
|
|
20
|
+
"/",
|
|
21
|
+
"/@syncfusion/ej2",
|
|
22
|
+
"/@syncfusion/ej2-angular-querybuilder",
|
|
23
|
+
"/@syncfusion/ej2-react-querybuilder",
|
|
24
|
+
"/@syncfusion/ej2-vue-querybuilder"
|
|
21
25
|
],
|
|
22
|
-
"_resolved": "https://
|
|
23
|
-
"_shasum": "
|
|
24
|
-
"_spec": "@syncfusion/ej2-querybuilder
|
|
25
|
-
"_where": "
|
|
26
|
+
"_resolved": "https://nexus.syncfusion.com/repository/ej2-release/@syncfusion/ej2-querybuilder/-/ej2-querybuilder-18.24.1.tgz",
|
|
27
|
+
"_shasum": "d195cb0fc7050696fd8a0a12393c330d493866f7",
|
|
28
|
+
"_spec": "@syncfusion/ej2-querybuilder@*",
|
|
29
|
+
"_where": "/jenkins/workspace/elease-automation_release_24.1.1/packages/included",
|
|
26
30
|
"author": {
|
|
27
31
|
"name": "Syncfusion Inc."
|
|
28
32
|
},
|
|
29
33
|
"bundleDependencies": false,
|
|
30
34
|
"dependencies": {
|
|
31
|
-
"@syncfusion/ej2-base": "~
|
|
32
|
-
"@syncfusion/ej2-buttons": "~
|
|
33
|
-
"@syncfusion/ej2-calendars": "~
|
|
34
|
-
"@syncfusion/ej2-dropdowns": "
|
|
35
|
-
"@syncfusion/ej2-inputs": "~
|
|
36
|
-
"@syncfusion/ej2-splitbuttons": "~
|
|
35
|
+
"@syncfusion/ej2-base": "~24.1.41",
|
|
36
|
+
"@syncfusion/ej2-buttons": "~24.1.41",
|
|
37
|
+
"@syncfusion/ej2-calendars": "~24.1.41",
|
|
38
|
+
"@syncfusion/ej2-dropdowns": "~24.1.41",
|
|
39
|
+
"@syncfusion/ej2-inputs": "~24.1.41",
|
|
40
|
+
"@syncfusion/ej2-splitbuttons": "~24.1.41"
|
|
37
41
|
},
|
|
38
42
|
"deprecated": false,
|
|
39
43
|
"description": "Essential JS 2 QueryBuilder",
|
|
40
44
|
"devDependencies": {},
|
|
41
45
|
"es2015": "./dist/es6/ej2-querybuilder.es5.js",
|
|
42
|
-
"homepage": "https://www.syncfusion.com/javascript-ui-controls",
|
|
43
46
|
"keywords": [
|
|
44
47
|
"ej2",
|
|
45
48
|
"syncfusion",
|
|
@@ -62,7 +65,8 @@
|
|
|
62
65
|
"type": "git",
|
|
63
66
|
"url": "https://github.com/syncfusion/ej2-javascript-ui-controls/tree/master/controls/querybuilder"
|
|
64
67
|
},
|
|
65
|
-
"sideEffects": false,
|
|
66
68
|
"typings": "index.d.ts",
|
|
67
|
-
"version": "
|
|
68
|
-
|
|
69
|
+
"version": "24.1.41",
|
|
70
|
+
"sideEffects": false,
|
|
71
|
+
"homepage": "https://www.syncfusion.com/javascript-ui-controls"
|
|
72
|
+
}
|
|
@@ -883,7 +883,7 @@ var QueryBuilder = /** @class */ (function (_super) {
|
|
|
883
883
|
if (rule.rules[index].value instanceof Array) {
|
|
884
884
|
valArray = rule.rules[index].value;
|
|
885
885
|
}
|
|
886
|
-
if (excludeOprs.indexOf(rule.rules[index].operator) <
|
|
886
|
+
if (excludeOprs.indexOf(rule.rules[index].operator) < -1 &&
|
|
887
887
|
(isNullOrUndefined(rule.rules[index].value) &&
|
|
888
888
|
rule.rules[index].type !== 'date') || rule.rules[index].value === '' ||
|
|
889
889
|
(rule.rules[index].value instanceof Array && valArray.length < 1)) {
|
|
@@ -1337,12 +1337,20 @@ var QueryBuilder = /** @class */ (function (_super) {
|
|
|
1337
1337
|
var groupID = groupElem && groupElem.id.replace(this.element.id + '_', '');
|
|
1338
1338
|
var ruleID = ruleElem.id.replace(this.element.id + '_', '');
|
|
1339
1339
|
var dateElement = args;
|
|
1340
|
+
var dropDownObj;
|
|
1340
1341
|
if (dateElement.element && dateElement.element.className.indexOf('e-datepicker') > -1) {
|
|
1341
1342
|
element = dateElement.element;
|
|
1343
|
+
dropDownObj = getComponent(closest(element, '.e-rule-container').querySelector('.e-filter-input'), 'dropdownlist');
|
|
1344
|
+
if (dropDownObj) {
|
|
1345
|
+
this.selectedColumn = dropDownObj.getDataByValue(dropDownObj.value);
|
|
1346
|
+
}
|
|
1347
|
+
dropDownObj = getComponent(closest(element, '.e-rule-container').querySelector('.e-filter-input'), 'dropdowntree');
|
|
1348
|
+
if (dropDownObj) {
|
|
1349
|
+
this.selectedColumn = this.getColumn(dropDownObj.value[0]);
|
|
1350
|
+
}
|
|
1342
1351
|
}
|
|
1343
1352
|
var value;
|
|
1344
1353
|
var rbValue;
|
|
1345
|
-
var dropDownObj;
|
|
1346
1354
|
if (element.className.indexOf('e-radio') > -1) {
|
|
1347
1355
|
// eslint-disable-next-line
|
|
1348
1356
|
rbValue = parseInt(element.id.split('valuekey')[1], 0);
|
|
@@ -1630,7 +1638,7 @@ var QueryBuilder = /** @class */ (function (_super) {
|
|
|
1630
1638
|
this.GetRootColumnName(rule.field) === this.GetRootColumnName(this.previousColumn.field))) {
|
|
1631
1639
|
var subField = this.selectedColumn.columns;
|
|
1632
1640
|
for (var i = 0; i < subField.length; i++) {
|
|
1633
|
-
if (rule.field === subField[i].field) {
|
|
1641
|
+
if (rule.field === subField[i].field || rule.field.indexOf(subField[i].field) > -1) {
|
|
1634
1642
|
dropDownList.value = subField[i].field;
|
|
1635
1643
|
this.selectedColumn = subField[i];
|
|
1636
1644
|
subFieldValue = true;
|
|
@@ -2463,7 +2471,7 @@ var QueryBuilder = /** @class */ (function (_super) {
|
|
|
2463
2471
|
}
|
|
2464
2472
|
var operator = tempRule.operator.toString();
|
|
2465
2473
|
var isTempRendered = false;
|
|
2466
|
-
if (!(operator.indexOf('null') > -1 || operator.indexOf('
|
|
2474
|
+
if (!(operator.indexOf('null') > -1 || operator.indexOf('isempty') > -1 || operator.indexOf('isnotempty') > -1)) {
|
|
2467
2475
|
var parentId = closest(target, '.e-rule-container').id;
|
|
2468
2476
|
prevItemData = this.getPreviousItemData(prevItemData, column);
|
|
2469
2477
|
if (prevItemData && prevItemData.template === undefined) {
|
|
@@ -2592,7 +2600,6 @@ var QueryBuilder = /** @class */ (function (_super) {
|
|
|
2592
2600
|
var valElemColl = this.columnTemplateFn(args, this, ruleID, templateID);
|
|
2593
2601
|
valElem = (valElemColl[0].nodeType === 3) ? valElemColl[1] : valElemColl[0];
|
|
2594
2602
|
target.nextElementSibling.appendChild(valElem);
|
|
2595
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
2596
2603
|
}
|
|
2597
2604
|
else if (this.isVue3) {
|
|
2598
2605
|
valElem = this.columnTemplateFn(args, this, 'Template', templateID);
|
|
@@ -4844,9 +4851,14 @@ var QueryBuilder = /** @class */ (function (_super) {
|
|
|
4844
4851
|
}
|
|
4845
4852
|
else {
|
|
4846
4853
|
var secParser = this.parser[this.parser.length - 2];
|
|
4854
|
+
var betweenParser = this.parser[this.parser.length - 3];
|
|
4847
4855
|
if (lastParser[0] === 'Left' && (secParser && secParser[0] === 'Conditions')) {
|
|
4848
4856
|
return true;
|
|
4849
4857
|
}
|
|
4858
|
+
var betweenOperator = 'between';
|
|
4859
|
+
if (lastParser[0] === 'Conditions' && (betweenParser && betweenParser[1].indexOf(betweenOperator) < 0)) {
|
|
4860
|
+
return true;
|
|
4861
|
+
}
|
|
4850
4862
|
}
|
|
4851
4863
|
return false;
|
|
4852
4864
|
};
|