github
/
ant-design-vue
mirror of https://github.com/vueComponent/ant-design-vue
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: table ssr has invaild style #231

pull/263/head
tangjinzhou 2018-10-24 16:34:12 +08:00
parent 90d33b019b
commit 4b24c13544
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/vc-table/src/ColGroup.jsx
View File

@ -34,7 +34,7 @@ export default {
return ( return (
<col <col
key={c.key || c.dataIndex} key={c.key || c.dataIndex}
style={{ width, minWidth: width }} style={width ? { width, minWidth: width } : {}}
/> />
) )
}) })

4
components/vc-table/src/TableHeaderRow.jsx
View File

@ -21,7 +21,9 @@ const TableHeaderRow = {
const rowProps = customHeaderRow(row.map(cell => cell.column), index) const rowProps = customHeaderRow(row.map(cell => cell.column), index)
const customStyle = rowProps ? rowProps.style : {} const customStyle = rowProps ? rowProps.style : {}
const style = { height, ...customStyle } const style = { height, ...customStyle }
if (style.height === null) {
delete style.height
}
return ( return (
<HeaderRow {...rowProps} style={style}> <HeaderRow {...rowProps} style={style}>
{row.map((cell, i) => { {row.map((cell, i) => {