@syncfusion/ej2-querybuilder 24.1.43 → 24.1.45
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 +16 -0
- package/README.md +1 -1
- 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 +22 -15
- package/dist/es6/ej2-querybuilder.es2015.js.map +1 -1
- package/dist/es6/ej2-querybuilder.es5.js +22 -15
- 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 +10 -10
- package/src/query-builder/query-builder-model.d.ts +1 -1
- package/src/query-builder/query-builder.d.ts +2 -1
- package/src/query-builder/query-builder.js +22 -15
- package/styles/bootstrap-dark.css +4 -0
- package/styles/bootstrap.css +4 -0
- package/styles/bootstrap4.css +4 -0
- package/styles/bootstrap5-dark.css +4 -0
- package/styles/bootstrap5.css +4 -0
- package/styles/fabric-dark.css +4 -0
- package/styles/fabric.css +4 -0
- package/styles/fluent-dark.css +4 -0
- package/styles/fluent.css +4 -0
- package/styles/highcontrast-light.css +4 -0
- package/styles/highcontrast.css +4 -0
- package/styles/material-dark.css +4 -0
- package/styles/material.css +4 -0
- package/styles/material3-dark.css +4 -0
- package/styles/material3.css +4 -0
- package/styles/query-builder/_layout.scss +4 -0
- package/styles/query-builder/bootstrap-dark.css +4 -0
- package/styles/query-builder/bootstrap.css +4 -0
- package/styles/query-builder/bootstrap4.css +4 -0
- package/styles/query-builder/bootstrap5-dark.css +4 -0
- package/styles/query-builder/bootstrap5.css +4 -0
- package/styles/query-builder/fabric-dark.css +4 -0
- package/styles/query-builder/fabric.css +4 -0
- package/styles/query-builder/fluent-dark.css +4 -0
- package/styles/query-builder/fluent.css +4 -0
- package/styles/query-builder/highcontrast-light.css +4 -0
- package/styles/query-builder/highcontrast.css +4 -0
- package/styles/query-builder/material-dark.css +4 -0
- package/styles/query-builder/material.css +4 -0
- package/styles/query-builder/material3-dark.css +4 -0
- package/styles/query-builder/material3.css +4 -0
- package/styles/query-builder/tailwind-dark.css +4 -0
- package/styles/query-builder/tailwind.css +4 -0
- package/styles/tailwind-dark.css +4 -0
- package/styles/tailwind.css +4 -0
package/dist/global/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/*!
|
|
2
2
|
* filename: index.d.ts
|
|
3
|
-
* version : 24.1.
|
|
3
|
+
* version : 24.1.45
|
|
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@24.1.
|
|
3
|
+
"_id": "@syncfusion/ej2-querybuilder@24.1.44",
|
|
4
4
|
"_inBundle": false,
|
|
5
|
-
"_integrity": "sha512-
|
|
5
|
+
"_integrity": "sha512-mxg3kzXzN/gcizpQIv/cvNlTdh/u16qtP8hK1XmbV2l13+88WVgGSCrfN0vgKrRMPmV4knB316eUPtk8F11b0A==",
|
|
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.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-querybuilder/-/ej2-querybuilder-24.1.
|
|
27
|
-
"_shasum": "
|
|
26
|
+
"_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-querybuilder/-/ej2-querybuilder-24.1.44.tgz",
|
|
27
|
+
"_shasum": "547c97a9748ee4d205257a236a85b084ca9bf0c0",
|
|
28
28
|
"_spec": "@syncfusion/ej2-querybuilder@*",
|
|
29
29
|
"_where": "/jenkins/workspace/elease-automation_release_24.1.1/packages/included",
|
|
30
30
|
"author": {
|
|
@@ -33,11 +33,11 @@
|
|
|
33
33
|
"bundleDependencies": false,
|
|
34
34
|
"dependencies": {
|
|
35
35
|
"@syncfusion/ej2-base": "~24.1.42",
|
|
36
|
-
"@syncfusion/ej2-buttons": "~24.1.
|
|
37
|
-
"@syncfusion/ej2-calendars": "~24.1.
|
|
38
|
-
"@syncfusion/ej2-dropdowns": "~24.1.
|
|
39
|
-
"@syncfusion/ej2-inputs": "~24.1.
|
|
40
|
-
"@syncfusion/ej2-splitbuttons": "~24.1.
|
|
36
|
+
"@syncfusion/ej2-buttons": "~24.1.45",
|
|
37
|
+
"@syncfusion/ej2-calendars": "~24.1.44",
|
|
38
|
+
"@syncfusion/ej2-dropdowns": "~24.1.45",
|
|
39
|
+
"@syncfusion/ej2-inputs": "~24.1.45",
|
|
40
|
+
"@syncfusion/ej2-splitbuttons": "~24.1.45"
|
|
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": "24.1.
|
|
69
|
+
"version": "24.1.45",
|
|
70
70
|
"sideEffects": false,
|
|
71
71
|
"homepage": "https://www.syncfusion.com/javascript-ui-controls"
|
|
72
72
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Component, INotifyPropertyChanged, NotifyPropertyChanges, getComponent, MouseEventArgs, Browser, compile, append } from '@syncfusion/ej2-base';import { Property, ChildProperty, Complex, L10n, closest, extend, isNullOrUndefined, Collection, cldrData } from '@syncfusion/ej2-base';import { getInstance, addClass, removeClass, rippleEffect, detach, classList } from '@syncfusion/ej2-base';import { Internationalization, DateFormatOptions, KeyboardEventArgs, getUniqueID, select } from '@syncfusion/ej2-base';import { Button, CheckBox, RadioButton, ChangeEventArgs as ButtonChangeEventArgs, RadioButtonModel } from '@syncfusion/ej2-buttons';import { DropDownList, ChangeEventArgs as DropDownChangeEventArgs, FieldSettingsModel, CheckBoxSelection, DropDownTreeModel, DropDownTree
|
|
1
|
+
import { Component, INotifyPropertyChanged, NotifyPropertyChanges, getComponent, MouseEventArgs, Browser, compile, append } from '@syncfusion/ej2-base';import { Property, ChildProperty, Complex, L10n, closest, extend, isNullOrUndefined, Collection, cldrData } from '@syncfusion/ej2-base';import { getInstance, addClass, removeClass, rippleEffect, detach, classList } from '@syncfusion/ej2-base';import { Internationalization, DateFormatOptions, KeyboardEventArgs, getUniqueID, select } from '@syncfusion/ej2-base';import { Button, CheckBox, RadioButton, ChangeEventArgs as ButtonChangeEventArgs, RadioButtonModel } from '@syncfusion/ej2-buttons';import { DropDownList, ChangeEventArgs as DropDownChangeEventArgs, FieldSettingsModel, CheckBoxSelection, DropDownTreeModel, DropDownTree } from '@syncfusion/ej2-dropdowns';import { MultiSelect, MultiSelectChangeEventArgs, PopupEventArgs, MultiSelectModel, DropDownListModel } from '@syncfusion/ej2-dropdowns';import { EmitType, Event, EventHandler, getValue, Animation, BaseEventArgs } from '@syncfusion/ej2-base';import { Query, Predicate, DataManager, Deferred } from '@syncfusion/ej2-data';import { TextBox, NumericTextBox, InputEventArgs, ChangeEventArgs as InputChangeEventArgs } from '@syncfusion/ej2-inputs';import { TextBoxModel, NumericTextBoxModel } from '@syncfusion/ej2-inputs';import { DatePicker, ChangeEventArgs as CalendarChangeEventArgs, DatePickerModel } from '@syncfusion/ej2-calendars';import { DropDownButton, ItemModel, MenuEventArgs } from '@syncfusion/ej2-splitbuttons';import { Tooltip, createSpinner, showSpinner, hideSpinner } from '@syncfusion/ej2-popups';import { compile as templateCompiler } from '@syncfusion/ej2-base';
|
|
2
2
|
import {TemplateColumn,Validation,FormatObject,ActionEventArgs,ChangeEventArgs,RuleChangeEventArgs,FieldMode,DisplayMode,SortDirection} from "./query-builder";
|
|
3
3
|
import {ComponentModel} from '@syncfusion/ej2-base';
|
|
4
4
|
|
|
@@ -302,6 +302,7 @@ export declare class QueryBuilder extends Component<HTMLDivElement> implements I
|
|
|
302
302
|
private isDestroy;
|
|
303
303
|
private isGetNestedData;
|
|
304
304
|
private isCustomOprCols;
|
|
305
|
+
private dummyDropdownTreeDs;
|
|
305
306
|
/**
|
|
306
307
|
* Triggers when the component is created.
|
|
307
308
|
*
|
|
@@ -511,6 +512,7 @@ export declare class QueryBuilder extends Component<HTMLDivElement> implements I
|
|
|
511
512
|
private appendRuleElem;
|
|
512
513
|
private addRuleElement;
|
|
513
514
|
private addRuleSuccessCallBack;
|
|
515
|
+
private updateDropdowntreeDS;
|
|
514
516
|
private updateAddedRule;
|
|
515
517
|
private changeRuleTemplate;
|
|
516
518
|
private renderToolTip;
|
|
@@ -541,7 +543,6 @@ export declare class QueryBuilder extends Component<HTMLDivElement> implements I
|
|
|
541
543
|
private filterValue;
|
|
542
544
|
private changeValueSuccessCallBack;
|
|
543
545
|
private fieldClose;
|
|
544
|
-
private onSelectField;
|
|
545
546
|
private changeField;
|
|
546
547
|
private changeRule;
|
|
547
548
|
private changeFilter;
|
|
@@ -291,7 +291,8 @@ var QueryBuilder = /** @class */ (function (_super) {
|
|
|
291
291
|
if (categories.indexOf(columns[i].category) < 0) {
|
|
292
292
|
categories.push(columns[i].category);
|
|
293
293
|
}
|
|
294
|
-
if (!columns[i].operators ||
|
|
294
|
+
if (!columns[i].operators ||
|
|
295
|
+
(this.isLocale && this.isCustomOprCols.indexOf(columns[i].field) !== 0)) {
|
|
295
296
|
columns[i].operators = this.customOperators[columns[i].type + 'Operator'];
|
|
296
297
|
}
|
|
297
298
|
}
|
|
@@ -727,13 +728,16 @@ var QueryBuilder = /** @class */ (function (_super) {
|
|
|
727
728
|
else {
|
|
728
729
|
var ddlField = void 0;
|
|
729
730
|
var ddlValue = this.isImportRules ? rule.field : rule.field;
|
|
731
|
+
this.dummyDropdownTreeDs = extend([], this.columns, [], true);
|
|
732
|
+
this.updateDropdowntreeDS(this.dummyDropdownTreeDs);
|
|
730
733
|
ddlField = {
|
|
731
|
-
fields: { dataSource: this.
|
|
732
|
-
value: 'field', text: 'label', child: 'columns', expanded: 'expanded' },
|
|
734
|
+
fields: { dataSource: this.dummyDropdownTreeDs,
|
|
735
|
+
value: 'field', text: 'label', child: 'columns', expanded: 'expanded', selectable: 'selectable' },
|
|
733
736
|
placeholder: this.l10n.getConstant('SelectField'), showClearButton: false,
|
|
734
737
|
popupHeight: ((this.columns.length > 5) ? height : 'auto'), changeOnBlur: false,
|
|
735
738
|
change: this.changeField.bind(this), value: !isNullOrUndefined(ddlValue) ? [ddlValue] : null,
|
|
736
|
-
open: this.popupOpen.bind(this, false), treeSettings: { expandOn: 'Click' },
|
|
739
|
+
open: this.popupOpen.bind(this, false), treeSettings: { expandOn: 'Click' },
|
|
740
|
+
cssClass: 'e-qb-ddt'
|
|
737
741
|
};
|
|
738
742
|
if (this.fieldModel) {
|
|
739
743
|
ddlField = __assign({}, ddlField, this.fieldModel);
|
|
@@ -761,6 +765,14 @@ var QueryBuilder = /** @class */ (function (_super) {
|
|
|
761
765
|
}
|
|
762
766
|
}
|
|
763
767
|
};
|
|
768
|
+
QueryBuilder.prototype.updateDropdowntreeDS = function (columns) {
|
|
769
|
+
for (var i = 0; i < columns.length; i++) {
|
|
770
|
+
if (columns[parseInt(i.toString(), 10)].type === 'object') {
|
|
771
|
+
columns[parseInt(i.toString(), 10)].selectable = false;
|
|
772
|
+
this.updateDropdowntreeDS(columns[parseInt(i.toString(), 10)].columns);
|
|
773
|
+
}
|
|
774
|
+
}
|
|
775
|
+
};
|
|
764
776
|
QueryBuilder.prototype.updateAddedRule = function (target, rule, newRule, isRuleTemplate, pId) {
|
|
765
777
|
var ruleElem;
|
|
766
778
|
var index = 0;
|
|
@@ -820,7 +832,7 @@ var QueryBuilder = /** @class */ (function (_super) {
|
|
|
820
832
|
};
|
|
821
833
|
QueryBuilder.prototype.renderToolTip = function (element) {
|
|
822
834
|
var tooltip = new Tooltip({ content: this.l10n.getConstant('ValidationMessage'),
|
|
823
|
-
position: 'BottomCenter', cssClass: 'e-querybuilder-error', afterClose: function (
|
|
835
|
+
position: 'BottomCenter', cssClass: 'e-querybuilder-error', afterClose: function () {
|
|
824
836
|
tooltip.destroy();
|
|
825
837
|
} });
|
|
826
838
|
tooltip.appendTo(element);
|
|
@@ -1147,7 +1159,8 @@ var QueryBuilder = /** @class */ (function (_super) {
|
|
|
1147
1159
|
var groupHdr = groupElem.querySelector('.e-group-header');
|
|
1148
1160
|
if (this.headerTemplate) {
|
|
1149
1161
|
args = { requestType: 'header-template-initialize', ruleID: groupElem.id,
|
|
1150
|
-
notCondition: this.enableNotCondition ? not : undefined,
|
|
1162
|
+
notCondition: this.enableNotCondition ? not : undefined,
|
|
1163
|
+
condition: condition, rule: this.getRuleCollection(rule, true), groupID: groupID };
|
|
1151
1164
|
this.trigger('actionBegin', args);
|
|
1152
1165
|
this.headerFn = this.templateParser(this.headerTemplate);
|
|
1153
1166
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -1422,12 +1435,6 @@ var QueryBuilder = /** @class */ (function (_super) {
|
|
|
1422
1435
|
}
|
|
1423
1436
|
this.isFieldChange = false;
|
|
1424
1437
|
};
|
|
1425
|
-
QueryBuilder.prototype.onSelectField = function (args) {
|
|
1426
|
-
if (args.itemData.hasChildren) {
|
|
1427
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
1428
|
-
this.showPopup();
|
|
1429
|
-
}
|
|
1430
|
-
};
|
|
1431
1438
|
QueryBuilder.prototype.changeField = function (args) {
|
|
1432
1439
|
if (args.isInteracted) {
|
|
1433
1440
|
if (isNullOrUndefined(args.value)) {
|
|
@@ -2600,7 +2607,7 @@ var QueryBuilder = /** @class */ (function (_super) {
|
|
|
2600
2607
|
var valElemColl = this.columnTemplateFn(args, this, ruleID, templateID);
|
|
2601
2608
|
valElem = (valElemColl[0].nodeType === 3) ? valElemColl[1] : valElemColl[0];
|
|
2602
2609
|
target.nextElementSibling.appendChild(valElem);
|
|
2603
|
-
}
|
|
2610
|
+
} // eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
2604
2611
|
else if (this.isVue3) {
|
|
2605
2612
|
valElem = this.columnTemplateFn(args, this, 'Template', templateID);
|
|
2606
2613
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -3299,7 +3306,7 @@ var QueryBuilder = /** @class */ (function (_super) {
|
|
|
3299
3306
|
this.element.style.height = this.height;
|
|
3300
3307
|
break;
|
|
3301
3308
|
case 'rule':
|
|
3302
|
-
if (this.rule.rules.length
|
|
3309
|
+
if (this.rule.rules.length === 0 && !isNullOrUndefined(this.rule)) {
|
|
3303
3310
|
this.reset();
|
|
3304
3311
|
}
|
|
3305
3312
|
this.setProperties({ rule: newProp.rule }, true);
|
|
@@ -4414,7 +4421,7 @@ var QueryBuilder = /** @class */ (function (_super) {
|
|
|
4414
4421
|
dropDownObj.readonly = this.isReadonly;
|
|
4415
4422
|
}
|
|
4416
4423
|
else if (elem[i].classList.contains('e-dropdowntree')) {
|
|
4417
|
-
var dropDownTreeObj =
|
|
4424
|
+
var dropDownTreeObj = getComponent(elem[i], 'dropdowntree');
|
|
4418
4425
|
dropDownTreeObj.readonly = this.isReadonly;
|
|
4419
4426
|
}
|
|
4420
4427
|
else if (elem[i].classList.contains('e-numerictextbox')) {
|
package/styles/bootstrap.css
CHANGED
package/styles/bootstrap4.css
CHANGED
package/styles/bootstrap5.css
CHANGED
package/styles/fabric-dark.css
CHANGED
package/styles/fabric.css
CHANGED
package/styles/fluent-dark.css
CHANGED
package/styles/fluent.css
CHANGED
package/styles/highcontrast.css
CHANGED
package/styles/material-dark.css
CHANGED
package/styles/material.css
CHANGED
package/styles/material3.css
CHANGED
package/styles/tailwind-dark.css
CHANGED
package/styles/tailwind.css
CHANGED