fix #304

AllenFang · Mar 10, 2016 · 0f30823 · 0f30823
1 parent 34ffef5
commit 0f30823
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/src/BootstrapTable.js b/src/BootstrapTable.js
@@ -140,11 +140,14 @@ class BootstrapTable extends React.Component {
     this.initTable(nextProps);
     if (Array.isArray(nextProps.data)) {
       this.store.setData(nextProps.data.slice());
-      let paginationDom = this.refs.pagination;
-      let page = paginationDom && paginationDom.getCurrentPage() || nextProps.options.page || 1;
-      let sizePerPage = paginationDom && paginationDom.getSizePerPage() || nextProps.options.sizePerPage || Const.SIZE_PER_PAGE_LIST[0];
+      let page = nextProps.options.page || this.state.currPage;
+      let sizePerPage = nextProps.options.sizePerPage || this.state.sizePerPage;
+
       // #125
-      if(page > Math.ceil(nextProps.data.length / sizePerPage)) page = 1;
+      if(!nextProps.options.page &&
+        page >= Math.ceil(nextProps.data.length / sizePerPage)){
+        page = 1;
+      }
       let sortInfo = this.store.getSortInfo();
       let sortField = nextProps.options.sortName || (sortInfo ? sortInfo.sortField : undefined);
       let sortOrder = nextProps.options.sortOrder || (sortInfo ? sortInfo.order : undefined);

diff --git a/src/pagination/PaginationList.js b/src/pagination/PaginationList.js
@@ -143,14 +143,6 @@ class PaginationList extends React.Component {
     }
     return pages;
   }
-
-  getCurrentPage() {
-    return this.props.currPage;
-  }
-
-  getSizePerPage() {
-    return this.props.sizePerPage;
-  }
 }
 PaginationList.propTypes = {
   currPage: React.PropTypes.number,