|
|
@@ -1,151 +1,143 @@
|
|
|
-import router, { asyncRoutes } from "@/router";
|
|
|
-import settings from "./settings";
|
|
|
-import { getToken, setToken, TokenKey } from "@/utils/auth";
|
|
|
-import NProgress from "nprogress";
|
|
|
-NProgress.configure({ showSpinner: false }); // NProgress Configuration
|
|
|
-import "nprogress/nprogress.css";
|
|
|
-import getPageTitle from "@/utils/getPageTitle";
|
|
|
-import { RouterRowTy } from "~/router";
|
|
|
-import { useUserStore } from "@/store/user";
|
|
|
-import { usePermissionStore } from "@/store/permission";
|
|
|
-import Layout from "@/layout";
|
|
|
-import { setTree } from "@/utils/validate";
|
|
|
-import * as _ from "lodash";
|
|
|
-const whiteList = ["/login", "/404", "/401"]; // no redirect whitelist
|
|
|
+import router, { asyncRoutes } from '@/router'
|
|
|
+import settings from './settings'
|
|
|
+import { getToken, setToken, TokenKey } from '@/utils/auth'
|
|
|
+import NProgress from 'nprogress'
|
|
|
+NProgress.configure({ showSpinner: false }) // NProgress Configuration
|
|
|
+import 'nprogress/nprogress.css'
|
|
|
+import getPageTitle from '@/utils/getPageTitle'
|
|
|
+import { RouterRowTy } from '~/router'
|
|
|
+import { useUserStore } from '@/store/user'
|
|
|
+import { usePermissionStore } from '@/store/permission'
|
|
|
+import Layout from '@/layout'
|
|
|
+import { setTree } from '@/utils/validate'
|
|
|
+import * as _ from 'lodash'
|
|
|
+const whiteList = ['/login', '/404', '/401'] // no redirect whitelist
|
|
|
router.beforeEach(async (to: any, from, next: any) => {
|
|
|
// start progress bar
|
|
|
- if (settings.isNeedNprogress) NProgress.start();
|
|
|
+ if (settings.isNeedNprogress) NProgress.start()
|
|
|
// set page title
|
|
|
- document.title = getPageTitle(to.meta.title);
|
|
|
- if (!settings.isNeedLogin) setToken(TokenKey, settings.tmpToken);
|
|
|
- const hasToken: string | null = getToken(TokenKey);
|
|
|
+ document.title = getPageTitle(to.meta.title)
|
|
|
+ if (!settings.isNeedLogin) setToken(TokenKey, settings.tmpToken)
|
|
|
+ const hasToken: string | null = getToken(TokenKey)
|
|
|
|
|
|
- const userStore = useUserStore();
|
|
|
- const permissionStore = usePermissionStore();
|
|
|
+ const userStore = useUserStore()
|
|
|
+ const permissionStore = usePermissionStore()
|
|
|
if (hasToken) {
|
|
|
- if (to.path === "/login") {
|
|
|
+ if (to.path === '/login') {
|
|
|
// if is logged in, redirect to the home page
|
|
|
- next({ path: "/" });
|
|
|
+ next({ path: '/' })
|
|
|
} else {
|
|
|
//judge isGetUserInfo
|
|
|
- const isGetUserInfo: boolean = permissionStore.isGetUserInfo;
|
|
|
+ const isGetUserInfo: boolean = permissionStore.isGetUserInfo
|
|
|
if (isGetUserInfo) {
|
|
|
- next();
|
|
|
+ next()
|
|
|
} else {
|
|
|
try {
|
|
|
- let accessRoutes: any = [];
|
|
|
+ let accessRoutes: any = []
|
|
|
if (settings.isNeedLogin) {
|
|
|
// get user info
|
|
|
// note: roles must be a object array! such as: ['admin'] or ,['developer','editor']
|
|
|
- await userStore.getInfo();
|
|
|
- const treeData: any = await userStore.getMenuInfo();
|
|
|
- const menusArray = parseMenuItem(treeData);
|
|
|
- const treeMenu = setTree(menusArray, "up_auth_id", "auth_id");
|
|
|
- const dataMenu = _.unionBy(treeMenu, "auth_id");
|
|
|
- const menus = parseMenu(dataMenu);
|
|
|
- console.log(menus);
|
|
|
+ await userStore.getInfo()
|
|
|
+ const treeData: any = await userStore.getMenuInfo()
|
|
|
+ const menusArray = parseMenuItem(treeData)
|
|
|
+ const treeMenu = setTree(menusArray, 'up_auth_id', 'auth_id')
|
|
|
+ const dataMenu = _.unionBy(treeMenu, 'auth_id')
|
|
|
+ const menus = parseMenu(dataMenu)
|
|
|
+ console.log(menus)
|
|
|
// const { roles }: any = await userStore.getInfo()
|
|
|
// accessRoutes = await permissionStore.generateRoutes(roles)
|
|
|
- accessRoutes = menus;
|
|
|
+ accessRoutes = menus
|
|
|
} else {
|
|
|
- accessRoutes = asyncRoutes;
|
|
|
+ accessRoutes = asyncRoutes
|
|
|
}
|
|
|
// setting constRouters and accessRoutes to vuex , in order to sideBar for using
|
|
|
- permissionStore.M_routes(accessRoutes);
|
|
|
+ permissionStore.M_routes(accessRoutes)
|
|
|
// dynamically add accessible routes
|
|
|
//router4 addRoutes destroyed
|
|
|
accessRoutes.forEach((route: RouterRowTy) => {
|
|
|
- router.addRoute(route);
|
|
|
- });
|
|
|
+ router.addRoute(route)
|
|
|
+ })
|
|
|
//already get userInfo
|
|
|
- permissionStore.M_isGetUserInfo(true);
|
|
|
+ permissionStore.M_isGetUserInfo(true)
|
|
|
// hack method to ensure that addRoutes is complete
|
|
|
// set the replace: true, so the navigation will not leave a history record
|
|
|
- next({ ...to, replace: true });
|
|
|
+ next({ ...to, replace: true })
|
|
|
} catch (err) {
|
|
|
- console.log(err);
|
|
|
- await userStore.resetState();
|
|
|
- next(`/login?redirect=${to.path}`);
|
|
|
- if (settings.isNeedNprogress) NProgress.done();
|
|
|
+ console.log(err)
|
|
|
+ await userStore.resetState()
|
|
|
+ next(`/login?redirect=${to.path}`)
|
|
|
+ if (settings.isNeedNprogress) NProgress.done()
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
if (whiteList.indexOf(to.path) !== -1) {
|
|
|
- next();
|
|
|
+ next()
|
|
|
} else {
|
|
|
- next(`/login?redirect=${to.path}`);
|
|
|
- if (settings.isNeedNprogress) NProgress.done();
|
|
|
+ next(`/login?redirect=${to.path}`)
|
|
|
+ if (settings.isNeedNprogress) NProgress.done()
|
|
|
}
|
|
|
}
|
|
|
-});
|
|
|
+})
|
|
|
|
|
|
function parseMenuItem(data) {
|
|
|
- const menus: any = [];
|
|
|
- data.map(item=>{
|
|
|
+ const menus: any = []
|
|
|
+ data.map((item) => {
|
|
|
if (item.show_type == 1) {
|
|
|
- if (item.up_auth_id == "1568") {
|
|
|
- menus.push(
|
|
|
- {
|
|
|
- auth_id:item.auth_id,
|
|
|
- up_auth_id:item.up_auth_id,
|
|
|
- path : item.route_info,
|
|
|
- name : item.auth_ident,
|
|
|
- meta : {
|
|
|
- title: item.auth_name,
|
|
|
- elSvgIcon: item.show_icon ?? "Fold",
|
|
|
- show_index: item.show_index,
|
|
|
- qid: item.queryTemplateID,
|
|
|
- },
|
|
|
- component:Layout,
|
|
|
- hidden : !item.is_show
|
|
|
- }
|
|
|
- )
|
|
|
+ if (item.up_auth_id == '1568') {
|
|
|
+ menus.push({
|
|
|
+ auth_id: item.auth_id,
|
|
|
+ up_auth_id: item.up_auth_id,
|
|
|
+ path: item.route_info,
|
|
|
+ name: item.auth_ident,
|
|
|
+ meta: {
|
|
|
+ title: item.auth_name,
|
|
|
+ elSvgIcon: item.show_icon ?? 'Fold',
|
|
|
+ show_index: item.show_index,
|
|
|
+ qid: item.queryTemplateID,
|
|
|
+ },
|
|
|
+ component: Layout,
|
|
|
+ hidden: !item.is_show,
|
|
|
+ })
|
|
|
} else {
|
|
|
- menus.push(
|
|
|
- {
|
|
|
- auth_id:item.auth_id,
|
|
|
- up_auth_id:item.up_auth_id,
|
|
|
- path : item.route_info,
|
|
|
- name : item.auth_ident,
|
|
|
- meta : {
|
|
|
- title: item.auth_name,
|
|
|
- elSvgIcon: item.show_icon ?? "Fold",
|
|
|
- show_index: item.show_index,
|
|
|
- qid: item.queryTemplateID,
|
|
|
- },
|
|
|
- component:{ render: () => h(resolveComponent("router-view")) },
|
|
|
- hidden : !item.is_show
|
|
|
- }
|
|
|
- )
|
|
|
- }
|
|
|
- } else if (item.show_type == 2) {
|
|
|
- menus.push(
|
|
|
- {
|
|
|
- auth_id:item.auth_id,
|
|
|
- up_auth_id:item.up_auth_id,
|
|
|
- path : item.route_info,
|
|
|
- name : item.auth_ident,
|
|
|
- meta : {
|
|
|
+ menus.push({
|
|
|
+ auth_id: item.auth_id,
|
|
|
+ up_auth_id: item.up_auth_id,
|
|
|
+ path: item.route_info,
|
|
|
+ name: item.auth_ident,
|
|
|
+ meta: {
|
|
|
title: item.auth_name,
|
|
|
- elSvgIcon: item.show_icon ?? "Fold",
|
|
|
+ elSvgIcon: item.show_icon ?? 'Fold',
|
|
|
show_index: item.show_index,
|
|
|
qid: item.queryTemplateID,
|
|
|
},
|
|
|
- component:() => import("./views" + item.file_link),
|
|
|
- hidden : !item.is_show
|
|
|
- }
|
|
|
- )
|
|
|
+ component: { render: () => h(resolveComponent('router-view')) },
|
|
|
+ hidden: !item.is_show,
|
|
|
+ })
|
|
|
+ }
|
|
|
+ } else if (item.show_type == 2) {
|
|
|
+ menus.push({
|
|
|
+ auth_id: item.auth_id,
|
|
|
+ up_auth_id: item.up_auth_id,
|
|
|
+ path: item.route_info,
|
|
|
+ name: item.auth_ident,
|
|
|
+ meta: {
|
|
|
+ title: item.auth_name,
|
|
|
+ elSvgIcon: item.show_icon ?? 'Fold',
|
|
|
+ show_index: item.show_index,
|
|
|
+ qid: item.queryTemplateID,
|
|
|
+ },
|
|
|
+ component: () => import('./views' + item.file_link),
|
|
|
+ hidden: !item.is_show,
|
|
|
+ })
|
|
|
}
|
|
|
-
|
|
|
})
|
|
|
|
|
|
return menus
|
|
|
}
|
|
|
|
|
|
function parseItem(item) {
|
|
|
- console.log(item);
|
|
|
- const menus: any = [];
|
|
|
+ const menus: any = []
|
|
|
if (!item.children) {
|
|
|
menus.push({
|
|
|
path: item.route_info,
|
|
|
@@ -153,49 +145,49 @@ function parseItem(item) {
|
|
|
name: item.auth_ident,
|
|
|
meta: {
|
|
|
title: item.auth_name,
|
|
|
- elSvgIcon: item.show_icon ?? "Fold",
|
|
|
+ elSvgIcon: item.show_icon ?? 'Fold',
|
|
|
show_index: item.show_index,
|
|
|
qid: item.queryTemplateID,
|
|
|
},
|
|
|
- });
|
|
|
+ })
|
|
|
} else if (item.children && item.children.length <= 1) {
|
|
|
+ const datas = item.children
|
|
|
+ const arrs: any = []
|
|
|
+ datas.forEach((p) => {
|
|
|
+ arrs.push({
|
|
|
+ path: p.route_info,
|
|
|
+ component: () => import('./views' + p.file_link),
|
|
|
+ name: p.auth_ident,
|
|
|
+ meta: {
|
|
|
+ title: p.auth_name,
|
|
|
+ },
|
|
|
+ })
|
|
|
+ })
|
|
|
menus.push({
|
|
|
path: item.route_info,
|
|
|
component: Layout,
|
|
|
name: item.auth_ident,
|
|
|
meta: {
|
|
|
title: item.auth_name,
|
|
|
- elSvgIcon: item.show_icon ?? "Fold",
|
|
|
+ elSvgIcon: item.show_icon ?? 'Fold',
|
|
|
show_index: item.show_index,
|
|
|
qid: item.queryTemplateID,
|
|
|
},
|
|
|
- children: [
|
|
|
- {
|
|
|
- path: item.route_info,
|
|
|
- component: () => import("@/views" + item.file_link),
|
|
|
- name: item.auth_ident,
|
|
|
- meta: {
|
|
|
- title: item.auth_name,
|
|
|
- elSvgIcon: item.show_icon ?? "Fold",
|
|
|
- show_index: item.show_index,
|
|
|
- qid: item.queryTemplateID,
|
|
|
- },
|
|
|
- },
|
|
|
- ],
|
|
|
- });
|
|
|
+ children: arrs,
|
|
|
+ })
|
|
|
} else {
|
|
|
- const datas = item.children;
|
|
|
- const arrs: any = [];
|
|
|
- datas.forEach((item, ci) => {
|
|
|
+ const datas = item.children
|
|
|
+ const arrs: any = []
|
|
|
+ datas.forEach((p) => {
|
|
|
arrs.push({
|
|
|
- path: item.route_info,
|
|
|
- component: () => import("./views" + item.file_link),
|
|
|
- name: item.auth_ident + ci,
|
|
|
+ path: p.route_info,
|
|
|
+ component: () => import('./views' + p.file_link),
|
|
|
+ name: p.auth_ident,
|
|
|
meta: {
|
|
|
- title: item.auth_name,
|
|
|
+ title: p.auth_name,
|
|
|
},
|
|
|
- });
|
|
|
- });
|
|
|
+ })
|
|
|
+ })
|
|
|
menus.push({
|
|
|
path: item.route_info,
|
|
|
component: Layout,
|
|
|
@@ -204,7 +196,7 @@ function parseItem(item) {
|
|
|
show_index: item.show_index,
|
|
|
qid: item.queryTemplateID,
|
|
|
title: item.auth_name,
|
|
|
- elSvgIcon: item.show_icon ?? "Fold",
|
|
|
+ elSvgIcon: item.show_icon ?? 'Fold',
|
|
|
},
|
|
|
children: arrs,
|
|
|
// children: [
|
|
|
@@ -222,48 +214,47 @@ function parseItem(item) {
|
|
|
// children: arrs,
|
|
|
// },
|
|
|
// ],
|
|
|
- });
|
|
|
+ })
|
|
|
}
|
|
|
- return menus;
|
|
|
+ return menus
|
|
|
}
|
|
|
|
|
|
function parseMenu(arr: Array<any>) {
|
|
|
- const menus: any =arr;
|
|
|
- console.log(arr);
|
|
|
+ const menus: any = arr
|
|
|
// arr.forEach((item) => {
|
|
|
- // const res = parseItem(item);
|
|
|
- // menus.push(res);
|
|
|
- // });
|
|
|
- const newMenus = menus.flat();
|
|
|
+ // const res = parseItem(item)
|
|
|
+ // menus.push(res)
|
|
|
+ // })
|
|
|
+ const newMenus = menus.flat()
|
|
|
newMenus.push({
|
|
|
- path: "/userManagement",
|
|
|
+ path: '/userManagement',
|
|
|
component: Layout,
|
|
|
- name: "UserManagement",
|
|
|
- redirect: "/userManagement/permission",
|
|
|
+ name: 'UserManagement',
|
|
|
+ redirect: '/userManagement/permission',
|
|
|
//using el svg icon, the elSvgIcon first when at the same time using elSvgIcon and icon
|
|
|
- meta: { title: "权限管理", elSvgIcon: "Avatar", show_index: 2 },
|
|
|
+ meta: { title: '权限管理', elSvgIcon: 'Avatar', show_index: 2 },
|
|
|
children: [
|
|
|
{
|
|
|
- path: "/userManagement/permission",
|
|
|
- name: "Permission",
|
|
|
- meta: { title: "权限项管理", elSvgIcon: "Avatar" },
|
|
|
- component: () => import("@/views/userManagement/permission/index.vue"),
|
|
|
+ path: '/userManagement/permission',
|
|
|
+ name: 'Permission',
|
|
|
+ meta: { title: '权限项管理', elSvgIcon: 'Avatar' },
|
|
|
+ component: () => import('@/views/userManagement/permission/index.vue'),
|
|
|
},
|
|
|
],
|
|
|
- });
|
|
|
+ })
|
|
|
const allMenus = newMenus.length
|
|
|
? newMenus.sort((a, b) => a.meta.show_index - b.meta.show_index)
|
|
|
- : [];
|
|
|
+ : []
|
|
|
allMenus.push({
|
|
|
- path: "/:pathMatch(.*)",
|
|
|
- redirect: "/404",
|
|
|
+ path: '/:pathMatch(.*)',
|
|
|
+ redirect: '/404',
|
|
|
hidden: true,
|
|
|
- });
|
|
|
- allMenus[0].redirect = allMenus[0].path;
|
|
|
- allMenus[0].path = "/";
|
|
|
- return allMenus;
|
|
|
+ })
|
|
|
+ allMenus[0].redirect = allMenus[0].path
|
|
|
+ allMenus[0].path = '/'
|
|
|
+ return allMenus
|
|
|
}
|
|
|
|
|
|
router.afterEach(() => {
|
|
|
- if (settings.isNeedNprogress) NProgress.done();
|
|
|
-});
|
|
|
+ if (settings.isNeedNprogress) NProgress.done()
|
|
|
+})
|
