github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Table: fix table filter (#12539)

pull/12536/merge
Jikkai Xiao 2018-08-29 18:45:56 +08:00 committed by GitHub
parent 8a32c3414f
commit 4c24ddaf8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/table/src/table-column.js
View File

@ -270,7 +270,7 @@ export default {
fixed: this.fixed === '' ? true : this.fixed, fixed: this.fixed === '' ? true : this.fixed,
filterMethod: this.filterMethod, filterMethod: this.filterMethod,
filters: this.filters, filters: this.filters,
filterable: (this.filters && this.filters.length) || this.filterMethod, filterable: this.filters || this.filterMethod,
filterMultiple: this.filterMultiple, filterMultiple: this.filterMultiple,
filterOpened: false, filterOpened: false,
filteredValue: this.filteredValue || [], filteredValue: this.filteredValue || [],

2
packages/table/src/table-header.js
View File

@ -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> ? <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>
: '' : ''
} }