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

Table: Fix wrong header with fixed right columns.

pull/2870/head
Liril 2017-02-16 14:48:52 +08:00 committed by 杨奕
parent 8e8c714f00
commit d220894e81
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,13 +26,9 @@ const convertToRows = (originColumns) => {
} }
} }
if (column.children) { if (column.children) {
let childrenMax = 1;
let colSpan = 0; let colSpan = 0;
column.children.forEach((subColumn) => { column.children.forEach((subColumn) => {
const temp = traverse(subColumn, column); traverse(subColumn, column);
if (temp > childrenMax) {
childrenMax = temp;
}
colSpan += subColumn.colSpan; colSpan += subColumn.colSpan;
}); });
column.colSpan = colSpan; column.colSpan = colSpan;
@ -105,7 +101,7 @@ export default {
on-mouseout={ this.handleMouseOut } on-mouseout={ this.handleMouseOut }
on-mousedown={ ($event) => this.handleMouseDown($event, column) } on-mousedown={ ($event) => this.handleMouseDown($event, column) }
on-click={ ($event) => this.handleHeaderClick($event, column) } on-click={ ($event) => this.handleHeaderClick($event, column) }
class={ [column.id, column.order, column.headerAlign, column.className || '', rowIndex === 0 && this.isCellHidden(cellIndex) ? 'is-hidden' : '', !column.children ? 'is-leaf' : ''] }> class={ [column.id, column.order, column.headerAlign, column.className || '', rowIndex === 0 && this.isCellHidden(cellIndex, columns) ? 'is-hidden' : '', !column.children ? 'is-leaf' : ''] }>
<div class={ ['cell', column.filteredValue && column.filteredValue.length > 0 ? 'highlight' : ''] }> <div class={ ['cell', column.filteredValue && column.filteredValue.length > 0 ? 'highlight' : ''] }>
{ {
column.renderHeader column.renderHeader
@ -225,11 +221,15 @@ export default {
}, },
methods: { methods: {
isCellHidden(index) { isCellHidden(index, columns) {
if (this.fixed === true || this.fixed === 'left') { if (this.fixed === true || this.fixed === 'left') {
return index >= this.leftFixedCount; return index >= this.leftFixedCount;
} else if (this.fixed === 'right') { } else if (this.fixed === 'right') {
return index < this.columnsCount - this.rightFixedCount; let before = 0;
for (let i = 0; i < index; i++) {
before += columns[i].colSpan;
}
return before < this.columnsCount - this.rightFixedCount;
} else { } else {
return (index < this.leftFixedCount) || (index >= this.columnsCount - this.rightFixedCount); return (index < this.leftFixedCount) || (index >= this.columnsCount - this.rightFixedCount);
} }