File tree Expand file tree Collapse file tree 1 file changed +7
-8
lines changed Expand file tree Collapse file tree 1 file changed +7
-8
lines changed Original file line number Diff line number Diff line change @@ -280,17 +280,16 @@ class BootstrapTable extends Component {
280
280
} else {
281
281
if ( ! this . allowRemote ( Const . REMOTE_SORT ) ) {
282
282
data = this . store . sort ( ) . get ( ) ;
283
+ } else {
284
+ const { options : currentOptions } = this . props ;
285
+ const sortName = options . sortName ;
286
+ const sortOrder = options . sortOrder ;
287
+ if ( currentOptions . sortName !== sortName || currentOptions . sortOrder !== sortOrder ) {
288
+ this . store . setSortInfo ( sortOrder , options . sortName ) ;
289
+ }
283
290
}
284
291
newState . data = data ;
285
292
}
286
-
287
- const { options : currentOptions } = this . props ;
288
- const sortName = options . sortName ;
289
- const sortOrder = options . sortOrder ;
290
- if ( this . allowRemote ( Const . REMOTE_SORT ) &&
291
- ( currentOptions . sortName !== sortName || currentOptions . sortOrder !== sortOrder ) ) {
292
- this . store . setSortInfo ( sortOrder , options . sortName ) ;
293
- }
294
293
this . setState ( ( ) => newState ) ;
295
294
} else {
296
295
// #125
You can’t perform that action at this time.
0 commit comments