refactor(module:calendar): remove used listener and improve perf (#1115)

NG-ZORRO · Mar 11, 2018 · 4f9e550 · 4f9e550
1 parent ca79b0e
commit 4f9e550
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/components/calendar/nz-calendar-header.component.html b/components/calendar/nz-calendar-header.component.html
@@ -1,10 +1,10 @@
 <nz-select class="ant-fullcalendar--year-select" [nzSize]="size"
-           [(ngModel)]="activeYear" (ngModelChange)="yearChange.emit($event)">
+           [ngModel]="activeYear" (ngModelChange)="yearChange.emit($event)">
   <nz-option *ngFor="let year of years" [nzLabel]="year.label" [nzValue]="year.value"></nz-option>
 </nz-select>
 
 <nz-select *ngIf="mode === 'month'" class="ant-fullcalendar--year-select" [nzSize]="size" 
-           [(ngModel)]="activeMonth" (ngModelChange)="monthChange.emit($event)">
+           [ngModel]="activeMonth" (ngModelChange)="monthChange.emit($event)">
   <nz-option *ngFor="let month of months" [nzLabel]="month.label" [nzValue]="month.value"></nz-option>
 </nz-select>
 

diff --git a/components/calendar/nz-calendar.component.ts b/components/calendar/nz-calendar.component.ts
@@ -138,11 +138,15 @@ export class NzCalendarComponent implements ControlValueAccessor, OnInit {
   }
 
   private updateDate(date: Date, touched: boolean = true): void {
+    const dayChanged = !isSameDay(date, this.activeDate);
     const monthChanged = !isSameMonth(date, this.activeDate);
     const yearChanged = !isSameYear(date, this.activeDate);
 
     this.activeDate = date;
 
+    if (dayChanged) {
+      this.calculateActiveDate();
+    }
     if (monthChanged) {
       this.setUpDateMatrix();
       this.calculateCurrentDate();
@@ -152,8 +156,6 @@ export class NzCalendarComponent implements ControlValueAccessor, OnInit {
       this.calculateCurrentMonth();
     }
 
-    this.calculateActiveDate();
-
     if (touched) {
       this.onChangeFn(date);
       this.onTouchFn();