fix(module: calendar): should get extra cell class name from cell not…

… row (#620)
NG-ZORRO · Nov 29, 2019 · 0a11514 · 0a11514
1 parent 89bd218
commit 0a11514
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/components/calendar/calendar.component.spec.ts b/components/calendar/calendar.component.spec.ts
@@ -58,7 +58,7 @@ describe('CalendarComponent', () => {
     component.state.now = new Date(2018, 8, 2);
     const disableDay = component.state.now.getDate() + 5 + '';
     fixture.detectChanges();
-    expect(calendarEle.nativeElement.querySelector('.row .cell .disable').innerText).toContain(
+    expect(calendarEle.nativeElement.querySelector('.row .cell.extra-classname .disable').innerText).toContain(
       disableDay,
       'getDateExtra is right'
     );
@@ -422,10 +422,10 @@ describe('CalendarComponent', () => {
 
 const extra = {};
 const now = new Date(2018, 8, 2);
-extra[+new Date(now.getFullYear(), now.getMonth(), now.getDate() + 5)] = { info: 'Disable', disable: true };
-extra[+new Date(now.getFullYear(), now.getMonth(), now.getDate() + 6)] = { info: 'Disable', disable: true };
-extra[+new Date(now.getFullYear(), now.getMonth(), now.getDate() + 7)] = { info: 'Disable', disable: true };
-extra[+new Date(now.getFullYear(), now.getMonth(), now.getDate() + 8)] = { info: 'Disable', disable: true };
+extra[+new Date(now.getFullYear(), now.getMonth(), now.getDate() + 5)] = { info: 'Disable', cellCls: 'extra-classname', disable: true };
+extra[+new Date(now.getFullYear(), now.getMonth(), now.getDate() + 6)] = { info: 'Disable', cellCls: 'extra-classname', disable: true };
+extra[+new Date(now.getFullYear(), now.getMonth(), now.getDate() + 7)] = { info: 'Disable', cellCls: 'extra-classname', disable: true };
+extra[+new Date(now.getFullYear(), now.getMonth(), now.getDate() + 8)] = { info: 'Disable', cellCls: 'extra-classname', disable: true };
 
 for (const key in extra) {
   if (extra.hasOwnProperty(key)) {

diff --git a/components/calendar/single-month/single-month.component.html b/components/calendar/single-month/single-month.component.html
@@ -5,7 +5,7 @@
   <div *ngFor="let row of state.weekComponents; let i = index" [ngClass]="row.rowCls">
     <div
       *ngFor="let cell of row.weeksDataList; let j = index"
-      class="{{ 'cell ' + ((row.extra && row.extra.cellCls) || '') }}"
+      class="{{ 'cell ' + ((cell.extra && cell.extra.cellCls) || '') }}"
       (click)="onClickCell(cell)"
     >
       <div *ngIf="row.extra && row.extra.cellRender">test</div>