Merge pull request #165 from lsvih/patch-1

修复一个路由解析时候丢失 meta 值的问题
2020-12-06 10:22:21 +08:00
parent 34a76d5894 0f1a845189
commit 5c6b2a2048
1 changed files with 4 additions and 4 deletions
--- a/src/utils/routerUtil.js
+++ b/src/utils/routerUtil.js
@@ -50,10 +50,10 @@ function parseRoutes(routesConfig, routerMap) {
      component: router.component,
      redirect: routeCfg.redirect || router.redirect,
      meta: {
-        authority: routeCfg.authority || router.authority || '*',
-        icon: routeCfg.icon || router.icon,
-        page: routeCfg.page || router.page,
-        link: routeCfg.link || router.link
+        authority: routeCfg.authority || router.authority || routeCfg.meta?.authority || router.meta?.authority || '*',
+        icon: routeCfg.icon || router.icon ||  routeCfg.meta?.icon || router.meta?.icon,
+        page: routeCfg.page || router.page ||  routeCfg.meta?.page || router.meta?.page,
+        link: routeCfg.link || router.link ||  routeCfg.meta?.link || router.meta?.link
      }
    }
    if (routeCfg.invisible || router.invisible) {