提交 7ea67b6e 编写于 作者: A afc163
上级 1e26289d
...@@ -136,19 +136,18 @@ let AntTable = React.createClass({ ...@@ -136,19 +136,18 @@ let AntTable = React.createClass({
} }
} }
if (typeof column.sorter === 'function') { if (typeof column.sorter === 'function') {
sorter = function (...args) { sorter = (a, b) => {
let result = column.sorter.apply(this, args); let result = column.sorter(a, b);
if (sortOrder === 'ascend') { if (result !== 0) {
return result; return (sortOrder === 'descend') ? -result : result;
} else if (sortOrder === 'descend') {
return -result;
} }
return a.index - b.index;
}; };
} }
const newState = { const newState = {
sortOrder, sortOrder,
sortColumn, sortColumn,
sorter sorter,
}; };
this.setState(newState); this.setState(newState);
this.props.onChange.apply(this, this.prepareParamsArguments( this.props.onChange.apply(this, this.prepareParamsArguments(
...@@ -495,9 +494,7 @@ let AntTable = React.createClass({ ...@@ -495,9 +494,7 @@ let AntTable = React.createClass({
}, },
findColumn(myKey) { findColumn(myKey) {
return this.props.columns.filter((c) => { return this.props.columns.filter(c => this.getColumnKey(c) === myKey)[0];
return this.getColumnKey(c) === myKey;
})[0];
}, },
getCurrentPageData(dataSource) { getCurrentPageData(dataSource) {
...@@ -530,6 +527,10 @@ let AntTable = React.createClass({ ...@@ -530,6 +527,10 @@ let AntTable = React.createClass({
let data = dataSource || this.props.dataSource; let data = dataSource || this.props.dataSource;
// 排序 // 排序
if (state.sortOrder && state.sorter) { if (state.sortOrder && state.sorter) {
data = data.slice(0);
for (let i = 0; i < data.length; i++) {
data[i].index = i;
}
data = data.sort(state.sorter); data = data.sort(state.sorter);
} }
// 筛选 // 筛选
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册