From 4296c03d0351de0af6bad15878da637b3b91760d Mon Sep 17 00:00:00 2001
From: "qingwei.li" <cinwell.li@gmail.com>
Date: Wed, 18 Jan 2017 14:14:34 +0800
Subject: [PATCH] Table: fix sortable, allows cancellation sort

---
 packages/table/src/table-header.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/table/src/table-header.js b/packages/table/src/table-header.js
index 8e92a696c..be7e416f5 100644
--- a/packages/table/src/table-header.js
+++ b/packages/table/src/table-header.js
@@ -373,16 +373,13 @@ export default {
       document.body.style.cursor = '';
     },
 
-    toggleOrder(column) {
-      if (column.order === 'ascending') {
-        return 'descending';
-      }
-      return 'ascending';
+    toggleOrder(order) {
+      return !order ? 'ascending' : order === 'ascending' ? 'descending' : null;
     },
 
     handleSortClick(event, column) {
       event.stopPropagation();
-      let order = this.toggleOrder(column);
+      let order = this.toggleOrder(column.order);
 
       let target = event.target;
       while (target && target.tagName !== 'TH') {
@@ -411,7 +408,7 @@ export default {
         sortProp = column.property;
       }
 
-      if (column.order === order) {
+      if (!order) {
         sortOrder = column.order = null;
         states.sortingColumn = null;
         sortProp = null;