fix(module:pagination): fix pagination bug (#3067)

close #3049
NG-ZORRO · Mar 11, 2019 · f4948d7 · f4948d7
1 parent dbc33ae
commit f4948d7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/components/pagination/nz-pagination.component.ts b/components/pagination/nz-pagination.component.ts
@@ -57,6 +57,12 @@ export class NzPaginationComponent implements OnInit, OnDestroy, OnChanges {
     }
   }
 
+  updatePageIndexValue(page: number): void {
+    this.nzPageIndex = page;
+    this.nzPageIndexChange.emit(this.nzPageIndex);
+    this.buildIndexes();
+  }
+
   isPageIndexValid(value: number): boolean {
     return this.validatePageIndex(value) === value;
   }
@@ -65,8 +71,7 @@ export class NzPaginationComponent implements OnInit, OnDestroy, OnChanges {
     if (index !== this.nzPageIndex) {
       const pageIndex = this.validatePageIndex(index);
       if (pageIndex !== this.nzPageIndex) {
-        this.nzPageIndex = pageIndex;
-        this.nzPageIndexChange.emit(this.nzPageIndex);
+        this.updatePageIndexValue(pageIndex);
       }
     }
   }
@@ -80,17 +85,15 @@ export class NzPaginationComponent implements OnInit, OnDestroy, OnChanges {
     this.nzPageSizeChange.emit($event);
     this.buildIndexes();
     if (this.nzPageIndex > this.lastIndex) {
-      this.nzPageIndex = this.lastIndex;
-      this.nzPageIndexChange.emit(this.lastIndex);
+      this.updatePageIndexValue(this.lastIndex);
     }
   }
 
   handleKeyDown(_: KeyboardEvent, input: HTMLInputElement, clearInputValue: boolean): void {
     const target = input;
     const page = toNumber(target.value, this.nzPageIndex);
     if (isInteger(page) && this.isPageIndexValid(page) && page !== this.nzPageIndex) {
-      this.nzPageIndex = page;
-      this.nzPageIndexChange.emit(this.nzPageIndex);
+      this.updatePageIndexValue(page);
     }
     if (clearInputValue) {
       target.value = null;
@@ -121,6 +124,7 @@ export class NzPaginationComponent implements OnInit, OnDestroy, OnChanges {
       }
     }
     this.pages = pages;
+    this.cdr.markForCheck();
   }
 
   get lastIndex(): number {

diff --git a/components/pagination/nz-pagination.spec.ts b/components/pagination/nz-pagination.spec.ts
@@ -66,6 +66,15 @@ describe('pagination', () => {
         fixture.detectChanges();
         expect(testComponent.pageIndexChange).toHaveBeenCalledTimes(0);
       });
+      it('should change pageIndex change pages list', () => {
+        fixture.detectChanges();
+        testComponent.total = 500;
+        fixture.detectChanges();
+        expect(paginationElement.children.length).toBe(9);
+        testComponent.pageIndex = 5;
+        fixture.detectChanges();
+        expect(paginationElement.children.length).toBe(11);
+      });
       it('should pre button disabled', () => {
         fixture.detectChanges();
         expect(testComponent.pageIndexChange).toHaveBeenCalledTimes(0);