fix(module:pagination) fix pagination double binding (#146)

close #107
NG-ZORRO · Aug 25, 2017 · b442863 · b442863
1 parent 49e3741
commit b442863
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/components/pagination/nz-pagination.component.spec.ts b/src/components/pagination/nz-pagination.component.spec.ts
@@ -45,6 +45,16 @@ describe('NzPaginationComponent', () => {
       expect(debugElement.nativeElement.querySelectorAll('.ant-pagination-item').length).toBe(6);
       expect(debugElement.nativeElement.querySelector('.ant-pagination-jump-next')).toBeDefined();
     });
+    it('correct double binding', () => {
+      const fixture = TestBed.createComponent(TestPaginationBasic);
+      const testComponent = fixture.debugElement.componentInstance;
+      const debugElement = fixture.debugElement.query(By.directive(NzPaginationComponent));
+      testComponent._nzTotal = 50;
+      fixture.detectChanges();
+      debugElement.nativeElement.querySelector('.ant-pagination-item:nth-child(4)').click();
+      fixture.detectChanges();
+      expect(testComponent._nzPageIndex).toBe(3);
+    });
 
     it('change each page to display the entry', () => {
       const fixture = TestBed.createComponent(TestPaginationChanger);
@@ -113,7 +123,7 @@ describe('NzPaginationComponent', () => {
   @Component({
     selector: 'nz-test-pagination-basic',
     template: `
-      <nz-pagination [nzPageIndex]="_nzPageIndex" [nzTotal]="_nzTotal"></nz-pagination>
+      <nz-pagination [(nzPageIndex)]="_nzPageIndex" [nzTotal]="_nzTotal"></nz-pagination>
     `
   })
   class TestPaginationBasic {

diff --git a/src/components/pagination/nz-pagination.component.ts b/src/components/pagination/nz-pagination.component.ts
@@ -284,6 +284,7 @@ export class NzPaginationComponent {
       this.nzPageIndex = index;
     }
     this.nzPageIndexClickChange.emit(this.nzPageIndex);
+    this.nzPageIndexChange.emit(this.nzPageIndex);
   }
 
   get _isLastIndex() {

diff --git a/src/components/table/nz-table.component.ts b/src/components/table/nz-table.component.ts
@@ -127,7 +127,6 @@ export class NzTableComponent implements AfterViewInit {
   };
 
   pageChangeClick(value) {
-    this.nzPageIndex = value;
     this.nzPageIndexChangeClick.emit(value);
   }