From b6eaaf694383942ac38d42dea5979d0a842dcd0f Mon Sep 17 00:00:00 2001
From: Jikkai Xiao <jikkai@users.noreply.github.com>
Date: Thu, 5 Jul 2018 11:03:52 +0800
Subject: [PATCH] Table: disable filter when filters is an empty array (#11864)

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

diff --git a/packages/table/src/table-column.js b/packages/table/src/table-column.js
index 26c070ee2..684954ca3 100644
--- a/packages/table/src/table-column.js
+++ b/packages/table/src/table-column.js
@@ -270,7 +270,7 @@ export default {
       fixed: this.fixed === '' ? true : this.fixed,
       filterMethod: this.filterMethod,
       filters: this.filters,
-      filterable: this.filters || this.filterMethod,
+      filterable: this.filters && this.filters.length && this.filterMethod,
       filterMultiple: this.filterMultiple,
       filterOpened: false,
       filteredValue: this.filteredValue || [],
diff --git a/packages/table/src/table-header.js b/packages/table/src/table-header.js
index 038e4814a..e08fc944b 100644
--- a/packages/table/src/table-header.js
+++ b/packages/table/src/table-header.js
@@ -339,7 +339,7 @@ export default {
     handleHeaderClick(event, column) {
       if (!column.filters && column.sortable) {
         this.handleSortClick(event, column);
-      } else if (column.filters && !column.sortable) {
+      } else if (column.filterable && !column.sortable) {
         this.handleFilterClick(event, column);
       }