Skip to content

Commit 1b7ab5a

Browse files
fix(module:date-picker): cell title should reflect nzFormat (#8744)
1 parent 0a73deb commit 1b7ab5a

4 files changed

+7
-1
lines changed

components/date-picker/date-picker.component.ts

+1
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ export type NzPlacement = 'bottomLeft' | 'bottomRight' | 'topLeft' | 'topRight';
212212
[extraFooter]="extraFooter"
213213
[ranges]="nzRanges"
214214
[dir]="dir"
215+
[format]="nzFormat"
215216
(resultOk)="onResultOk()"
216217
/>
217218
</div>

components/date-picker/date-range-popup.component.ts

+2
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ import { getTimeConfig, isAllowedDate, PREFIX_CLASS } from './util';
106106
[dateRender]="dateRender"
107107
[selectedValue]="$any(datePickerService?.value)"
108108
[hoverValue]="$any(hoverValue)"
109+
[format]="format"
109110
(cellHover)="onCellHover($event)"
110111
(selectDate)="changeValueFromSelect($event, !showTime)"
111112
(selectTime)="onSelectTime($event, partType)"
@@ -163,6 +164,7 @@ export class DateRangePopupComponent implements OnInit, OnChanges, OnDestroy {
163164
@Input() panelMode!: NzDateMode | NzDateMode[];
164165
@Input() defaultPickerValue!: CompatibleDate | undefined | null;
165166
@Input() dir: Direction = 'ltr';
167+
@Input() format?: string;
166168

167169
@Output() readonly panelModeChange = new EventEmitter<NzPanelChangeType>();
168170
@Output() readonly calendarChange = new EventEmitter<CompatibleValue>();

components/date-picker/inner-popup.component.ts

+2
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ import { PREFIX_CLASS } from './util';
154154
[selectedValue]="selectedValue"
155155
[hoverValue]="hoverValue"
156156
[canSelectWeek]="panelMode === 'week'"
157+
[format]="format"
157158
(valueChange)="onSelectDate($event)"
158159
(cellHover)="cellHover.emit($event)"
159160
/>
@@ -197,6 +198,7 @@ export class InnerPopupComponent implements OnChanges {
197198
@Input() hoverValue!: CandyDate[]; // Range ONLY
198199
@Input() value!: CandyDate;
199200
@Input() partType!: RangePartType;
201+
@Input() format?: string;
200202

201203
@Output() readonly panelChange = new EventEmitter<NzPanelChangeType>();
202204
// TODO: name is not proper

components/date-picker/lib/date-table.component.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import { transCompatFormat } from './util';
2525
})
2626
export class DateTableComponent extends AbstractTable implements OnChanges, OnInit {
2727
@Input() override locale!: NzCalendarI18nInterface;
28+
@Input() format?: string;
2829

2930
constructor(private i18n: NzI18nService, private dateHelper: DateHelperService) {
3031
super();
@@ -77,7 +78,7 @@ export class DateTableComponent extends AbstractTable implements OnChanges, OnIn
7778

7879
for (let day = 0; day < 7; day++) {
7980
const date = weekStart.addDays(day);
80-
const dateFormat = transCompatFormat(this.i18n.getLocaleData('DatePicker.lang.dateFormat', 'YYYY-MM-DD'));
81+
const dateFormat = transCompatFormat(this.format ?? this.i18n.getLocaleData('DatePicker.lang.dateFormat', 'YYYY-MM-DD'));
8182
const title = this.dateHelper.format(date.nativeDate, dateFormat);
8283
const label = this.dateHelper.format(date.nativeDate, 'dd');
8384
const cell: DateCell = {

0 commit comments

Comments
 (0)