feat(module:table): add nzIsPageIndexReset option (#348) (#359)

close #348
NG-ZORRO · Sep 23, 2017 · 60e3da9 · 60e3da9
1 parent 10989ae
commit 60e3da9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/components/table/nz-table.component.ts b/src/components/table/nz-table.component.ts
@@ -111,6 +111,7 @@ export class NzTableComponent implements AfterViewInit, OnInit {
   @Input() nzShowTotal = false;
   @Input() nzShowFooter = false;
   @Input() nzShowTitle = false;
+  @Input() nzIsPageIndexReset = true;
   @ContentChild('nzFixedHeader') fixedHeader: TemplateRef<any>;
 
   @ContentChildren(NzThDirective, { descendants: true })
@@ -201,7 +202,12 @@ export class NzTableComponent implements AfterViewInit, OnInit {
     if (!this._isAjax) {
       if (this.nzIsPagination) {
         if (forceRefresh) {
-          this.nzPageIndex = 1;
+          if (this.nzIsPageIndexReset) {
+            this.nzPageIndex = 1;
+          } else {
+            const maxPageIndex = Math.ceil(this._dataSet.length / this.nzPageSize);
+            this.nzPageIndex = this.nzPageIndex > maxPageIndex ? maxPageIndex : this.nzPageIndex;
+          }
         }
         this.data = this._dataSet.slice((this.nzPageIndex - 1) * this.nzPageSize, this.nzPageIndex * this.nzPageSize);
       } else {

diff --git a/src/showcase/nz-demo-table/nz-demo-table.html b/src/showcase/nz-demo-table/nz-demo-table.html
@@ -1,4 +1,4 @@
-<article>
+<article>
 
   <section class="markdown">
     <h1>Table 表格</h1>
@@ -290,7 +290,12 @@ <h3><span>nz-table</span>
           <td>Boolean</td>
           <td>false</td>
         </tr>
-
+        <tr>
+          <td>nzIsPageIndexReset</td>
+          <td>数据变更后是否保留在数据变更前的页码</td>
+          <td>Boolean</td>
+          <td>true</td>
+        </tr>
       </tbody>
     </table>
     <h3><span>nz-table-sort</span>