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

Table: fix table column width bug in safari & hide shadow of fixed when scrollX is false (#9327)

pull/9309/head
FuryBean 2018-01-18 17:17:40 +08:00 committed by 杨奕
parent e99c12ca04
commit 990df4ed5b
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/table/src/table-column.js
View File

@ -290,7 +290,7 @@ export default {
} }
return _self.showOverflowTooltip || _self.showTooltipWhenOverflow return _self.showOverflowTooltip || _self.showTooltipWhenOverflow
? <div class="cell el-tooltip" style={{width: (data.column.realWidth || data.column.width) + 'px'}}>{ renderCell(h, data) }</div> ? <div class="cell el-tooltip" style={ {width: (data.column.realWidth || data.column.width) - 1 + 'px'} }>{ renderCell(h, data) }</div>
: <div class="cell">{ renderCell(h, data) }</div>; : <div class="cell">{ renderCell(h, data) }</div>;
}; };
}, },

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

@ -137,7 +137,10 @@ export default {
} }
{ {
this.hasGutter this.hasGutter
? <th class="gutter" style={{ width: this.layout.scrollY ? this.layout.gutterWidth + 'px' : '0' }}></th> ? <th class="gutter" style={{
width: this.layout.scrollY ? this.layout.gutterWidth + 'px' : '0',
display: this.layout.scrollY ? '' : 'none'
}}></th>
: '' : ''
} }
</tr> </tr>

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

@ -25,7 +25,7 @@
<div <div
class="el-table__body-wrapper" class="el-table__body-wrapper"
ref="bodyWrapper" ref="bodyWrapper"
:class="[`is-scroll-${scrollPosition}`]" :class="[layout.scrollX ? `is-scroll-${scrollPosition}` : 'is-scroll-none']"
:style="[bodyHeight]"> :style="[bodyHeight]">
<table-body <table-body
:context="context" :context="context"