Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-23 22:25:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1310 from whtsky/resolve-vuecomponent

Browse Source 
add `resolvedLayouts` to support class components in layouts
This commit is contained in:
Sébastien Chopin 2017-08-13 23:31:58 +02:00 committed by GitHub
commit 233ea26455
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/app/App.vue
View File

@ -20,6 +20,8 @@ layoutsKeys.forEach(function (key, i) { %>
<% }) %>
}
let resolvedLayouts = {}
export default {
head: <%= JSON.stringify(head) %>,
data: () => ({
@ -37,22 +39,23 @@ export default {
},
methods: {
setLayout (layout) {
if (!layout || !layouts['_' + layout]) layout = 'default'
if (!layout || !resolvedLayouts['_' + layout]) layout = 'default'
this.layoutName = layout
let _layout = '_' + layout
this.layout = layouts[_layout]
this.layout = resolvedLayouts[_layout]
return this.layout
},
loadLayout (layout) {
if (!layout || !layouts['_' + layout]) layout = 'default'
if (!layout || !(layouts['_' + layout] || resolvedLayouts['_' + layout])) layout = 'default'
let _layout = '_' + layout
if (typeof layouts[_layout] !== 'function') {
return Promise.resolve(layouts[_layout])
if (resolvedLayouts[_layout]) {
return Promise.resolve(resolvedLayouts[_layout])
}
return layouts[_layout]()
.then((Component) => {
layouts[_layout] = Component
return layouts[_layout]
resolvedLayouts[_layout] = Component
delete layouts[_layout]
return resolvedLayouts[_layout]
})
.catch((e) => {
if (this.$nuxt) {