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

fix(projects): fix login redirect

Browse Source
This commit is contained in:
Soybean 2024-08-23 10:50:03 +08:00
parent ef6cf93d96
commit 3830ec7a69
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/hooks/common/router.ts
View File

@ -93,11 +93,15 @@ export function useRouterPush(inSetup = true) {
return routerPushByKey('login', { query, params: { module } }); return routerPushByKey('login', { query, params: { module } });
} }
/** Redirect from login */ /**
async function redirectFromLogin() { * Redirect from login
*
* @param [needRedirect=true] Whether to redirect after login. Default is `true`
*/
async function redirectFromLogin(needRedirect = true) {
const redirect = route.value.query?.redirect as string; const redirect = route.value.query?.redirect as string;
if (redirect) { if (needRedirect && redirect) {
routerPush(redirect); routerPush(redirect);
} else { } else {
toHome(); toHome();

4
src/store/modules/auth/index.ts
View File

@ -71,9 +71,7 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
if (pass) { if (pass) {
await routeStore.initAuthRoute(); await routeStore.initAuthRoute();
if (redirect) { await redirectFromLogin(redirect);
await redirectFromLogin();
}
if (routeStore.isInitAuthRoute) { if (routeStore.isInitAuthRoute) {
window.$notification?.success({ window.$notification?.success({