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

meteorlxy · ulivz · commit edcaabd22467 · 2018-05-13T13:50:01.000+08:00
diff --git 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
     })
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,10 @@ export default {`
`10`	`10`	`}`
`11`	`11`	`},`
`12`	`12`
`13`		`- render (h, { parent, props }) {`
	`13`	`+ render (h, { parent, props, data }) {`
`14`	`14`	`return h(pathToComponentName(parent.$page.path), {`
`15`		`- class: props.custom ? 'custom' : ''`
	`15`	`+ class: [props.custom ? 'custom' : '', data.class, data.staticClass],`
	`16`	`+ style: data.style`
`16`	`17`	`})`
`17`	`18`	`}`
`18`	`19`	`}`