fix(module:pagination): fix pagination nzTotal 0 bug

close #3648
NG-ZORRO · Jun 25, 2019 · d125478 · d125478
1 parent ecae334
commit d125478
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/components/pagination/nz-pagination.component.html b/components/pagination/nz-pagination.component.html
@@ -7,7 +7,7 @@
   </a>
   <a *ngIf="type=='page'">{{ page }}</a>
 </ng-template>
-<ng-container *ngIf="nzHideOnSinglePage && (nzTotal > nzPageSize) || !nzHideOnSinglePage">
+<ng-container *ngIf="(nzHideOnSinglePage && (nzTotal > nzPageSize)) || (nzTotal && !nzHideOnSinglePage)">
   <ul class="ant-pagination"
       [class.ant-table-pagination]="nzInTable"
       [class.ant-pagination-simple]="nzSimple"

diff --git a/components/pagination/nz-pagination.component.ts b/components/pagination/nz-pagination.component.ts
@@ -137,6 +137,7 @@ export class NzPaginationComponent implements OnInit, OnDestroy, OnChanges {
       }
     }
     this.pages = pages;
+    console.log(this.pages);
     this.cdr.markForCheck();
   }
 

diff --git a/components/pagination/nz-pagination.spec.ts b/components/pagination/nz-pagination.spec.ts
@@ -243,6 +243,11 @@ describe('pagination', () => {
         expect(testComponent.pageIndex).toBe(5);
       });
     });
+    it('should zero total hide all', () => {
+      testComponent.total = 0;
+      fixture.detectChanges();
+      expect(pagination.nativeElement.innerText).toEqual('');
+    });
     it('should be hidden pagination when total is 0 and nzHideOnSinglePage is true', () => {
       (testComponent as NzTestPaginationComponent).total = 0;
       (testComponent as NzTestPaginationComponent).hideOnSinglePage = true;