Merge branch 'zation-apply_sorter_for_children' into 1.x-stable

This commit is contained in:
afc163 2016-08-26 15:04:53 +08:00
commit 93fec41219

View File

@ -59,6 +59,7 @@ export default class Table extends React.Component {
onChange: noop,
locale: {},
rowKey: 'key',
childrenColumnName: 'children',
}
static contextTypes = {
@ -717,14 +718,23 @@ export default class Table extends React.Component {
return flatArray(this.getCurrentPageData());
}
recursiveSort(data, sorterFn) {
const { childrenColumnName } = this.props;
return data.sort(sorterFn).map(item => (item[childrenColumnName] ? {
...item,
[childrenColumnName]: this.recursiveSort(item[childrenColumnName], sorterFn),
} : item));
}
getLocalData() {
const state = this.state;
let data = this.props.dataSource || [];
const { dataSource } = this.props;
let data = dataSource || [];
//
data = data.slice(0);
const sorterFn = this.getSorterFn();
if (sorterFn) {
data = data.sort(sorterFn);
data = this.recursiveSort(data, sorterFn);
}
//
if (state.filters) {