@bams-app/router 0.1.3 → 0.2.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bams-app/router",
-  "version": "0.1.3",
+  "version": "0.2.0-beta.1",
   "private": false,
   "type": "module",
   "main": "src/index.js",
@@ -14,10 +14,10 @@
     "vue-router": "^4.0.0"
   },
   "dependencies": {
-    "@bams-app/api-model": "^0.1.3",
-    "@bams-app/app-layout": "^0.1.3",
-    "@bams-app/store": "^0.1.3",
-    "@bams-app/utils": "^0.1.3",
+    "@bams-app/api-model": "^0.2.0-beta.1",
+    "@bams-app/app-layout": "^0.2.0-beta.1",
+    "@bams-app/store": "^0.2.0-beta.1",
+    "@bams-app/utils": "^0.2.0-beta.1",
     "axios": "^1.13.2"
   },
   "devDependencies": {

package/src/components/LoginMiddleware.vue

@@ -65,7 +65,7 @@
   };
 
   onMounted(async () => {
-    const { sessionId, token, menuType, accountId, redirect, sysCode } = route.query;
+    const { sessionId, token, menuType, accountId, corpCode, redirect, sysCode } = route.query;
 
     // 1. 如果已经登录（登录组件已在本页建立会话），直接回跳，
     // 避免再次调用 getAccountData，同时避免二次请求失败时把已建立的会话清掉
@@ -108,6 +108,7 @@
         sessionId,
         menuType,
         accountId: userData.accountId || accountId,
+        corpCode: userData.corpCode || corpCode,
         role: "user",
         permissionMap: {},
         data: userData,

package/src/components/NotFound/index.vue

@@ -1,21 +1,32 @@
 <template>
   <div class="not-found-container">
-    <a-result status="404" title="404" :sub-title="subTitle">
-      <template #extra>
-        <a-button @click="goBack">返回上一步</a-button>
-        <a-button type="primary" @click="goHome">{{ backButtonText }}</a-button>
-      </template>
-    </a-result>
+    <!-- 顶层错误页不在 work 布局内，复用可配置 Header 组件提供退出登录等入口；
+         系统被嵌入 iframe 时由外层系统承载头部，这里不再重复显示 -->
+    <HeaderComponent v-if="!isInIframe" :show-toggle-icon="false" />
+    <div class="not-found-body">
+      <a-result status="404" title="404" :sub-title="subTitle">
+        <template #extra>
+          <a-button @click="goBack">返回上一步</a-button>
+          <a-button type="primary" @click="goHome">{{ backButtonText }}</a-button>
+        </template>
+      </a-result>
+    </div>
   </div>
 </template>
 
 <script setup>
   import { computed } from "vue";
   import { useRoute, useRouter } from "vue-router";
+  import { env } from "@bams-app/utils";
+  // 编译阶段根据环境变量通过通用插槽别名选择组件
+  import HeaderComponent from "@configurable/header";
 
   const route = useRoute();
   const router = useRouter();
 
+  // 当前系统是否被宿主以 iframe 方式嵌入，被嵌入时头部由外层系统承载
+  const isInIframe = env.isInIframe();
+
   const fromPath = computed(() => (typeof route.query.from === "string" ? route.query.from : ""));
   const notFoundPath = computed(() => fromPath.value || route.fullPath);
   const subTitle = computed(() => `抱歉，您访问的页面不存在。访问地址：${notFoundPath.value}`);
@@ -46,8 +57,15 @@
   .not-found-container {
     height: 100%;
     display: flex;
+    flex-direction: column;
+    background-color: var(--bams-page-bg);
+  }
+
+  .not-found-body {
+    flex: 1;
+    min-height: 0;
+    display: flex;
     align-items: center;
     justify-content: center;
-    background-color: var(--bams-page-bg);
   }
 </style>

package/src/components/SystemError/index.vue

@@ -1,21 +1,33 @@
 <template>
   <div class="system-error-container">
-    <a-result status="error" title="系统错误" :sub-title="subTitle">
-      <template #extra>
-        <a-button @click="goBack">返回上一步</a-button>
-        <a-button type="primary" @click="goHome">{{ backButtonText }}</a-button>
-      </template>
-    </a-result>
+    <!-- 顶层错误页不在 work 布局内，复用可配置 Header 组件提供退出登录等入口；
+         系统被嵌入 iframe 时由外层系统承载头部，这里不再重复显示 -->
+    <HeaderComponent v-if="!isInIframe" :show-toggle-icon="false" />
+    <div class="system-error-body">
+      <a-result status="error" title="系统错误" :sub-title="subTitle">
+        <template #extra>
+          <a-button @click="goBack">返回上一步</a-button>
+          <a-button @click="retry">重试</a-button>
+          <a-button type="primary" @click="goHome">{{ backButtonText }}</a-button>
+        </template>
+      </a-result>
+    </div>
   </div>
 </template>
 
 <script setup>
   import { computed } from "vue";
   import { useRoute, useRouter } from "vue-router";
+  import { env } from "@bams-app/utils";
+  // 编译阶段根据环境变量通过通用插槽别名选择组件
+  import HeaderComponent from "@configurable/header";
 
   const route = useRoute();
   const router = useRouter();
 
+  // 当前系统是否被宿主以 iframe 方式嵌入，被嵌入时头部由外层系统承载
+  const isInIframe = env.isInIframe();
+
   const errorSource = computed(() => (typeof route.query.source === "string" ? route.query.source : ""));
   const errorMessage = computed(() => (typeof route.query.message === "string" ? route.query.message : ""));
   const fromPath = computed(() => (typeof route.query.from === "string" ? route.query.from : ""));
@@ -29,6 +41,11 @@
   const isFromWork = computed(() => fromPath.value.includes("/work/"));
   const backButtonText = computed(() => (isFromWork.value ? "回到系统首页" : "返回首页"));
 
+  // 重试：回到失败前的地址，由路由守卫重新拉取菜单并注册路由
+  const retry = () => {
+    window.location.replace(router.resolve(fromPath.value || "/").href);
+  };
+
   const goHome = () => {
     let targetPath = "/";
     if (isFromWork.value) {
@@ -53,8 +70,15 @@
   .system-error-container {
     height: 100%;
     display: flex;
+    flex-direction: column;
+    background-color: var(--bams-page-bg);
+  }
+
+  .system-error-body {
+    flex: 1;
+    min-height: 0;
+    display: flex;
     align-items: center;
     justify-content: center;
-    background-color: var(--bams-page-bg);
   }
 </style>

package/src/createRoutes.js

@@ -84,12 +84,16 @@ export default function createRoutes(workLayout = undefined, routes = [], appCon
     {
       path: "/404",
       name: "404",
-      component: NotFound
+      component: NotFound,
+      // 错误页不作为登录后的回跳目标（routerController 未登录分支据此回跳首页），
+      // 否则从错误页退出后重新登录会被再次带回错误页
+      meta: { isErrorPage: true }
     },
     {
       path: "/500",
       name: "500",
-      component: SystemError
+      component: SystemError,
+      meta: { isErrorPage: true }
     },
     ...routes
   ];

package/src/routerController.js

@@ -1,6 +1,6 @@
 import { hasRoute, registerRoutes, registerRoutesByMenu, toNoPermissionOrNotFound, DEFAULT_HOME } from "./registerRoutes.js";
 import { useUserStore, useMenuStore } from "@bams-app/store";
-import { auth, url } from "@bams-app/utils";
+import { auth } from "@bams-app/utils";
 
 const allowList = ["login", "register"];
 const loginRoutePath = "/login";
@@ -30,11 +30,23 @@ export default async function routerController(to, from, next) {
     // 2. 未登录时，仅允许访问匿名路由，其余统一跳转登录页
     const isAllowAnonymousRoute = allowList.includes(to.name) || to.meta?.allowAnonymous || to.path === loginRoutePath || pathWhiteList.some(path => to.path.includes(path));
     if (!userStore.checkLogin() && !isAllowAnonymousRoute) {
+        // 错误页（/404、/500）不作为登录后的回跳目标：从错误页退出后重新登录若回到错误页，
+        // 用户会再次看到错误页，故统一回跳应用首页（resolve 会自动带上 BASE_URL 前缀）
+        const callbackPath = to.meta?.isErrorPage ? router.resolve("/").href : to.href;
+        // 配置了第三方登录地址时整页跳转过去，由第三方登录成功后携带 token 回跳 callback_url，
+        // 再由 /auth/login 中间件消费 token 建立本地会话；未配置时保持原有本地登录页跳转
+        if (auth.isExternalLoginPage()) {
+            // callbackPath 是带 base 的路径（不含 origin），第三方登录页可能在其他域名，
+            // 必须补全为绝对地址，否则第三方会把它当相对路径拼到自己域名下，登录后跳错站点
+            const callbackUrl = new URL(callbackPath, window.location.origin).toString();
+            auth.redirectToLoginPage({ callbackPath: callbackUrl });
+            return;
+        }
         next({
             path: loginRoutePath,
             query: {
                 sysCode: auth.getSysCode(),
-                callback_url: to.href
+                callback_url: callbackPath
             }
         });
         return;