mirror of https://github.com/ElemeFE/element
Table: fixed show-summary issue when multilevel header has fixed attr(#13914)
parent
653f0d4c0d
commit
cdb5d45dd7
|
@ -62,7 +62,7 @@ export default {
|
||||||
<td
|
<td
|
||||||
colspan={ column.colSpan }
|
colspan={ column.colSpan }
|
||||||
rowspan={ column.rowSpan }
|
rowspan={ column.rowSpan }
|
||||||
class={ [column.id, column.headerAlign, column.className || '', this.isCellHidden(cellIndex, this.columns) ? 'is-hidden' : '', !column.children ? 'is-leaf' : '', column.labelClassName] }>
|
class={ [column.id, column.headerAlign, column.className || '', this.isCellHidden(cellIndex, this.columns, column) ? 'is-hidden' : '', !column.children ? 'is-leaf' : '', column.labelClassName] }>
|
||||||
<div class={ ['cell', column.labelClassName] }>
|
<div class={ ['cell', column.labelClassName] }>
|
||||||
{
|
{
|
||||||
sums[cellIndex]
|
sums[cellIndex]
|
||||||
|
@ -116,6 +116,14 @@ export default {
|
||||||
return this.store.states.fixedColumns.length;
|
return this.store.states.fixedColumns.length;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
leftFixedLeafCount() {
|
||||||
|
return this.store.states.fixedLeafColumnsLength;
|
||||||
|
},
|
||||||
|
|
||||||
|
rightFixedLeafCount() {
|
||||||
|
return this.store.states.rightFixedLeafColumnsLength;
|
||||||
|
},
|
||||||
|
|
||||||
rightFixedCount() {
|
rightFixedCount() {
|
||||||
return this.store.states.rightFixedColumns.length;
|
return this.store.states.rightFixedColumns.length;
|
||||||
},
|
},
|
||||||
|
@ -130,15 +138,17 @@ export default {
|
||||||
},
|
},
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
isCellHidden(index, columns) {
|
isCellHidden(index, columns, column) {
|
||||||
if (this.fixed === true || this.fixed === 'left') {
|
if (this.fixed === true || this.fixed === 'left') {
|
||||||
return index >= this.leftFixedCount;
|
return index >= this.leftFixedLeafCount;
|
||||||
} else if (this.fixed === 'right') {
|
} else if (this.fixed === 'right') {
|
||||||
let before = 0;
|
let before = 0;
|
||||||
for (let i = 0; i < index; i++) {
|
for (let i = 0; i < index; i++) {
|
||||||
before += columns[i].colSpan;
|
before += columns[i].colSpan;
|
||||||
}
|
}
|
||||||
return before < this.columnsCount - this.rightFixedCount;
|
return before < this.columnsCount - this.rightFixedLeafCount;
|
||||||
|
} else if (!this.fixed && column.fixed) { // hide cell when footer instance is not fixed and column is fixed
|
||||||
|
return true;
|
||||||
} else {
|
} else {
|
||||||
return (index < this.leftFixedCount) || (index >= this.columnsCount - this.rightFixedCount);
|
return (index < this.leftFixedCount) || (index >= this.columnsCount - this.rightFixedCount);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue