chore: allow class and style merging for content (#430)

This commit is contained in:
Liu Xinyu
2018-05-13 13:50:01 +08:00
committed by ULIVZ
parent 4f8370b4ac
commit edcaabd224
+3 -2
View File
@@ -10,9 +10,10 @@ export default {
}
},
render (h, { parent, props }) {
render (h, { parent, props, data }) {
return h(pathToComponentName(parent.$page.path), {
class: props.custom ? 'custom' : ''
class: [props.custom ? 'custom' : '', data.class, data.staticClass],
style: data.style
})
}
}