Skip to content

Commit bb234d5

Browse files
committed
Table: called render header in index column
1 parent 6cb92ac commit bb234d5

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

packages/table/src/table-column.js

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -280,16 +280,19 @@ export default {
280280
});
281281

282282
let source = forced[type] || {};
283-
for (let prop in source) {
284-
if (source.hasOwnProperty(prop)) {
285-
let value = source[prop];
286-
if (value !== undefined) {
287-
column[prop] = prop === 'className'
288-
? `${column[prop]} ${value}`
289-
: value;
283+
Object.keys(source).forEach((prop) => {
284+
let value = source[prop];
285+
if (value !== undefined) {
286+
if (prop === 'renderHeader') {
287+
if (type === 'selection' && column[prop]) {
288+
console.warn('[Element Warn][TableColumn]Selection column doesn\'t allow to set render-header function.');
289+
} else {
290+
value = column[prop] || value;
291+
}
290292
}
293+
column[prop] = prop === 'className' ? `${column[prop]} ${value}` : value;
291294
}
292-
}
295+
});
293296

294297
this.columnConfig = column;
295298

packages/table/src/table-header.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ export default {
106106
on-click={ ($event) => this.handleHeaderClick($event, column) }
107107
on-contextmenu={ ($event) => this.handleHeaderContextMenu($event, column) }
108108
style={ this.getHeaderCellStyle(rowIndex, cellIndex, columns, column) }
109-
class={ this.getHeaderCellClass(rowIndex, cellIndex, columns, column) }>
109+
class={ this.getHeaderCellClass(rowIndex, cellIndex, columns, column) }
110+
key={ column.id }>
110111
<div class={ ['cell', column.filteredValue && column.filteredValue.length > 0 ? 'highlight' : '', column.labelClassName] }>
111112
{
112113
column.renderHeader

0 commit comments

Comments
 (0)