github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Table: fix sortable, allows cancellation sort

pull/2491/head
qingwei.li 2017-01-18 14:14:34 +08:00
parent 86288b4282
commit 4296c03d03
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/table/src/table-header.js
View File

@ -373,16 +373,13 @@ export default {
document.body.style.cursor = ''; document.body.style.cursor = '';
}, },
toggleOrder(column) { toggleOrder(order) {
if (column.order === 'ascending') { return !order ? 'ascending' : order === 'ascending' ? 'descending' : null;
return 'descending';
}
return 'ascending';
}, },
handleSortClick(event, column) { handleSortClick(event, column) {
event.stopPropagation(); event.stopPropagation();
let order = this.toggleOrder(column); let order = this.toggleOrder(column.order);
let target = event.target; let target = event.target;
while (target && target.tagName !== 'TH') { while (target && target.tagName !== 'TH') {
@ -411,7 +408,7 @@ export default {
sortProp = column.property; sortProp = column.property;
} }
if (column.order === order) { if (!order) {
sortOrder = column.order = null; sortOrder = column.order = null;
states.sortingColumn = null; states.sortingColumn = null;
sortProp = null; sortProp = null;