From 59d1f49b1cb4c16d2c481f4949813b511268d4e4 Mon Sep 17 00:00:00 2001
From: njleonzhang <scream3616@sina.com>
Date: Mon, 9 Jan 2017 23:04:06 +0800
Subject: [PATCH] fix bug: default-sort-prop is not defined but trigger
 sort-change event

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

diff --git a/packages/table/src/table-header.js b/packages/table/src/table-header.js
index 39cf0c7a6..218eb5ccb 100644
--- a/packages/table/src/table-header.js
+++ b/packages/table/src/table-header.js
@@ -190,20 +190,22 @@ export default {
   },
 
   mounted() {
-    const states = this.store.states;
-    states.sortProp = this.defaultSortProp;
-    states.sortOrder = this.defaultSortOrder;
+    if (this.defaultSortProp) {
+      const states = this.store.states;
+      states.sortProp = this.defaultSortProp;
+      states.sortOrder = this.defaultSortOrder;
 
-    this.$nextTick(_ => {
-      for (let i = 0, length = this.columns.length; i < length; i++) {
-        if (this.columns[i].property === this.defaultSortProp) {
-          this.columns[i].order = this.defaultSortOrder;
-          break;
+      this.$nextTick(_ => {
+        for (let i = 0, length = this.columns.length; i < length; i++) {
+          if (this.columns[i].property === this.defaultSortProp) {
+            this.columns[i].order = this.defaultSortOrder;
+            break;
+          }
         }
-      }
 
-      this.store.commit('changeSortCondition');
-    });
+        this.store.commit('changeSortCondition');
+      });
+    }
   },
 
   beforeDestroy() {