GTsoft/ruoyi-plus-soybean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(projects): fix routes data when role is change. fixed #391

Browse Source
This commit is contained in:
Soybean 2024-04-24 00:47:58 +08:00
parent 79d9c5143a
commit cb83d6d90d
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/store/modules/route/index.ts
View File

@ -52,6 +52,19 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => {
routeHome.value = routeKey; routeHome.value = routeKey;
} }
/** constant routes */
const constantRoutes = shallowRef<ElegantConstRoute[]>([]);
function addConstantRoutes(routes: ElegantConstRoute[]) {
const constantRoutesMap = new Map(constantRoutes.value.map(route => [route.name, route]));
routes.forEach(route => {
constantRoutesMap.set(route.name, route);
});
constantRoutes.value = Array.from(constantRoutesMap.values());
}
/** auth routes */ /** auth routes */
const authRoutes = shallowRef<ElegantConstRoute[]>([]); const authRoutes = shallowRef<ElegantConstRoute[]>([]);
@ -167,18 +180,18 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => {
if (isInitConstantRoute.value) return; if (isInitConstantRoute.value) return;
if (authRouteMode.value === 'static') { if (authRouteMode.value === 'static') {
const { constantRoutes } = createStaticRoutes(); const staticRoute = createStaticRoutes();
addAuthRoutes(constantRoutes); addConstantRoutes(staticRoute.constantRoutes);
} else { } else {
const { data, error } = await fetchGetConstantRoutes(); const { data, error } = await fetchGetConstantRoutes();
if (!error) { if (!error) {
addAuthRoutes(data); addConstantRoutes(data);
} }
} }
handleAuthRoutes(); handleConstantAndAuthRoutes();
setIsInitConstantRoute(true); setIsInitConstantRoute(true);
} }
@ -206,7 +219,7 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => {
addAuthRoutes(filteredAuthRoutes); addAuthRoutes(filteredAuthRoutes);
} }
handleAuthRoutes(); handleConstantAndAuthRoutes();
setIsInitAuthRoute(true); setIsInitAuthRoute(true);
} }
@ -220,7 +233,7 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => {
addAuthRoutes(routes); addAuthRoutes(routes);
handleAuthRoutes(); handleConstantAndAuthRoutes();
setRouteHome(home); setRouteHome(home);
@ -230,9 +243,11 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => {
} }
} }
/** handle auth routes */ /** handle constant and auth routes */
function handleAuthRoutes() { function handleConstantAndAuthRoutes() {
const sortRoutes = sortRoutesByOrder(authRoutes.value); const allRoutes = [...constantRoutes.value, ...authRoutes.value];
const sortRoutes = sortRoutesByOrder(allRoutes);
const vueRoutes = getAuthVueRoutes(sortRoutes); const vueRoutes = getAuthVueRoutes(sortRoutes);