fix #1608

AllenFang · Sep 13, 2017 · 8ba60d8 · 8ba60d8
1 parent f3466be
commit 8ba60d8
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/src/BootstrapTable.js b/src/BootstrapTable.js
@@ -253,18 +253,20 @@ class BootstrapTable extends Component {
       }
 
       if (this.isRemoteDataSource()) {
+        const newState = { sizePerPage, reset: false, currPage: page };
         let data = nextProps.data.slice();
         if (nextProps.pagination && !this.allowRemote(Const.REMOTE_PAGE)) {
           data = this.store.page(page, sizePerPage).get();
         }
-        this.setState(() => {
-          return {
-            data,
-            currPage: page,
-            sizePerPage,
-            reset: false
-          };
-        });
+
+        if (this.store.isOnFilter) {
+          if (this.store.searchText) this.handleSearch(this.store.searchText);
+          if (this.store.filterObj) this.handleFilterData(this.store.filterObj);
+          newState.currPage = Util.getFirstPage(nextProps.options.pageStartIndex);
+        } else {
+          newState.data = data;
+        }
+        this.setState(() => newState);
       } else {
         // #125
         // remove !options.page for #709