From dead7fb55b40cf84bdf39f61b04246289f081370 Mon Sep 17 00:00:00 2001 From: Xinyu Liu Date: Sat, 12 May 2018 18:45:44 +0800 Subject: [PATCH] chore: allow class and style merging for content --- lib/app/Content.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/app/Content.js b/lib/app/Content.js index fb123c78f1..4b3b4c88f5 100644 --- a/lib/app/Content.js +++ b/lib/app/Content.js @@ -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 }) } }