🐛 fix(auth): support multilevel route for util.getRouterObjByName

- refactor router.beforeEach - add redirect from access-test to 403 page
JonDai · Nov 23, 2017 · bbc279c · bbc279c
1 parent e16c977
commit bbc279c
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 34 deletions.
diff --git a/src/libs/util.js b/src/libs/util.js
@@ -49,29 +49,21 @@ util.showThisRoute = function (itAccess, currentAccess) {
 };
 
 util.getRouterObjByName = function (routers, name) {
-    let routerObj = {};
-    routers.forEach(item => {
-        if (item.name === 'otherRouter') {
-            item.children.forEach((child, i) => {
-                if (child.name === name) {
-                    routerObj = item.children[i];
-                }
-            });
-        } else {
-            if (item.children.length === 1) {
-                if (item.children[0].name === name) {
-                    routerObj = item.children[0];
-                }
-            } else {
-                item.children.forEach((child, i) => {
-                    if (child.name === name) {
-                        routerObj = item.children[i];
-                    }
-                });
-            }
+    if (!name || !routers || !routers.length) {
+        return null;
+    }
+    // debugger;
+    let routerObj = null;
+    for (let item of routers) {
+        if (item.name === name) {
+            return item;
         }
-    });
-    return routerObj;
+        routerObj = util.getRouterObjByName(item.children, name);
+        if (routerObj) {
+            return routerObj;
+        }
+    }
+    return null;
 };
 
 util.handleTitle = function (vm, item) {
@@ -237,7 +229,7 @@ util.toDefaultPage = function (routers, name, route, next) {
     let i = 0;
     let notHandle = true;
     while (i < len) {
-        if (routers[i].name === name && routers[i].redirect === undefined) {
+        if (routers[i].name === name && routers[i].children && routers[i].redirect === undefined) {
             route.replace({
                 name: routers[i].children[0].name
             });

diff --git a/src/router/index.js b/src/router/index.js
@@ -36,17 +36,18 @@ router.beforeEach((to, from, next) => {
                 name: 'home_index'
             });
         } else {
-            if (Util.getRouterObjByName([otherRouter, ...appRouter], to.name).access !== undefined) {  // 判断用户是否有权限访问当前页
-                if (Util.getRouterObjByName([otherRouter, ...appRouter], to.name).access === parseInt(Cookies.get('access'))) {
+            const curRouterObj = Util.getRouterObjByName([otherRouter, ...appRouter], to.name);
+            if (curRouterObj && curRouterObj.access !== undefined) {  // 需要判断权限的路由
+                if (curRouterObj.access === parseInt(Cookies.get('access'))) {
                     Util.toDefaultPage([otherRouter, ...appRouter], to.name, router, next);  // 如果在地址栏输入的是一级菜单则默认打开其第一个二级菜单的页面
                 } else {
                     next({
                         replace: true,
-                        name: 'error_403'
+                        name: 'error-403'
                     });
                 }
-            } else {
-                Util.toDefaultPage([otherRouter, ...appRouter], to.name, router, next);
+            } else { // 没有配置权限的路由, 直接通过
+                Util.toDefaultPage([...routers], to.name, router, next);
             }
         }
     }

diff --git a/src/router/router.js b/src/router/router.js
@@ -84,7 +84,7 @@ export const appRouter = [
         access: 0,
         component: Main,
         children: [
-            { path: 'index', title: '权限测试页', name: 'accesstest_index' }
+            { path: 'index', title: '权限测试页', name: 'accesstest_index', access: 0, component: resolve => { require(['@/views/access/access-test.vue'], resolve); } }
         ]
     },
     {

diff --git a/src/views/Main.vue b/src/views/Main.vue
@@ -165,11 +165,12 @@
                 // console.log(val)
             },
             beforePush (name) {
-                if (name === 'accesstest_index') {
-                    return false;
-                } else {
-                    return true;
-                }
+                // if (name === 'accesstest_index') {
+                //     return false;
+                // } else {
+                //     return true;
+                // }
+                return true;
             },
             fullscreenChange (isFullScreen) {
                 // console.log(isFullScreen);

diff --git a/src/views/access/access-test.vue b/src/views/access/access-test.vue
@@ -0,0 +1,17 @@
+<template>
+  <div>
+    <Card shadow>
+      <p>当前用户的权限值是 0 时，才可以看到这个页面。</p>
+    </Card>
+  </div>
+</template>
+
+<script>
+export default {
+
+};
+</script>
+
+<style>
+  
+</style>