Skip to content

Commit 41cdaa5

Browse files
AllenFangpowellandy
authored andcommitted
refactoring remote sort
1 parent 4e0810e commit 41cdaa5

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

src/BootstrapTable.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -280,17 +280,16 @@ class BootstrapTable extends Component {
280280
} else {
281281
if (!this.allowRemote(Const.REMOTE_SORT)) {
282282
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+
}
283290
}
284291
newState.data = data;
285292
}
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-
}
294293
this.setState(() => newState);
295294
} else {
296295
// #125

0 commit comments

Comments
 (0)