Skip to content

Commit 8e1196b

Browse files
committed
refactor(qb): editorOptions.defaultDateTimeFormat setting
1 parent 26708b2 commit 8e1196b

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

projects/igniteui-angular/src/lib/query-builder/query-builder.component.html

+1
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,7 @@ <h6 class="igx-filter-empty__title">
323323
[locale]="this.locale"
324324
[outlet]="pickerOutlet"
325325
[formatter]="selectedField.formatter"
326+
[displayFormat]="selectedField.pipeArgs.format"
326327
[inputFormat]="selectedField.editorOptions?.dateTimeFormat"
327328
>
328329
<!-- disable default icons -->

projects/igniteui-angular/src/lib/query-builder/query-builder.component.ts

+9-5
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import { IgxPrefixDirective } from '../directives/prefix/prefix.directive';
3737
import { IgxIconComponent } from '../icon/icon.component';
3838
import { getCurrentResourceStrings } from '../core/i18n/resources';
3939
import { IgxIconButtonDirective } from '../directives/button/icon-button.directive';
40+
import { DateTimeUtil } from '../date-common/util/date-time.util';
4041

4142
const DEFAULT_PIPE_DATE_FORMAT = 'mediumDate';
4243
const DEFAULT_PIPE_TIME_FORMAT = 'mediumTime';
@@ -911,12 +912,15 @@ export class IgxQueryBuilderComponent implements AfterViewInit, OnDestroy {
911912
DEFAULT_PIPE_DATE_TIME_FORMAT : DEFAULT_PIPE_DATE_FORMAT;
912913
}
913914

914-
if (!field.defaultDateTimeFormat) {
915-
field.defaultDateTimeFormat = DEFAULT_DATE_TIME_FORMAT;
916-
}
915+
this.setDateTimeEditorFormat(field, field.pipeArgs.format);
916+
}
917917

918-
if (!field.defaultTimeFormat) {
919-
field.defaultTimeFormat = DEFAULT_TIME_FORMAT;
918+
private setDateTimeEditorFormat(field: FieldType, format: string) {
919+
if (!DateTimeUtil.isDateTimeDataType(field.dataType)) {
920+
return;
921+
}
922+
if (!field.editorOptions?.dateTimeFormat) {
923+
field.editorOptions.dateTimeFormat = format;
920924
}
921925
}
922926

0 commit comments

Comments
 (0)