@syncfusion/ej2-querybuilder 19.4.38 → 19.4.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/CHANGELOG.md +0 -2
- package/dist/ej2-querybuilder.umd.min.js +11 -2
- package/dist/ej2-querybuilder.umd.min.js.map +1 -1
- package/dist/es6/ej2-querybuilder.es2015.js +12 -68
- package/dist/es6/ej2-querybuilder.es2015.js.map +1 -1
- package/dist/es6/ej2-querybuilder.es5.js +12 -68
- package/dist/es6/ej2-querybuilder.es5.js.map +1 -1
- package/dist/global/ej2-querybuilder.min.js +11 -2
- package/dist/global/ej2-querybuilder.min.js.map +1 -1
- package/dist/global/index.d.ts +10 -1
- package/package.json +13 -9
- package/src/query-builder/query-builder.d.ts +0 -6
- package/src/query-builder/query-builder.js +12 -68
- package/styles/bootstrap4.css +0 -5
- package/styles/bootstrap5-dark.css +0 -5
- package/styles/bootstrap5.css +0 -5
- package/styles/query-builder/bootstrap4.css +0 -5
- package/styles/query-builder/bootstrap5-dark.css +0 -5
- package/styles/query-builder/bootstrap5.css +0 -5
- package/.github/PULL_REQUEST_TEMPLATE/Bug.md +0 -63
- package/.github/PULL_REQUEST_TEMPLATE/feature.md +0 -39
- package/styles/query-builder/_fluent-definition.scss +0 -107
- package/styles/query-builder/icons/_fluent.scss +0 -8
|
@@ -179,9 +179,6 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
|
|
|
179
179
|
_this.isNotified = false;
|
|
180
180
|
_this.isAddSuccess = false;
|
|
181
181
|
_this.isNotValueChange = false;
|
|
182
|
-
_this.isFieldChange = false;
|
|
183
|
-
_this.isFieldClose = false;
|
|
184
|
-
_this.isDestroy = false;
|
|
185
182
|
MultiSelect.Inject(CheckBoxSelection);
|
|
186
183
|
return _this;
|
|
187
184
|
}
|
|
@@ -661,8 +658,8 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
|
|
|
661
658
|
ddlField = {
|
|
662
659
|
dataSource: this.columns,
|
|
663
660
|
fields: this.fields, placeholder: this.l10n.getConstant('SelectField'),
|
|
664
|
-
popupHeight: ((this.columns.length > 5) ? height : 'auto'),
|
|
665
|
-
change: this.changeField.bind(this), value: rule ? ddlValue : null, open: this.popupOpen.bind(this
|
|
661
|
+
popupHeight: ((this.columns.length > 5) ? height : 'auto'),
|
|
662
|
+
change: this.changeField.bind(this), value: rule ? ddlValue : null, open: this.popupOpen.bind(this)
|
|
666
663
|
};
|
|
667
664
|
if (this.fieldModel) {
|
|
668
665
|
ddlField = __assign({}, ddlField, this.fieldModel);
|
|
@@ -684,11 +681,11 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
|
|
|
684
681
|
var ddlValue = this.isImportRules ? rule.field : rule.field;
|
|
685
682
|
ddlField = {
|
|
686
683
|
fields: { dataSource: this.columns,
|
|
687
|
-
value:
|
|
684
|
+
value: "field", text: "label", child: 'columns', expanded: "expanded" },
|
|
688
685
|
placeholder: this.l10n.getConstant('SelectField'), showClearButton: false,
|
|
689
686
|
popupHeight: ((this.columns.length > 5) ? height : 'auto'), changeOnBlur: false,
|
|
690
687
|
change: this.changeField.bind(this), value: this.isImportRules ? [ddlValue] : null,
|
|
691
|
-
open: this.popupOpen.bind(this
|
|
688
|
+
open: this.popupOpen.bind(this)
|
|
692
689
|
};
|
|
693
690
|
if (this.fieldModel) {
|
|
694
691
|
ddlField = __assign({}, ddlField, this.fieldModel);
|
|
@@ -1291,38 +1288,21 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
|
|
|
1291
1288
|
}
|
|
1292
1289
|
}
|
|
1293
1290
|
};
|
|
1294
|
-
QueryBuilder.prototype.fieldClose = function (id) {
|
|
1295
|
-
if (this.isFieldChange || this.isDestroy) {
|
|
1296
|
-
return;
|
|
1297
|
-
}
|
|
1298
|
-
this.isFieldClose = true;
|
|
1299
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
1300
|
-
var ddl = getComponent(id, 'dropdownlist');
|
|
1301
|
-
var item = ddl.popupObj.element.querySelector('.e-active');
|
|
1302
|
-
var itemData = ddl.getItemData();
|
|
1303
|
-
ddl.value = itemData.value;
|
|
1304
|
-
var customArgs = { element: ddl.element, value: itemData.value, isInteracted: true,
|
|
1305
|
-
previousItemData: this.prevItemData, previousItem: null, item: item, itemData: itemData, event: null, e: null };
|
|
1306
|
-
this.changeField(customArgs);
|
|
1307
|
-
this.isFieldChange = false;
|
|
1308
|
-
};
|
|
1309
1291
|
QueryBuilder.prototype.changeField = function (args) {
|
|
1310
1292
|
if (args.isInteracted) {
|
|
1311
|
-
this.isFieldChange = true;
|
|
1312
|
-
this.prevItemData = args.itemData;
|
|
1313
1293
|
var fieldElem = closest(args.element, '.e-rule-filter') || closest(args.element, '.e-rule-sub-filter');
|
|
1314
1294
|
var column = this.fieldMode === 'DropdownTree' ? this.getColumn(args.value[0]) : this.getColumn(args.value);
|
|
1315
1295
|
if (this.fieldMode === 'DropdownTree' && fieldElem != null) {
|
|
1316
|
-
var ddtElem = fieldElem.querySelector(
|
|
1296
|
+
var ddtElem = fieldElem.querySelector(".e-control");
|
|
1317
1297
|
var ddt = getComponent(ddtElem, 'dropdowntree');
|
|
1318
1298
|
if (column) {
|
|
1319
|
-
if (column.type
|
|
1299
|
+
if (column.type == 'object') {
|
|
1320
1300
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
1321
1301
|
ddt.value = args.oldValue;
|
|
1322
1302
|
ddt.dataBind();
|
|
1323
1303
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
1324
1304
|
if (isNullOrUndefined(args.oldValue)) {
|
|
1325
|
-
ddtElem.value =
|
|
1305
|
+
ddtElem.value = "";
|
|
1326
1306
|
}
|
|
1327
1307
|
else {
|
|
1328
1308
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -1488,7 +1468,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
|
|
|
1488
1468
|
popupHeight: ((subFieldData.length > 5) ? height : 'auto'),
|
|
1489
1469
|
change: this.changeField.bind(this),
|
|
1490
1470
|
index: 0,
|
|
1491
|
-
open: this.popupOpen.bind(this
|
|
1471
|
+
open: this.popupOpen.bind(this)
|
|
1492
1472
|
});
|
|
1493
1473
|
dropDownList.appendTo('#' + ruleId + '_subfilterkey' + this.subFilterCounter);
|
|
1494
1474
|
if (this.isImportRules) {
|
|
@@ -1609,7 +1589,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
|
|
|
1609
1589
|
change: this.changeField.bind(this),
|
|
1610
1590
|
index: 0,
|
|
1611
1591
|
value: value,
|
|
1612
|
-
open: this.popupOpen.bind(this
|
|
1592
|
+
open: this.popupOpen.bind(this)
|
|
1613
1593
|
};
|
|
1614
1594
|
if (this.operatorModel) {
|
|
1615
1595
|
ddlOperator = __assign({}, ddlOperator, this.operatorModel);
|
|
@@ -1628,13 +1608,10 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
|
|
|
1628
1608
|
this.updateRules(ddlArgs.element, ddlArgs.item);
|
|
1629
1609
|
}
|
|
1630
1610
|
};
|
|
1631
|
-
QueryBuilder.prototype.popupOpen = function (
|
|
1611
|
+
QueryBuilder.prototype.popupOpen = function (args) {
|
|
1632
1612
|
if (this.enableRtl) {
|
|
1633
1613
|
addClass([args.popup.element], 'e-rtl');
|
|
1634
1614
|
}
|
|
1635
|
-
if (isField) {
|
|
1636
|
-
this.isFieldClose = false;
|
|
1637
|
-
}
|
|
1638
1615
|
};
|
|
1639
1616
|
QueryBuilder.prototype.destroyControls = function (target, isRuleTemplate) {
|
|
1640
1617
|
var element = isRuleTemplate ? target : target.nextElementSibling;
|
|
@@ -1827,7 +1804,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
|
|
|
1827
1804
|
change: this.changeValue.bind(this, i),
|
|
1828
1805
|
close: this.closePopup.bind(this, i),
|
|
1829
1806
|
actionBegin: this.multiSelectOpen.bind(this, parentId + '_valuekey' + i),
|
|
1830
|
-
open: this.popupOpen.bind(this
|
|
1807
|
+
open: this.popupOpen.bind(this)
|
|
1831
1808
|
};
|
|
1832
1809
|
if (this.valueModel && this.valueModel.multiSelectModel) {
|
|
1833
1810
|
multiSelectValue = __assign({}, multiSelectValue, this.valueModel.multiSelectModel);
|
|
@@ -2249,9 +2226,6 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
|
|
|
2249
2226
|
return 0;
|
|
2250
2227
|
};
|
|
2251
2228
|
QueryBuilder.prototype.getPreviousItemData = function (prevItemData, column) {
|
|
2252
|
-
if (this.isFieldClose && prevItemData) {
|
|
2253
|
-
prevItemData = this.getColumn(prevItemData.value);
|
|
2254
|
-
}
|
|
2255
2229
|
if (column.template && prevItemData && Object.keys(prevItemData).length < 4) {
|
|
2256
2230
|
prevItemData.template = column.template;
|
|
2257
2231
|
}
|
|
@@ -2744,7 +2718,6 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
|
|
|
2744
2718
|
* @returns {void}
|
|
2745
2719
|
*/
|
|
2746
2720
|
QueryBuilder.prototype.destroy = function () {
|
|
2747
|
-
this.isDestroy = true;
|
|
2748
2721
|
var queryElement = this.element;
|
|
2749
2722
|
if (!queryElement) {
|
|
2750
2723
|
return;
|
|
@@ -2800,7 +2773,6 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
|
|
|
2800
2773
|
this.clearQBTemplate();
|
|
2801
2774
|
}
|
|
2802
2775
|
classList(this.element, [], ['e-rtl', 'e-responsive', 'e-device']);
|
|
2803
|
-
this.isDestroy = false;
|
|
2804
2776
|
};
|
|
2805
2777
|
/**
|
|
2806
2778
|
* Adds single or multiple rules.
|
|
@@ -3586,9 +3558,6 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
|
|
|
3586
3558
|
rule.not = notValue;
|
|
3587
3559
|
}
|
|
3588
3560
|
}
|
|
3589
|
-
else if ((isNullOrUndefined(rule.condition)) && isNullOrUndefined(rule.rules)) {
|
|
3590
|
-
rule = { 'label': '', 'field': '', 'operator': '', 'type': '', 'value': '' };
|
|
3591
|
-
}
|
|
3592
3561
|
else {
|
|
3593
3562
|
if (this.enableNotCondition) {
|
|
3594
3563
|
rule = { 'condition': rule.condition, 'rules': rule.rules, 'not': rule.not };
|
|
@@ -3772,7 +3741,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
|
|
|
3772
3741
|
}
|
|
3773
3742
|
}
|
|
3774
3743
|
}
|
|
3775
|
-
else if (
|
|
3744
|
+
else if (ruleColl[i].operator.length) {
|
|
3776
3745
|
var oper = ruleColl[i].operator.toLowerCase();
|
|
3777
3746
|
var isDateFilter = false;
|
|
3778
3747
|
var dateOperColl = ['equal', 'notequal', 'greaterthan', 'greaterthanorequal', 'lessthan', 'lessthanorequal'];
|
|
@@ -4476,12 +4445,6 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
|
|
|
4476
4445
|
this.parser.push(['Literal', matchValue]);
|
|
4477
4446
|
return matchValue.length + 2;
|
|
4478
4447
|
}
|
|
4479
|
-
// eslint-disable-next-line
|
|
4480
|
-
if (this.checkNumberLiteral(sqlString)) {
|
|
4481
|
-
matchValue = /^[0-9]+(\.[0-9]+)?/.exec(sqlString)[0];
|
|
4482
|
-
this.parser.push(['Literal', matchValue]);
|
|
4483
|
-
return matchValue.length;
|
|
4484
|
-
}
|
|
4485
4448
|
//String
|
|
4486
4449
|
if (/^'((?:[^\\']+?|\\.|'')*)'(?!')/.exec(sqlString)) {
|
|
4487
4450
|
matchValue = /^'((?:[^\\']+?|\\.|'')*)'(?!')/.exec(sqlString)[0];
|
|
@@ -4521,25 +4484,6 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
|
|
|
4521
4484
|
}
|
|
4522
4485
|
return false;
|
|
4523
4486
|
};
|
|
4524
|
-
QueryBuilder.prototype.checkNumberLiteral = function (sqlString) {
|
|
4525
|
-
var lastParser = this.parser[this.parser.length - 1];
|
|
4526
|
-
if (!lastParser) {
|
|
4527
|
-
return true;
|
|
4528
|
-
}
|
|
4529
|
-
else {
|
|
4530
|
-
if (/^[0-9]+(\.[0-9]+)?/.exec(sqlString)) {
|
|
4531
|
-
var secParser = this.parser[this.parser.length - 2];
|
|
4532
|
-
var betweenParser = this.parser[this.parser.length - 3];
|
|
4533
|
-
if (lastParser[0] === 'Left' && (secParser && secParser[0] === 'Conditions')) {
|
|
4534
|
-
return true;
|
|
4535
|
-
}
|
|
4536
|
-
if (lastParser[0] === 'Conditions' && (betweenParser && betweenParser[1].indexOf('between') < 0)) {
|
|
4537
|
-
return true;
|
|
4538
|
-
}
|
|
4539
|
-
}
|
|
4540
|
-
}
|
|
4541
|
-
return false;
|
|
4542
|
-
};
|
|
4543
4487
|
QueryBuilder.prototype.getOperator = function (value, operator) {
|
|
4544
4488
|
var operators = {
|
|
4545
4489
|
'=': 'equal', '!=': 'notequal', '<': 'lessthan', '>': 'greaterthan', '<=': 'lessthanorequal',
|