@acorex/components 6.5.54 → 6.5.55
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/esm2020/lib/query-builder/query-builder-rule.component.mjs +2 -4
- package/esm2020/lib/query-builder/query-builder.service.mjs +3 -3
- package/fesm2015/acorex-components.mjs +3 -5
- package/fesm2015/acorex-components.mjs.map +1 -1
- package/fesm2020/acorex-components.mjs +3 -5
- package/fesm2020/acorex-components.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -8772,7 +8772,7 @@ class AXQueryBuilderRuleComponent {
|
|
|
8772
8772
|
}
|
|
8773
8773
|
]);
|
|
8774
8774
|
}
|
|
8775
|
-
if (this.rule.dataType === 'datetime') {
|
|
8775
|
+
if (this.rule.dataType === 'datetime' || this.rule.dataType === 'date') {
|
|
8776
8776
|
resolve([
|
|
8777
8777
|
{
|
|
8778
8778
|
value: 'equal',
|
|
@@ -8825,8 +8825,6 @@ class AXQueryBuilderRuleComponent {
|
|
|
8825
8825
|
});
|
|
8826
8826
|
}
|
|
8827
8827
|
ngAfterViewInit() {
|
|
8828
|
-
//Called after ngAfterContentInit when the component's view has been initialized. Applies to components only.
|
|
8829
|
-
//Add 'implements AfterViewInit' to the class.
|
|
8830
8828
|
if (this.rule.onDemandLabel) {
|
|
8831
8829
|
this.isOnDemandLabel = true;
|
|
8832
8830
|
}
|
|
@@ -9266,10 +9264,10 @@ class AXQueryBuilderService {
|
|
|
9266
9264
|
codeOperator = item.operator;
|
|
9267
9265
|
break;
|
|
9268
9266
|
}
|
|
9269
|
-
if (item.dataType == 'datetime' && item.text && item.text != '' && item.text != null) {
|
|
9267
|
+
if (item.dataType == 'datetime' && item.text && item.text != '' && item.text != null || item.dataType == 'date' && item.text && item.text != '' && item.text != null) {
|
|
9270
9268
|
query = query + ' ' + item.caption + ' ' + codeOperator + ' (' + AXDateTime.convert(item.text, 'jalali') + ')';
|
|
9271
9269
|
}
|
|
9272
|
-
else if (item.dataType != 'datetime') {
|
|
9270
|
+
else if (item.dataType != 'datetime' || item.dataType != 'date') {
|
|
9273
9271
|
query = query + ' ' + item.caption + ' ' + codeOperator + ' ' + item.text;
|
|
9274
9272
|
}
|
|
9275
9273
|
}
|