|
|
|
@ -39,10 +39,11 @@ function parseRoutes(routesConfig, routerMap) { |
|
|
|
|
router = routerMap[item.router] |
|
|
|
|
routeCfg = item |
|
|
|
|
} |
|
|
|
|
// 从 router 和 routeCfg 解析路由
|
|
|
|
|
if (!router) { |
|
|
|
|
console.warn(`can't find register for router ${routeCfg.router}, please register it in advance.`) |
|
|
|
|
} else { |
|
|
|
|
router = typeof item === 'string' ? {path: item, name: item} : item |
|
|
|
|
} |
|
|
|
|
// 从 router 和 routeCfg 解析路由
|
|
|
|
|
const route = { |
|
|
|
|
path: routeCfg.path || router.path || routeCfg.router, |
|
|
|
|
name: routeCfg.name || router.name, |
|
|
|
@ -51,7 +52,8 @@ function parseRoutes(routesConfig, routerMap) { |
|
|
|
|
meta: { |
|
|
|
|
authority: routeCfg.authority || router.authority || '*', |
|
|
|
|
icon: routeCfg.icon || router.icon, |
|
|
|
|
page: routeCfg.page || router.page |
|
|
|
|
page: routeCfg.page || router.page, |
|
|
|
|
link: routeCfg.link || router.link |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if (routeCfg.invisible || router.invisible) { |
|
|
|
@ -61,7 +63,6 @@ function parseRoutes(routesConfig, routerMap) { |
|
|
|
|
route.children = parseRoutes(routeCfg.children, routerMap) |
|
|
|
|
} |
|
|
|
|
routes.push(route) |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
return routes |
|
|
|
|
} |
|
|
|
@ -71,6 +72,7 @@ function parseRoutes(routesConfig, routerMap) { |
|
|
|
|
* @param routesConfig {RouteConfig[]} 路由配置 |
|
|
|
|
*/ |
|
|
|
|
function loadRoutes(routesConfig) { |
|
|
|
|
console.log('hahah') |
|
|
|
|
//兼容 0.6.1 以下版本
|
|
|
|
|
/*************** 兼容 version < v0.6.1 *****************/ |
|
|
|
|
if (arguments.length > 0) { |
|
|
|
|