Skip to content

E
Element
Commit d3f998d3 authored by baiyaaaaa's avatar baiyaaaaa Committed by GitHub
Browse files
Options

Merge pull request #2491 from QingWei-Li/fix/table-sort 

Table: fix sortable, allows cancellation sort
parents 65557255 4296c03d
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 7 deletions
packages/table/src/table-header.js
View file @ d3f998d3
...@@ -373,16 +373,13 @@ export default { ...@@ -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 { ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment