@syncfusion/ej2-querybuilder 29.2.4 → 29.2.5
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 +17 -4
- package/dist/es6/ej2-querybuilder.es2015.js.map +1 -1
- package/dist/es6/ej2-querybuilder.es5.js +17 -4
- 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 +17 -4
|
@@ -1730,14 +1730,14 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
|
|
|
1730
1730
|
else {
|
|
1731
1731
|
prevRule = this.getGroup(prevElem);
|
|
1732
1732
|
}
|
|
1733
|
-
if (isNullOrUndefined(prevRule.condition)) {
|
|
1733
|
+
if (!isNullOrUndefined(prevRule) && isNullOrUndefined(prevRule.condition)) {
|
|
1734
1734
|
prevRule.condition = 'and';
|
|
1735
1735
|
}
|
|
1736
1736
|
var orElem = elem.previousElementSibling.querySelector('.e-btngroup-or');
|
|
1737
1737
|
var andElem = elem.previousElementSibling.querySelector('.e-btngroup-and');
|
|
1738
1738
|
orElem.disabled = false;
|
|
1739
1739
|
andElem.disabled = false;
|
|
1740
|
-
if (prevRule.condition === 'or') {
|
|
1740
|
+
if (!isNullOrUndefined(prevRule) && prevRule.condition === 'or') {
|
|
1741
1741
|
orElem.checked = true;
|
|
1742
1742
|
}
|
|
1743
1743
|
else {
|
|
@@ -5880,6 +5880,13 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
|
|
|
5880
5880
|
parentElem = this.renderGroup(ruleColl[i], ruleColl[i].condition, parentElem, ruleColl[i].not);
|
|
5881
5881
|
parentElem = this.importRules(ruleColl[i], parentElem, true);
|
|
5882
5882
|
}
|
|
5883
|
+
else if (!isNullOrUndefined(ruleColl[i].rules)) {
|
|
5884
|
+
parentElem = this.renderGroup(ruleColl[i], ruleColl[i].condition, parentElem, ruleColl[i].not);
|
|
5885
|
+
var andElem = parentElem.querySelector('.e-btngroup-and');
|
|
5886
|
+
var orElem = parentElem.querySelector('.e-btngroup-or');
|
|
5887
|
+
andElem.disabled = true;
|
|
5888
|
+
orElem.disabled = true;
|
|
5889
|
+
}
|
|
5883
5890
|
else {
|
|
5884
5891
|
this.renderRule(ruleColl[i], parentElem);
|
|
5885
5892
|
}
|
|
@@ -6772,8 +6779,14 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
|
|
|
6772
6779
|
rule.type = this.getTypeFromColumn(rule);
|
|
6773
6780
|
}
|
|
6774
6781
|
else {
|
|
6775
|
-
|
|
6776
|
-
|
|
6782
|
+
if (parser.length === 3 && parser[2][0] === 'String' && (parser[2][1]).indexOf('%') !== -1) {
|
|
6783
|
+
var oper = parser[i + 2][1] ? parser[i + 2][1].replace(/'/g, '') : parser[i + 2][1];
|
|
6784
|
+
rule.operator = this.getOperator(oper, parser[i + 1][1], sqlLocale);
|
|
6785
|
+
}
|
|
6786
|
+
else {
|
|
6787
|
+
var oper = parser[i + 3][1] ? parser[i + 3][1].replace(/'/g, '') : parser[i + 3][1];
|
|
6788
|
+
rule.operator = this.getOperator(oper, parser[i + 1][1], sqlLocale);
|
|
6789
|
+
}
|
|
6777
6790
|
}
|
|
6778
6791
|
operator = parser[i + 1][1];
|
|
6779
6792
|
i++;
|