From 174757a95ff420425d5477a3e7a0293628f55705 Mon Sep 17 00:00:00 2001 From: Wilson Zeng Date: Tue, 2 Jan 2018 20:22:46 +0800 Subject: [PATCH] Revert "fix(module:calendar): fix month/year view switched" (#843) * Revert "release(0.6.9): release 0.6.9 (#841)" This reverts commit f514cf39afa1ec9056bd7c76e03970327a16e0b4. * Revert "fix(module:transfer): 1.fix the "checkAll" status not updated 2.change "ArrayObservable.of" to "of" (#834)" This reverts commit 9c023fa8ce37b6ec3bb901fc76ee07a6931f03f9. * Revert "docs(showcase): optimization docs (#733)" This reverts commit 29318dbccfc478708499088bf12b0389c92c4f42. * Revert "fix(module:calendar): fix month/year view switched (#768)" This reverts commit 383a0f4b9fd86b9fad02dc3f5922beef48b8410b. --- src/components/calendar/nz-calendar.component.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/calendar/nz-calendar.component.ts b/src/components/calendar/nz-calendar.component.ts index 80f8343e41c..1a3cf46b35e 100644 --- a/src/components/calendar/nz-calendar.component.ts +++ b/src/components/calendar/nz-calendar.component.ts @@ -67,7 +67,7 @@ export interface WeekInterface { - @@ -97,7 +97,7 @@ export interface WeekInterface { [class.ant-fullcalendar-table]="!nzDatePicker" [class.ant-calendar-table]="nzDatePicker" [class.ant-patch-full-height]="nzDatePicker" - *ngIf="nzMode == 'month'"> + *ngIf="nzMode == 'year'"> + *ngIf="nzMode == 'month'"> @@ -225,7 +225,7 @@ export class NzCalendarComponent implements OnInit { @Output() nzClickDay: EventEmitter = new EventEmitter(); @Output() nzClickMonth: EventEmitter = new EventEmitter(); @Input() nzClearTime = true; - @Input() nzMode = 'month'; + @Input() nzMode = 'year'; @Input() set nzFullScreen(value: boolean) {