@syncfusion/ej2-querybuilder 32.2.7 → 32.2.9
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 +31 -3
- package/dist/es6/ej2-querybuilder.es2015.js.map +1 -1
- package/dist/es6/ej2-querybuilder.es5.js +31 -3
- 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 +6 -6
- package/src/query-builder/query-builder.d.ts +1 -0
- package/src/query-builder/query-builder.js +31 -3
- package/styles/material3-dark-lite.css +0 -2
- package/styles/material3-dark.css +0 -2
- package/styles/material3-lite.css +0 -2
- package/styles/material3.css +0 -2
- package/styles/query-builder/material3-dark.css +0 -2
- package/styles/query-builder/material3.css +0 -2
package/dist/global/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/*!
|
|
2
2
|
* filename: index.d.ts
|
|
3
|
-
* version : 32.2.
|
|
3
|
+
* version : 32.2.9
|
|
4
4
|
* Copyright Syncfusion Inc. 2001 - 2025. 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,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@syncfusion/ej2-querybuilder",
|
|
3
|
-
"version": "32.2.
|
|
3
|
+
"version": "32.2.9",
|
|
4
4
|
"description": "Essential JS 2 QueryBuilder",
|
|
5
5
|
"author": "Syncfusion Inc.",
|
|
6
6
|
"license": "SEE LICENSE IN license",
|
|
@@ -8,11 +8,11 @@
|
|
|
8
8
|
"module": "./index.js",
|
|
9
9
|
"es2015": "./dist/es6/ej2-querybuilder.es5.js",
|
|
10
10
|
"dependencies": {
|
|
11
|
-
"@syncfusion/ej2-base": "~32.2.
|
|
12
|
-
"@syncfusion/ej2-buttons": "~32.2.
|
|
13
|
-
"@syncfusion/ej2-calendars": "~32.2.
|
|
14
|
-
"@syncfusion/ej2-dropdowns": "~32.2.
|
|
15
|
-
"@syncfusion/ej2-inputs": "~32.2.
|
|
11
|
+
"@syncfusion/ej2-base": "~32.2.9",
|
|
12
|
+
"@syncfusion/ej2-buttons": "~32.2.9",
|
|
13
|
+
"@syncfusion/ej2-calendars": "~32.2.9",
|
|
14
|
+
"@syncfusion/ej2-dropdowns": "~32.2.9",
|
|
15
|
+
"@syncfusion/ej2-inputs": "~32.2.8",
|
|
16
16
|
"@syncfusion/ej2-splitbuttons": "~32.2.7"
|
|
17
17
|
},
|
|
18
18
|
"devDependencies": {},
|
|
@@ -707,6 +707,7 @@ export declare class QueryBuilder extends Component<HTMLDivElement> implements I
|
|
|
707
707
|
private getDistinctValues;
|
|
708
708
|
private renderMultiSelect;
|
|
709
709
|
private multiSelectOpen;
|
|
710
|
+
private areQueriesSame;
|
|
710
711
|
private bindMultiSelectData;
|
|
711
712
|
private getMultiSelectData;
|
|
712
713
|
private createSpinner;
|
|
@@ -2989,7 +2989,7 @@ var QueryBuilder = /** @class */ (function (_super) {
|
|
|
2989
2989
|
value = dataSource[i]["" + field].toString();
|
|
2990
2990
|
}
|
|
2991
2991
|
var data = {};
|
|
2992
|
-
if (!(value in original)) {
|
|
2992
|
+
if (!(value in original) && value) {
|
|
2993
2993
|
original["" + value] = 1;
|
|
2994
2994
|
if (isNested === 0) {
|
|
2995
2995
|
data["" + field] = value;
|
|
@@ -3081,8 +3081,27 @@ var QueryBuilder = /** @class */ (function (_super) {
|
|
|
3081
3081
|
args.cancel = true;
|
|
3082
3082
|
this.bindMultiSelectData(element, value);
|
|
3083
3083
|
}
|
|
3084
|
+
var multiselectObj = getComponent(element, 'multiselect');
|
|
3085
|
+
if (!multiselectObj) {
|
|
3086
|
+
return;
|
|
3087
|
+
}
|
|
3088
|
+
var incomingQuery = (args.query) ? args.query : null;
|
|
3089
|
+
var existingQuery = multiselectObj.query ? multiselectObj.query : null;
|
|
3090
|
+
if (!this.areQueriesSame(existingQuery, incomingQuery)) {
|
|
3091
|
+
multiselectObj.query = null;
|
|
3092
|
+
args.query = null;
|
|
3093
|
+
}
|
|
3084
3094
|
}
|
|
3085
3095
|
};
|
|
3096
|
+
QueryBuilder.prototype.areQueriesSame = function (query1, query2) {
|
|
3097
|
+
if ((query1 === null || query1 === undefined) && (query2 === null || query2 === undefined)) {
|
|
3098
|
+
return true;
|
|
3099
|
+
}
|
|
3100
|
+
if ((query1 === null || query1 === undefined) || (query2 === null || query2 === undefined)) {
|
|
3101
|
+
return false;
|
|
3102
|
+
}
|
|
3103
|
+
return JSON.stringify(query1) === JSON.stringify(query2);
|
|
3104
|
+
};
|
|
3086
3105
|
QueryBuilder.prototype.bindMultiSelectData = function (element, value) {
|
|
3087
3106
|
this.getMultiSelectData(element, value);
|
|
3088
3107
|
};
|
|
@@ -4283,9 +4302,18 @@ var QueryBuilder = /** @class */ (function (_super) {
|
|
|
4283
4302
|
if (this.groupCloned && this.target instanceof HTMLElement &&
|
|
4284
4303
|
this.getGroup(this.target).rules.length > 1) {
|
|
4285
4304
|
var parent_1 = this.element.querySelector('#' + groupID);
|
|
4305
|
+
var allContainers = parent_1.querySelectorAll(':scope > .e-group-body > .e-rule-list > [class*="-container"]');
|
|
4286
4306
|
var topLevelGroups = parent_1.querySelectorAll(':scope > .e-group-body > .e-rule-list > .e-group-container');
|
|
4287
|
-
if (groupID !== 'querybuilder_group0' && !(this.isAngular && groupID === 'ej2-querybuilder_0_group0')) {
|
|
4288
|
-
|
|
4307
|
+
if (topLevelGroups.length > 0 && groupID !== 'querybuilder_group0' && !(this.isAngular && groupID === 'ej2-querybuilder_0_group0')) {
|
|
4308
|
+
var lastGroupIndex = -1;
|
|
4309
|
+
var lastGroup = topLevelGroups[topLevelGroups.length - 1];
|
|
4310
|
+
for (var i = 0; i < allContainers.length; i++) {
|
|
4311
|
+
if (allContainers[i] === lastGroup) {
|
|
4312
|
+
lastGroupIndex = i;
|
|
4313
|
+
break;
|
|
4314
|
+
}
|
|
4315
|
+
}
|
|
4316
|
+
this.groupIndex = lastGroupIndex - 1;
|
|
4289
4317
|
}
|
|
4290
4318
|
}
|
|
4291
4319
|
if (this.groupIndex < 0) {
|
|
@@ -667,7 +667,6 @@
|
|
|
667
667
|
padding: 0 !important; /* stylelint-disable-line declaration-no-important */
|
|
668
668
|
}
|
|
669
669
|
.e-query-builder .e-dragclone.e-cloneproperties .e-group-container, .e-query-builder .e-dragclone.e-cloneproperties .e-rule-container {
|
|
670
|
-
background: -webkit-gradient(linear, left bottom, left top, from(rgba(var(--color-sf-primary), 0.05)), to(rgba(var(--color-sf-primary), 0.05))), rgba(var(--color-sf-surface));
|
|
671
670
|
background: linear-gradient(0deg, rgba(var(--color-sf-primary), 0.05), rgba(var(--color-sf-primary), 0.05)), rgba(var(--color-sf-surface));
|
|
672
671
|
}
|
|
673
672
|
.e-query-builder .e-dragclone.e-cloneproperties .e-rule-value-delete {
|
|
@@ -1265,7 +1264,6 @@
|
|
|
1265
1264
|
border-color: rgba(var(--color-sf-outline-variant));
|
|
1266
1265
|
}
|
|
1267
1266
|
.e-query-builder .e-rule-container {
|
|
1268
|
-
background: -webkit-gradient(linear, left bottom, left top, from(rgba(var(--color-sf-primary), 0.05)), to(rgba(var(--color-sf-primary), 0.05))), rgba(var(--color-sf-surface));
|
|
1269
1267
|
background: linear-gradient(0deg, rgba(var(--color-sf-primary), 0.05), rgba(var(--color-sf-primary), 0.05)), rgba(var(--color-sf-surface));
|
|
1270
1268
|
border-color: rgba(var(--color-sf-outline-variant));
|
|
1271
1269
|
}
|
|
@@ -667,7 +667,6 @@
|
|
|
667
667
|
padding: 0 !important; /* stylelint-disable-line declaration-no-important */
|
|
668
668
|
}
|
|
669
669
|
.e-query-builder .e-dragclone.e-cloneproperties .e-group-container, .e-query-builder .e-dragclone.e-cloneproperties .e-rule-container {
|
|
670
|
-
background: -webkit-gradient(linear, left bottom, left top, from(rgba(var(--color-sf-primary), 0.05)), to(rgba(var(--color-sf-primary), 0.05))), rgba(var(--color-sf-surface));
|
|
671
670
|
background: linear-gradient(0deg, rgba(var(--color-sf-primary), 0.05), rgba(var(--color-sf-primary), 0.05)), rgba(var(--color-sf-surface));
|
|
672
671
|
}
|
|
673
672
|
.e-query-builder .e-dragclone.e-cloneproperties .e-rule-value-delete {
|
|
@@ -1265,7 +1264,6 @@
|
|
|
1265
1264
|
border-color: rgba(var(--color-sf-outline-variant));
|
|
1266
1265
|
}
|
|
1267
1266
|
.e-query-builder .e-rule-container {
|
|
1268
|
-
background: -webkit-gradient(linear, left bottom, left top, from(rgba(var(--color-sf-primary), 0.05)), to(rgba(var(--color-sf-primary), 0.05))), rgba(var(--color-sf-surface));
|
|
1269
1267
|
background: linear-gradient(0deg, rgba(var(--color-sf-primary), 0.05), rgba(var(--color-sf-primary), 0.05)), rgba(var(--color-sf-surface));
|
|
1270
1268
|
border-color: rgba(var(--color-sf-outline-variant));
|
|
1271
1269
|
}
|
|
@@ -671,7 +671,6 @@
|
|
|
671
671
|
padding: 0 !important; /* stylelint-disable-line declaration-no-important */
|
|
672
672
|
}
|
|
673
673
|
.e-query-builder .e-dragclone.e-cloneproperties .e-group-container, .e-query-builder .e-dragclone.e-cloneproperties .e-rule-container {
|
|
674
|
-
background: -webkit-gradient(linear, left bottom, left top, from(rgba(var(--color-sf-primary), 0.05)), to(rgba(var(--color-sf-primary), 0.05))), rgba(var(--color-sf-surface));
|
|
675
674
|
background: linear-gradient(0deg, rgba(var(--color-sf-primary), 0.05), rgba(var(--color-sf-primary), 0.05)), rgba(var(--color-sf-surface));
|
|
676
675
|
}
|
|
677
676
|
.e-query-builder .e-dragclone.e-cloneproperties .e-rule-value-delete {
|
|
@@ -1271,7 +1270,6 @@
|
|
|
1271
1270
|
border-color: rgba(var(--color-sf-outline-variant));
|
|
1272
1271
|
}
|
|
1273
1272
|
.e-query-builder .e-rule-container {
|
|
1274
|
-
background: -webkit-gradient(linear, left bottom, left top, from(rgba(var(--color-sf-primary), 0.05)), to(rgba(var(--color-sf-primary), 0.05))), rgba(var(--color-sf-surface));
|
|
1275
1273
|
background: linear-gradient(0deg, rgba(var(--color-sf-primary), 0.05), rgba(var(--color-sf-primary), 0.05)), rgba(var(--color-sf-surface));
|
|
1276
1274
|
border-color: rgba(var(--color-sf-outline-variant));
|
|
1277
1275
|
}
|
package/styles/material3.css
CHANGED
|
@@ -671,7 +671,6 @@
|
|
|
671
671
|
padding: 0 !important; /* stylelint-disable-line declaration-no-important */
|
|
672
672
|
}
|
|
673
673
|
.e-query-builder .e-dragclone.e-cloneproperties .e-group-container, .e-query-builder .e-dragclone.e-cloneproperties .e-rule-container {
|
|
674
|
-
background: -webkit-gradient(linear, left bottom, left top, from(rgba(var(--color-sf-primary), 0.05)), to(rgba(var(--color-sf-primary), 0.05))), rgba(var(--color-sf-surface));
|
|
675
674
|
background: linear-gradient(0deg, rgba(var(--color-sf-primary), 0.05), rgba(var(--color-sf-primary), 0.05)), rgba(var(--color-sf-surface));
|
|
676
675
|
}
|
|
677
676
|
.e-query-builder .e-dragclone.e-cloneproperties .e-rule-value-delete {
|
|
@@ -1271,7 +1270,6 @@
|
|
|
1271
1270
|
border-color: rgba(var(--color-sf-outline-variant));
|
|
1272
1271
|
}
|
|
1273
1272
|
.e-query-builder .e-rule-container {
|
|
1274
|
-
background: -webkit-gradient(linear, left bottom, left top, from(rgba(var(--color-sf-primary), 0.05)), to(rgba(var(--color-sf-primary), 0.05))), rgba(var(--color-sf-surface));
|
|
1275
1273
|
background: linear-gradient(0deg, rgba(var(--color-sf-primary), 0.05), rgba(var(--color-sf-primary), 0.05)), rgba(var(--color-sf-surface));
|
|
1276
1274
|
border-color: rgba(var(--color-sf-outline-variant));
|
|
1277
1275
|
}
|
|
@@ -667,7 +667,6 @@
|
|
|
667
667
|
padding: 0 !important; /* stylelint-disable-line declaration-no-important */
|
|
668
668
|
}
|
|
669
669
|
.e-query-builder .e-dragclone.e-cloneproperties .e-group-container, .e-query-builder .e-dragclone.e-cloneproperties .e-rule-container {
|
|
670
|
-
background: -webkit-gradient(linear, left bottom, left top, from(rgba(var(--color-sf-primary), 0.05)), to(rgba(var(--color-sf-primary), 0.05))), rgba(var(--color-sf-surface));
|
|
671
670
|
background: linear-gradient(0deg, rgba(var(--color-sf-primary), 0.05), rgba(var(--color-sf-primary), 0.05)), rgba(var(--color-sf-surface));
|
|
672
671
|
}
|
|
673
672
|
.e-query-builder .e-dragclone.e-cloneproperties .e-rule-value-delete {
|
|
@@ -1265,7 +1264,6 @@
|
|
|
1265
1264
|
border-color: rgba(var(--color-sf-outline-variant));
|
|
1266
1265
|
}
|
|
1267
1266
|
.e-query-builder .e-rule-container {
|
|
1268
|
-
background: -webkit-gradient(linear, left bottom, left top, from(rgba(var(--color-sf-primary), 0.05)), to(rgba(var(--color-sf-primary), 0.05))), rgba(var(--color-sf-surface));
|
|
1269
1267
|
background: linear-gradient(0deg, rgba(var(--color-sf-primary), 0.05), rgba(var(--color-sf-primary), 0.05)), rgba(var(--color-sf-surface));
|
|
1270
1268
|
border-color: rgba(var(--color-sf-outline-variant));
|
|
1271
1269
|
}
|
|
@@ -671,7 +671,6 @@
|
|
|
671
671
|
padding: 0 !important; /* stylelint-disable-line declaration-no-important */
|
|
672
672
|
}
|
|
673
673
|
.e-query-builder .e-dragclone.e-cloneproperties .e-group-container, .e-query-builder .e-dragclone.e-cloneproperties .e-rule-container {
|
|
674
|
-
background: -webkit-gradient(linear, left bottom, left top, from(rgba(var(--color-sf-primary), 0.05)), to(rgba(var(--color-sf-primary), 0.05))), rgba(var(--color-sf-surface));
|
|
675
674
|
background: linear-gradient(0deg, rgba(var(--color-sf-primary), 0.05), rgba(var(--color-sf-primary), 0.05)), rgba(var(--color-sf-surface));
|
|
676
675
|
}
|
|
677
676
|
.e-query-builder .e-dragclone.e-cloneproperties .e-rule-value-delete {
|
|
@@ -1271,7 +1270,6 @@
|
|
|
1271
1270
|
border-color: rgba(var(--color-sf-outline-variant));
|
|
1272
1271
|
}
|
|
1273
1272
|
.e-query-builder .e-rule-container {
|
|
1274
|
-
background: -webkit-gradient(linear, left bottom, left top, from(rgba(var(--color-sf-primary), 0.05)), to(rgba(var(--color-sf-primary), 0.05))), rgba(var(--color-sf-surface));
|
|
1275
1273
|
background: linear-gradient(0deg, rgba(var(--color-sf-primary), 0.05), rgba(var(--color-sf-primary), 0.05)), rgba(var(--color-sf-surface));
|
|
1276
1274
|
border-color: rgba(var(--color-sf-outline-variant));
|
|
1277
1275
|
}
|