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

Table: fix layout breaks when append slot exists (#16332)

pull/16334/head
hetech 2019-07-01 15:34:35 +08:00 committed by GitHub
parent 1d1fcdd53e
commit bb381c3944
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/table/src/table.vue
View File

@ -123,9 +123,7 @@
<div <div
v-if="$slots.append" v-if="$slots.append"
class="el-table__append-gutter" class="el-table__append-gutter"
:style="{ :style="{ height: layout.appendHeight + 'px'}"></div>
height: layout.appendHeight + 'px'
}"></div>
</div> </div>
<div <div
v-if="showSummary" v-if="showSummary"
@ -183,6 +181,10 @@
width: bodyWidth width: bodyWidth
}"> }">
</table-body> </table-body>
<div
v-if="$slots.append"
class="el-table__append-gutter"
:style="{ height: layout.appendHeight + 'px' }"></div>
</div> </div>
<div <div
v-if="showSummary" v-if="showSummary"

5
packages/theme-chalk/src/table.scss
View File

@ -81,6 +81,11 @@
width: 20px; width: 20px;
} }
@include e(append-wrapper) {
// 避免外边距重合 https://developer.mozilla.org/zh-CN/docs/Web/CSS/CSS_Box_Model/Mastering_margin_collapsing
overflow: hidden;
}
@include m(fit) { @include m(fit) {
border-right: 0; border-right: 0;
border-bottom: 0; border-bottom: 0;