fix #526

AllenFang · Jun 30, 2016 · edd5581 · edd5581
1 parent aa1db57
commit edd5581
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/BootstrapTable.js b/src/BootstrapTable.js
@@ -36,12 +36,16 @@ class BootstrapTable extends Component {
       const copy = this.props.selectRow.selected.slice();
       this.store.setSelectedRowKey(copy);
     }
+    let currPage = Const.PAGE_START_INDEX;
+    if (typeof this.props.options.page !== 'undefined') {
+      currPage = this.props.options.page;
+    } else if (typeof this.props.options.pageStartIndex !== 'undefined') {
+      currPage = this.props.options.pageStartIndex;
+    }
 
     this.state = {
       data: this.getTableData(),
-      currPage: this.props.options.page ||
-                this.props.options.pageStartIndex ||
-                Const.PAGE_START_INDEX,
+      currPage: currPage,
       sizePerPage: this.props.options.sizePerPage || Const.SIZE_PER_PAGE_LIST[0],
       selectedRowKeys: this.store.getSelectedRowKeys()
     };