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

Table: called render header in index column (#12914)

pull/12654/merge
hetech 2018-09-28 17:44:54 +08:00 committed by GitHub
parent b55ea514e2
commit 6b76896c40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -280,16 +280,19 @@ export default {
});
let source = forced[type] || {};
for (let prop in source) {
if (source.hasOwnProperty(prop)) {
let value = source[prop];
if (value !== undefined) {
column[prop] = prop === 'className'
? `${column[prop]} ${value}`
: value;
Object.keys(source).forEach((prop) => {
let value = source[prop];
if (value !== undefined) {
if (prop === 'renderHeader') {
if (type === 'selection' && column[prop]) {
console.warn('[Element Warn][TableColumn]Selection column doesn\'t allow to set render-header function.');
} else {
value = column[prop] || value;
}
}
column[prop] = prop === 'className' ? `${column[prop]} ${value}` : value;
}
}
});
this.columnConfig = column;

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

@ -106,7 +106,8 @@ export default {
on-click={ ($event) => this.handleHeaderClick($event, column) }
on-contextmenu={ ($event) => this.handleHeaderContextMenu($event, column) }
style={ this.getHeaderCellStyle(rowIndex, cellIndex, columns, column) }
class={ this.getHeaderCellClass(rowIndex, cellIndex, columns, column) }>
class={ this.getHeaderCellClass(rowIndex, cellIndex, columns, column) }
key={ column.id }>
<div class={ ['cell', column.filteredValue && column.filteredValue.length > 0 ? 'highlight' : '', column.labelClassName] }>
{
column.renderHeader