From c770cd017ea6564053f3c1d3abfe41203b5c99fd Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Tue, 19 Mar 2019 19:18:24 +0800 Subject: [PATCH] Allow load multiple modules --- resources/assets/src/index.js | 5 +++-- resources/assets/src/views/route.ts | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/resources/assets/src/index.js b/resources/assets/src/index.js index 3e8cc2ba..cf78bb73 100644 --- a/resources/assets/src/index.js +++ b/resources/assets/src/index.js @@ -19,6 +19,9 @@ if (process.env.NODE_ENV === 'development') { route => (new RegExp(`^${route.path}$`, 'i')).test(blessing.route) ) if (route) { + if (route.module) { + Promise.all(route.module.map(m => m())) + } if (route.component) { Vue.prototype.$route = (new RegExp(`^${route.path}$`, 'i')).exec(blessing.route) // eslint-disable-next-line no-new @@ -29,8 +32,6 @@ if (process.env.NODE_ENV === 'development') { }, render: h => h(route.component), }) - } else if (route.script) { - route.script() } } } diff --git a/resources/assets/src/views/route.ts b/resources/assets/src/views/route.ts index 94966cf9..2fc06771 100644 --- a/resources/assets/src/views/route.ts +++ b/resources/assets/src/views/route.ts @@ -21,7 +21,7 @@ export default [ }, { path: 'admin', - script: () => import('./admin/Dashboard'), + module: [() => import('./admin/Dashboard')], }, { path: 'admin/users',