|
@@ -62,7 +62,11 @@ export function createPermissionGuard(router: Router) {
|
|
}
|
|
}
|
|
|
|
|
|
// 如果符合自动登录的相关条件则直接执行自动登录,覆盖原有的登录信息
|
|
// 如果符合自动登录的相关条件则直接执行自动登录,覆盖原有的登录信息
|
|
- await doAutoLogin(to);
|
|
|
|
|
|
+ const logged = await doAutoLogin(to);
|
|
|
|
+ if (logged) {
|
|
|
|
+ // 自动登录后会动态添加路由,此处应当重定向到fullPath,否则会加载404页面内容
|
|
|
|
+ return { path: to.fullPath, replace: true, query: to.query };
|
|
|
|
+ }
|
|
|
|
|
|
const token = userStore.getToken;
|
|
const token = userStore.getToken;
|
|
|
|
|
|
@@ -95,7 +99,6 @@ export function createPermissionGuard(router: Router) {
|
|
///
|
|
///
|
|
|
|
|
|
//update-end---author:wangshuai ---date:20230224 for:[QQYUN-3440]新建企业微信和钉钉配置表,通过租户模式隔离------------
|
|
//update-end---author:wangshuai ---date:20230224 for:[QQYUN-3440]新建企业微信和钉钉配置表,通过租户模式隔离------------
|
|
- return true;
|
|
|
|
//update-end---author:wangshuai ---date:20220629 for:[issues/I5BG1I]vue3不支持auth2登录------------
|
|
//update-end---author:wangshuai ---date:20220629 for:[issues/I5BG1I]vue3不支持auth2登录------------
|
|
}
|
|
}
|
|
document.title = to.meta.title;
|
|
document.title = to.meta.title;
|
|
@@ -222,12 +225,13 @@ export function createPermissionGuard(router: Router) {
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
if (permissionStore.getIsDynamicAddedRoute) {
|
|
if (permissionStore.getIsDynamicAddedRoute) {
|
|
- // mountMicroApp(to.path);
|
|
|
|
document.title = to.meta.title;
|
|
document.title = to.meta.title;
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ // 如果没有在登录时正确的添加动态路由,则在守卫里添加下
|
|
const routes = await permissionStore.buildRoutesAction();
|
|
const routes = await permissionStore.buildRoutesAction();
|
|
|
|
|
|
routes.forEach((route) => {
|
|
routes.forEach((route) => {
|
|
@@ -240,6 +244,7 @@ export function createPermissionGuard(router: Router) {
|
|
permissionStore.setDynamicAddedRoute(true);
|
|
permissionStore.setDynamicAddedRoute(true);
|
|
|
|
|
|
if (to.name === PAGE_NOT_FOUND_ROUTE.name) {
|
|
if (to.name === PAGE_NOT_FOUND_ROUTE.name) {
|
|
|
|
+ // mountMicroApp(to.path);
|
|
// 动态添加路由后,此处应当重定向到fullPath,否则会加载404页面内容
|
|
// 动态添加路由后,此处应当重定向到fullPath,否则会加载404页面内容
|
|
return { path: to.fullPath, replace: true, query: to.query };
|
|
return { path: to.fullPath, replace: true, query: to.query };
|
|
} else {
|
|
} else {
|