@syncfusion/ej2-querybuilder 29.1.41 → 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 +11 -11
- package/src/query-builder/query-builder.js +17 -4
|
@@ -1674,14 +1674,14 @@ let QueryBuilder = class QueryBuilder extends Component {
|
|
|
1674
1674
|
else {
|
|
1675
1675
|
prevRule = this.getGroup(prevElem);
|
|
1676
1676
|
}
|
|
1677
|
-
if (isNullOrUndefined(prevRule.condition)) {
|
|
1677
|
+
if (!isNullOrUndefined(prevRule) && isNullOrUndefined(prevRule.condition)) {
|
|
1678
1678
|
prevRule.condition = 'and';
|
|
1679
1679
|
}
|
|
1680
1680
|
const orElem = elem.previousElementSibling.querySelector('.e-btngroup-or');
|
|
1681
1681
|
const andElem = elem.previousElementSibling.querySelector('.e-btngroup-and');
|
|
1682
1682
|
orElem.disabled = false;
|
|
1683
1683
|
andElem.disabled = false;
|
|
1684
|
-
if (prevRule.condition === 'or') {
|
|
1684
|
+
if (!isNullOrUndefined(prevRule) && prevRule.condition === 'or') {
|
|
1685
1685
|
orElem.checked = true;
|
|
1686
1686
|
}
|
|
1687
1687
|
else {
|
|
@@ -5809,6 +5809,13 @@ let QueryBuilder = class QueryBuilder extends Component {
|
|
|
5809
5809
|
parentElem = this.renderGroup(ruleColl[i], ruleColl[i].condition, parentElem, ruleColl[i].not);
|
|
5810
5810
|
parentElem = this.importRules(ruleColl[i], parentElem, true);
|
|
5811
5811
|
}
|
|
5812
|
+
else if (!isNullOrUndefined(ruleColl[i].rules)) {
|
|
5813
|
+
parentElem = this.renderGroup(ruleColl[i], ruleColl[i].condition, parentElem, ruleColl[i].not);
|
|
5814
|
+
const andElem = parentElem.querySelector('.e-btngroup-and');
|
|
5815
|
+
const orElem = parentElem.querySelector('.e-btngroup-or');
|
|
5816
|
+
andElem.disabled = true;
|
|
5817
|
+
orElem.disabled = true;
|
|
5818
|
+
}
|
|
5812
5819
|
else {
|
|
5813
5820
|
this.renderRule(ruleColl[i], parentElem);
|
|
5814
5821
|
}
|
|
@@ -6700,8 +6707,14 @@ let QueryBuilder = class QueryBuilder extends Component {
|
|
|
6700
6707
|
rule.type = this.getTypeFromColumn(rule);
|
|
6701
6708
|
}
|
|
6702
6709
|
else {
|
|
6703
|
-
|
|
6704
|
-
|
|
6710
|
+
if (parser.length === 3 && parser[2][0] === 'String' && (parser[2][1]).indexOf('%') !== -1) {
|
|
6711
|
+
const oper = parser[i + 2][1] ? parser[i + 2][1].replace(/'/g, '') : parser[i + 2][1];
|
|
6712
|
+
rule.operator = this.getOperator(oper, parser[i + 1][1], sqlLocale);
|
|
6713
|
+
}
|
|
6714
|
+
else {
|
|
6715
|
+
const oper = parser[i + 3][1] ? parser[i + 3][1].replace(/'/g, '') : parser[i + 3][1];
|
|
6716
|
+
rule.operator = this.getOperator(oper, parser[i + 1][1], sqlLocale);
|
|
6717
|
+
}
|
|
6705
6718
|
}
|
|
6706
6719
|
operator = parser[i + 1][1];
|
|
6707
6720
|
i++;
|