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

Merge pull request #2207 from reverland/fix-safari-colgroup 

table: wrap col in colgroup to make column width work in safari
pull/2178/merge
baiyaaaaa 2017-01-05 16:45:26 +08:00 committed by GitHub
parent 634a415784 a3da161339
commit 624442927f
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,13 +28,15 @@ export default {
cellspacing="0"
cellpadding="0"
border="0">
{
this._l(this.columns, column =>
<col
name={ column.id }
width={ column.realWidth || column.width }
/>)
}
<colgroup>
{
this._l(this.columns, column =>
<col
name={ column.id }
width={ column.realWidth || column.width }
/>)
}
</colgroup>
<tbody>
{
this._l(this.data, (row, $index) =>

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

@ -78,18 +78,20 @@ export default {
cellspacing="0"
cellpadding="0"
border="0">
{
this._l(this.columns, column =>
<col
name={ column.id }
width={ column.realWidth || column.width }
/>)
}
{
!this.fixed && this.layout.gutterWidth
? <col name="gutter" width={ this.layout.scrollY ? this.layout.gutterWidth : '' }></col>
: ''
}
<colgroup>
{
this._l(this.columns, column =>
<col
name={ column.id }
width={ column.realWidth || column.width }
/>)
}
{
!this.fixed && this.layout.gutterWidth
? <col name="gutter" width={ this.layout.scrollY ? this.layout.gutterWidth : '' }></col>
: ''
}
</colgroup>
<thead>
{
this._l(columnRows, (columns, rowIndex) =>