Fix middlewares
This commit is contained in:
16
resources/js/router/index.js
vendored
16
resources/js/router/index.js
vendored
@@ -182,11 +182,19 @@ function resolveComponents (components) {
|
|||||||
function getMiddleware (components) {
|
function getMiddleware (components) {
|
||||||
const middleware = [...globalMiddleware]
|
const middleware = [...globalMiddleware]
|
||||||
|
|
||||||
components.filter(c => c.middleware).forEach(component => {
|
components.forEach(component => {
|
||||||
if (Array.isArray(component.middleware)) {
|
|
||||||
middleware.push(...component.middleware)
|
let compMiddleware
|
||||||
|
if (component.middleware) {
|
||||||
|
compMiddleware = component.middleware
|
||||||
|
} else if (component.default && component.default.middleware) {
|
||||||
|
compMiddleware = component.default.middleware
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Array.isArray(compMiddleware)) {
|
||||||
|
middleware.push(...compMiddleware)
|
||||||
} else {
|
} else {
|
||||||
middleware.push(component.middleware)
|
middleware.push(compMiddleware)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user