mirror of
https://github.com/jekip/naive-ui-admin.git
synced 2026-03-01 00:23:11 +08:00
fix: constantRouter在useAsyncRouteStore.routers重复添加;BACK权限模式下,router.addRoute添加两次的问题
This commit is contained in:
@@ -1,7 +1,5 @@
|
|||||||
import { adminMenus } from '@/api/system/menu';
|
import { adminMenus } from '@/api/system/menu';
|
||||||
import { constantRouterIcon } from './router-icons';
|
import { constantRouterIcon } from './router-icons';
|
||||||
import router from '@/router/index';
|
|
||||||
import { constantRouter } from '@/router/index';
|
|
||||||
import { RouteRecordRaw } from 'vue-router';
|
import { RouteRecordRaw } from 'vue-router';
|
||||||
import { Layout, ParentLayout } from '@/router/constant';
|
import { Layout, ParentLayout } from '@/router/constant';
|
||||||
import type { AppRouteRecordRaw } from '@/router/types';
|
import type { AppRouteRecordRaw } from '@/router/types';
|
||||||
@@ -61,11 +59,8 @@ export const generatorDynamicRouter = (): Promise<RouteRecordRaw[]> => {
|
|||||||
.then((result) => {
|
.then((result) => {
|
||||||
const routeList = routerGenerator(result);
|
const routeList = routerGenerator(result);
|
||||||
asyncImportRoute(routeList);
|
asyncImportRoute(routeList);
|
||||||
const asyncRoutesList = [...routeList, ...constantRouter];
|
|
||||||
asyncRoutesList.forEach((item) => {
|
resolve(routeList);
|
||||||
router.addRoute(item);
|
|
||||||
});
|
|
||||||
resolve(asyncRoutesList);
|
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
reject(err);
|
reject(err);
|
||||||
|
|||||||
@@ -107,7 +107,7 @@ export const useAsyncRouteStore = defineStore({
|
|||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
//过滤账户是否拥有某一个权限,并将菜单从加载列表移除
|
//过滤账户是否拥有某一个权限,并将菜单从加载列表移除
|
||||||
accessedRouters = filter([...asyncRoutes, ...constantRouter], routeFilter);
|
accessedRouters = filter(asyncRoutes, routeFilter);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log(error);
|
console.log(error);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user