From bfb4c9c3f146dc769f559f9666bdfc288de6b888 Mon Sep 17 00:00:00 2001
From: "qingwei.li" <cinwell.li@gmail.com>
Date: Tue, 17 Jan 2017 17:59:00 +0800
Subject: [PATCH] Table: fix columnKey, fixed #2322

---
 packages/table/src/table-column.js | 6 +++---
 packages/table/src/table-store.js  | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/table/src/table-column.js b/packages/table/src/table-column.js
index 19d653462..261269b54 100644
--- a/packages/table/src/table-column.js
+++ b/packages/table/src/table-column.js
@@ -182,8 +182,7 @@ export default {
   created() {
     this.customRender = this.$options.render;
     this.$options.render = h => h('div', this.$slots.default);
-
-    let columnId = this.columnId = this.columnKey || ((this.$parent.tableId || (this.$parent.columnId + '_')) + 'column_' + columnIdSeed++);
+    this.columnId = (this.$parent.tableId || (this.$parent.columnId + '_')) + 'column_' + columnIdSeed++;
 
     let parent = this.$parent;
     let owner = this.owner;
@@ -210,7 +209,8 @@ export default {
     let isColumnGroup = false;
 
     let column = getDefaultColumn(type, {
-      id: columnId,
+      id: this.columnId,
+      columnKey: this.columnKey,
       label: this.label,
       className: this.className,
       property: this.prop || this.property,
diff --git a/packages/table/src/table-store.js b/packages/table/src/table-store.js
index abd970ee3..da1063299 100644
--- a/packages/table/src/table-store.js
+++ b/packages/table/src/table-store.js
@@ -152,15 +152,17 @@ TableStore.prototype.mutations = {
     }
 
     const prop = column.property;
+    const filters = [];
+
     if (prop) {
       states.filters[column.id] = values;
+      filters[column.columnKey || column.id] = values;
     }
 
     let data = states._data;
-    const filters = states.filters;
 
-    Object.keys(filters).forEach((columnId) => {
-      const values = filters[columnId];
+    Object.keys(states.filters).forEach((columnId) => {
+      const values = states.filters[columnId];
       if (!values || values.length === 0) return;
       const column = getColumnById(this.states, columnId);
       if (column && column.filterMethod) {