fix($core): global components cannot be used as layouts (close: #1321)

ulivz · ulivz · commit a67f53de710a · 2019-03-10T04:41:33.000+08:00
diff --git a/packages/@vuepress/core/lib/client/components/GlobalLayout.vue b/packages/@vuepress/core/lib/client/components/GlobalLayout.vue
@@ -7,7 +7,7 @@ export default {
   computed: {
     layout () {
       if (this.$page.path) {
-        if (this.$vuepress.isLayoutExists(this.$page.frontmatter.layout)) {
+        if (this.$vuepress.isLayoutExists(this.$page.frontmatter.layout) || this.$page.frontmatter.layout) {
           return this.$page.frontmatter.layout
         }
         return 'Layout'

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ export default {`
`7`	`7`	`computed: {`
`8`	`8`	`layout () {`
`9`	`9`	`if (this.$page.path) {`
`10`		`- if (this.$vuepress.isLayoutExists(this.$page.frontmatter.layout)) {`
	`10`	`+ if (this.$vuepress.isLayoutExists(this.$page.frontmatter.layout) \|\| this.$page.frontmatter.layout) {`
`11`	`11`	`return this.$page.frontmatter.layout`
`12`	`12`	`}`
`13`	`13`	`return 'Layout'`