From ba61ebd54bf92117afa6d4d1105cd3ec4c77e3eb Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 28 Jul 2015 14:02:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=8A=A8=E6=80=81=E4=BC=A0?=
 =?UTF-8?q?=E5=85=A5=E5=88=86=E9=A1=B5=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/table/demo/paging.md |  2 +-
 components/table/index.jsx      | 20 ++++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/components/table/demo/paging.md b/components/table/demo/paging.md
index 7bcd768db..f90a5b33a 100644
--- a/components/table/demo/paging.md
+++ b/components/table/demo/paging.md
@@ -24,7 +24,7 @@ var columns = [{
 }];
 var data = [];
 
-for (let i=0; i<18; i++) {
+for (let i=0; i<46; i++) {
   data.push({
     name: '李大嘴' + i,
     age: 32,
diff --git a/components/table/index.jsx b/components/table/index.jsx
index 15bef45b8..76c4e46c8 100644
--- a/components/table/index.jsx
+++ b/components/table/index.jsx
@@ -26,10 +26,7 @@ export default React.createClass({
     }
 
     let noPagination = (this.props.pagination === false);
-    let pagination = objectAssign({
-      pageSize: 10,
-      total: this.props.dataSource.length
-    }, this.props.pagination);
+    let pagination = this.initPagination(this.props.pagination);
 
     return {
       selectedRowKeys: [],
@@ -47,6 +44,21 @@ export default React.createClass({
       size: 'normal'
     };
   },
+  componentWillReceiveProps(nextProps) {
+    if ('pagination' in nextProps) {
+      let noPagination = (nextProps.pagination === false);
+      this.setState({
+        pagination: this.initPagination(nextProps.pagination),
+        noPagination: noPagination
+      });
+    }
+  },
+  initPagination(pagination) {
+    return objectAssign({
+      pageSize: 10,
+      total: this.props.dataSource.length
+    }, pagination);
+  },
   toggleSortOrder(order, column) {
     let sortColumn = this.state.sortColumn;
     let sortOrder = this.state.sortOrder;