fixes #27

aliqin · Jun 27, 2017 · b74db66 · b74db66
1 parent ac4c909
commit b74db66
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/components/Table/Table.vue b/src/components/Table/Table.vue
@@ -108,7 +108,7 @@
       </table>
     </div>
     <div v-show="pagination && pagination.total > 0" :class="[prefixCls + '-table-pagination']">
-      <pagination ref="pager" :total="pagination.total" :page-size="pagination.pageSize" :show-jumper="true" :show-size-changer="true" @pagination-page-change="changePage" @pagination-size-change="changeSize"></pagination>
+      <pagination ref="pager" :total="pagination.total" :currPage="pagination.currPage" :page-size="pagination.pageSize" :show-jumper="true" :show-size-changer="true" @change="changePage" @pagination-page-change="changePage" @pagination-size-change="changeSize"></pagination>
     </div>
   </div>
 </template>
@@ -215,7 +215,10 @@ export default {
   mounted () {
     if (this.pagination.total > 0) {
       let pager = this.$refs.pager
-      this.dataList = this.originDataSource.slice(pager.currPage || 0, pager.pageSize)
+      let startIndex = (pager.currPage - 1) * pager.pageSize
+      startIndex = startIndex >= pager.total ? 0 : startIndex
+      // this.dataList = this.originDataSource.slice(pager.currPage || 0, pager.pageSize)
+      this.dataList = this.originDataSource.slice(startIndex, startIndex + pager.pageSize)
     }
   },
   computed: {

diff --git a/src/components/Table/demo/pagination.md b/src/components/Table/demo/pagination.md
@@ -10,7 +10,9 @@ title:
 增加pagination属性以分页，
 ```
 const pagination = {
-  total: data.length
+  total: data.length,
+  pageSize: 20,
+  currPage: 1
 }
 
 ```
@@ -75,7 +77,8 @@ for (let i = 0; i < 46; i++) {
 
 const pagination = {
   total: data.length,
-  pageSize: 20
+  pageSize: 20,
+  currPage: 1
 }
 
 // 配置选择数据的选项