Merge branch 'dev-3.6' of git.mesalab.cn:nezha/nezha-fronted into dev-3.7

nezha-fronted/src/components/common/login.vue

@@ -273,7 +273,7 @@ export default {
       boxWidth: '',
       boxHeight: '',
       qrWidth: 10,
-      paddingLeft: 0,
+      paddingLeft: 0
     }
   },
   methods: {
@@ -782,6 +782,11 @@ export default {
     } else {
       // this.initStar()
     }
+
+    if (sessionStorage.getItem('nz-is-logout')) {
+      sessionStorage.removeItem('nz-previous-page')
+      sessionStorage.removeItem('nz-is-logout')
+    }
   },
   beforeDestroy () {
     cancelAnimationFrame(this.constellationAnimation)

nezha-fronted/src/components/layout/header.vue

@@ -183,7 +183,6 @@ export default {
         sessionStorage.setItem('nz-is-logout', '1')
         this.logoutSuccess()
         document.location.href = '/'
-        // this.$router.push('/login')
       })
     },
     showPinDialog () {

nezha-fronted/src/permission.js

@@ -9,7 +9,7 @@ import bus from '@/libs/bus'
 Vue.use(VueResource)
 
 const loginWhiteList = ['/setup', '/sys/license/upload', '/sys/license/state', '/sys/appearance', '/i18n', '/terminal'] // 免登陆白名单
-const permissionWhiteList = ['/profile', '/menu', ...loginWhiteList] // 权限白名单
+export const permissionWhiteList = ['/profile', '/menu', ...loginWhiteList] // 权限白名单
 router.beforeEach((to, from, next) => {
   if (window.entrance) {
     next()

nezha-fronted/src/router/index.js

@@ -24,8 +24,8 @@ export default new Router({
       component: resolve => require(['@/components/layout/home'], resolve),
       children: [
         {
-          path: '/panel',
+          path: '/dashboard',
-          component: resolve => require(['@/components/page/dashboard/panel'], resolve)
+          component: resolve => require(['@/components/page/dashboard/dashboard'], resolve)
         },
         {
           path: '/explore',

nezha-fronted/src/store/user.js

@@ -1,7 +1,7 @@
 import { post, get } from '@/http'
 import router from '../router'
 import bus from '../libs/bus'
-import { returnMenuCode, sortByOrderNum } from '@/permission'
+import { returnMenuCode, sortByOrderNum, permissionWhiteList, hasMenu } from '@/permission'
 import moment from 'moment-timezone'
 import { theme } from '@/components/common/js/constants'
 
@@ -144,8 +144,13 @@ const user = {
           })
         }
         // 登录成功后跳回到原来页面
-        if (sessionStorage.getItem('nz-previous-page') && noJumpPath.indexOf(sessionStorage.getItem('nz-previous-page')) === -1 && !sessionStorage.getItem('nz-is-logout')) {
+        if (sessionStorage.getItem('nz-previous-page') && noJumpPath.indexOf(sessionStorage.getItem('nz-previous-page')) === -1) {
-          const route = sessionStorage.getItem('nz-previous-page')
+          let route = sessionStorage.getItem('nz-previous-page')
+          // 没权限则跳转默认页面
+          const pathStr = route.split('?')[0]
+          if (permissionWhiteList.indexOf(pathStr) === -1 && !hasMenu(store.getters.menuList, pathStr)) {
+            route = path[0]
+          }
           router.push({
             path: route,
             query: {
@@ -153,11 +158,8 @@ const user = {
             }
           }).then(() => {
             sessionStorage.removeItem('nz-previous-page')
-            sessionStorage.removeItem('nz-is-logout')
           })
         } else {
-          sessionStorage.removeItem('nz-previous-page')
-          sessionStorage.removeItem('nz-is-logout')
           router.push({
             path: path[0],
             query: {