Skip to content

Commit

Permalink
Table: fix table filter (#12539)
Browse files Browse the repository at this point in the history
  • Loading branch information
jikkai committed Aug 29, 2018
1 parent 8a32c34 commit 4c24dda
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion packages/table/src/table-column.js
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ export default {
fixed: this.fixed === '' ? true : this.fixed,
filterMethod: this.filterMethod,
filters: this.filters,
filterable: (this.filters && this.filters.length) || this.filterMethod,
filterable: this.filters || this.filterMethod,
filterMultiple: this.filterMultiple,
filterOpened: false,
filteredValue: this.filteredValue || [],
Expand Down
2 changes: 1 addition & 1 deletion packages/table/src/table-header.js
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ export default {
: ''
}
{
(column.filters && column.filters.length) || column.filterMethod
column.filterable
? <span class="el-table__column-filter-trigger" on-click={ ($event) => this.handleFilterClick($event, column) }><i class={ ['el-icon-arrow-down', column.filterOpened ? 'el-icon-arrow-up' : ''] }></i></span>
: ''
}
Expand Down

0 comments on commit 4c24dda

Please sign in to comment.