diff --git a/src/guards.js b/src/guards.js index dfd378dc3..0e0ecf4d5 100644 --- a/src/guards.js +++ b/src/guards.js @@ -4,8 +4,7 @@ import NProgress from 'nprogress' // progress bar import 'nprogress/nprogress.css' // progress bar style import { startup } from '@/utils/startup' import store from '@/store' -import { getPropView, getRouteViewRequirePerms, hasPermission } from '@/utils/jms' -import Vue from 'vue' +import { isSameView } from '@/utils/jms' NProgress.configure({ showSpinner: false @@ -16,7 +15,6 @@ router.beforeEach(async(to, from, next) => { NProgress.start() try { await startup({ to, from, next }) - await changeCurrentViewIfNeed({ to, from, next }) next() } catch (e) { const msg = 'Start service error: ' + e @@ -25,9 +23,8 @@ router.beforeEach(async(to, from, next) => { }) function generateViewRoutesIfChange({ to, from }) { - const fromView = from?.path.split('/')[1] - const toView = to?.path.split('/')[1] - if (fromView !== toView) { + const sameView = isSameView(to, from) + if (!sameView) { return store.dispatch('permission/generateViewRoutes', { to: to, from: from }) } } @@ -41,25 +38,10 @@ function setPageTitle() { } } -function changeCurrentViewIfNeed({ to, from, next }) { - if (to.path.slice(0, 5) === from.path.slice(0, 5)) { - return - } - const viewRequirePerms = getRouteViewRequirePerms(to) - const hasPerm = hasPermission(viewRequirePerms) - Vue.$log.debug('Change current view if need: ', viewRequirePerms, hasPerm) - if (hasPerm) { - Vue.$log.debug('Has current view perm') - return - } - const view = getPropView() - next({ name: view }) -} - -router.afterEach(async(to, from) => { +router.afterEach(async(to, from, next) => { // finish progress bar await setPageTitle() - NProgress.done() await generateViewRoutesIfChange({ to, from }) + NProgress.done() }) diff --git a/src/layout/components/NavHeader/Organization.vue b/src/layout/components/NavHeader/Organization.vue index 49692e940..d3b4bef1f 100644 --- a/src/layout/components/NavHeader/Organization.vue +++ b/src/layout/components/NavHeader/Organization.vue @@ -37,6 +37,7 @@ diff --git a/src/layout/components/NavLeft/Logo.vue b/src/layout/components/NavLeft/Logo.vue index e0809c40a..f4c2c3f84 100644 --- a/src/layout/components/NavLeft/Logo.vue +++ b/src/layout/components/NavLeft/Logo.vue @@ -2,10 +2,10 @@
- + - + logo
diff --git a/src/layout/components/NavLeft/index.vue b/src/layout/components/NavLeft/index.vue index c1a07fcb3..0f9d87591 100644 --- a/src/layout/components/NavLeft/index.vue +++ b/src/layout/components/NavLeft/index.vue @@ -52,7 +52,6 @@ export default { 'sidebar' ]), activeMenu() { - console.log('View routes: ', this.currentViewRoute) const route = this.$route const { meta, path } = route // if set path, the sidebar will highlight the path you set diff --git a/src/router/index.js b/src/router/index.js index 20aedab0b..b45b79581 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -49,6 +49,16 @@ export const constantRoutes = [ meta: { icon: 'dashboard', title: i18n.t('route.Overview') + }, + beforeEnter: (to, from, next) => { + console.log('Enter home view') + const preferView = getPermedPreferView() + if (preferView) { + console.log('Go to preferView: ', preferView) + next(`/${preferView}/`) + return false + } + next() } } ] @@ -73,6 +83,7 @@ import workspaceViewRoutes from './workspace' import ticketsRoutes from './tickets' import settingsRoutes from './settings' import profileRoutes from './profile' +import { getPermedPreferView } from '@/utils/jms' /** * admin diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 7b049b153..d8265d7d1 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -182,6 +182,7 @@ const actions = { if (!matched) { Vue.$log.debug('Not match path, set default routes', path) commit('SET_VIEW_ROUTE', constantRoutes[0]) + resolve(constantRoutes[0]) return } const viewName = matched[1] @@ -189,12 +190,14 @@ const actions = { for (const route of state.routes) { if (route.meta?.view === viewName) { viewRoute = route + break } } if (viewRoute.meta?.showNavSwitcher) { localStorage.setItem('PreView', viewName) } commit('SET_VIEW_ROUTE', viewRoute) + resolve(viewRoute) }) }, generateRoutes({ commit, dispatch, rootState }, { to, from }) { @@ -207,7 +210,6 @@ const actions = { Vue.$log.debug('All routes: ', routes) } commit('SET_ROUTES', { routes }) - dispatch('generateViewRoutes', { from, to }) resolve(routes) }) } diff --git a/src/utils/jms.js b/src/utils/jms.js index e538b34f3..e1da144fa 100644 --- a/src/utils/jms.js +++ b/src/utils/jms.js @@ -89,13 +89,7 @@ export function getViewRequirePerms(view) { return viewRequirePermsMapper[view] || 'super' } -export function getPropView() { - const preView = localStorage.getItem('PreView') - const preViewRequirePerms = getViewRequirePerms(preView) - const hasPerm = hasPermission(preViewRequirePerms) - if (hasPerm) { - return preView - } +export function getPermedPreferView() { for (const [view, perms] of Object.entries(viewRequirePermsMapper)) { const hasPerm = hasPermission(perms) Vue.$log.debug('Has view perm: ', view, hasPerm) @@ -103,7 +97,26 @@ export function getPropView() { return view } } - return 'home' +} + +export function isSameView(to, from) { + const fromView = from?.path.split('/')[1] + const toView = to?.path.split('/')[1] + return fromView === toView +} + +export function getPropView() { + const preView = localStorage.getItem('PreView') + const preViewRequirePerms = getViewRequirePerms(preView) + const hasPerm = hasPermission(preViewRequirePerms) + if (hasPerm) { + return preView + } + const preferView = getPermedPreferView() + if (preferView) { + return preferView + } + return '' } export function getApiUrlRequirePerms(url, action) { @@ -115,3 +128,9 @@ export function getRouteViewRequirePerms(route) { const viewName = route.path.split('/')[1] return getViewRequirePerms(viewName) } + +export function hasRouteViewPerm(route) { + const viewName = route.path.split('/')[1] + const perms = getViewRequirePerms(viewName) + return hasPermission(perms) +} diff --git a/src/utils/startup.js b/src/utils/startup.js index fdd75309a..66cf1ee5f 100644 --- a/src/utils/startup.js +++ b/src/utils/startup.js @@ -7,6 +7,7 @@ import 'nprogress/nprogress.css' // progress bar style import { getTokenFromCookie } from '@/utils/auth' import orgUtil from '@/utils/org' import { getCurrentOrg } from '@/api/orgs' +import { getPropView, hasRouteViewPerm, isSameView } from '@/utils/jms' const whiteList = ['/login', process.env.VUE_APP_LOGIN_PATH] // no redirect whitelist let initial = false @@ -84,8 +85,11 @@ export async function generatePageRoutes({ to, from, next }) { const accessRoutes = await store.dispatch('permission/generateRoutes', { to, from }) // dynamically add accessible routes + Vue.$log.debug('All routes: ', accessRoutes) router.addRoutes(accessRoutes) + await store.dispatch('permission/generateViewRoutes', { to, from }) + // hack method to ensure that addRoutes is complete // set the replace: true, so the navigation will not leave a history record // Vue.$log.debug('Next to: ', to) @@ -104,6 +108,21 @@ export async function checkUserFirstLogin({ to, from, next }) { } } +export async function changeCurrentViewIfNeed({ to, from, next }) { + if (!to.path || isSameView(to, from)) { + return + } + const hasPerm = hasRouteViewPerm(to) + Vue.$log.debug('Change current view if need: ', hasPerm) + if (hasPerm) { + Vue.$log.debug('Has current view perm') + return + } + const view = getPropView() + Vue.$log.debug('Get prop view and goto: ', view) + next(`/${view}`) +} + export async function startup({ to, from, next }) { if (initial) { return true @@ -116,6 +135,7 @@ export async function startup({ to, from, next }) { await checkLogin({ to, from, next }) await changeCurrentOrgIfNeed({ to, from, next }) await generatePageRoutes({ to, from, next }) + await changeCurrentViewIfNeed({ to, from, next }) await checkUserFirstLogin({ to, from, next }) return true }