hrp-ui-base 1.4.5 → 1.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hrp-ui-base",
-  "version": "1.4.5",
+  "version": "1.4.6",
   "description": "HRP 前端公共组件、工具方法和基础样式包",
   "type": "module",
   "sideEffects": [

package/packages/approval-process/package.json

@@ -11,7 +11,7 @@
   "devDependencies": {},
   "module": "index.ts",
   "peerDependencies": {
-    "hrp-ui-base": "1.4.4",
+    "hrp-ui-base": "1.4.6",
     "vue": "^3.0.0"
   }
 }

package/src/components/layout/LayoutContainer.vue

@@ -110,7 +110,7 @@ import type { TabsOptions } from "./stores/useLayoutTabsStore";
 import type HomeMenu from "../../api/bms/home/bo/HomeMenu";
 import type NoticeVO from "../../api/notice/bo/NoticeVO";
 import { ElNotification, ElMessage } from "element-plus";
-import { navigateByDomainRoute } from "./utils/redirect";
+import { navigateByDomainRoute, navigateToPmsAuthRoute } from "./utils/redirect";
 
 defineOptions({ name: "LayoutContainer" });
 
@@ -291,8 +291,8 @@ const handleMessageNavigate = async (notice: NoticeVO) => {
   updateNum.value += 1;
   if (notice.noticeType === "file-notice") return;
   if (!notice.urlRoute) return;
-  if (notice.urlRoute.startsWith("/project/") && options?.onCrossAppNavigate) {
-    options.onCrossAppNavigate(notice.urlRoute);
+  if (notice.urlRoute.startsWith("/project/")) {
+    navigateToPmsAuthRoute(notice.urlRoute);
   } else {
     await navigateByDomainRoute(notice.urlRoute, router);
   }
@@ -419,8 +419,8 @@ const showNoticeNotification = async (notice: NoticeVO) => {
       if (options?.onFileDownload) {
         options.onFileDownload(notice);
       }
-    } else if (notice.urlRoute?.startsWith("/project/") && options?.onCrossAppNavigate) {
-      options.onCrossAppNavigate(notice.urlRoute);
+    } else if (notice.urlRoute?.startsWith("/project/")) {
+      navigateToPmsAuthRoute(notice.urlRoute);
     } else {
       await navigateByDomainRoute(notice.urlRoute, router);
     }

package/src/components/layout/utils/redirect.ts

@@ -9,6 +9,7 @@ const menuStateRelation: Record<string, string> = {
   scm: "scm",
   bms: "bms",
   coc: "coc",
+  pms: "pms",
   hws: "hws",
   kbs: "kbs",
   fms: "fms",
@@ -51,9 +52,15 @@ export const getLayoutBasePath = () => {
 
   const parts = pathname.split("/").filter(Boolean);
   const knownDomainIds = getKnownDomainIds();
-  const lastPart = parts[parts.length - 1];
-  if (lastPart && knownDomainIds.includes(lastPart)) {
-    return normalizeBasePath(`/${parts.slice(0, -1).join("/")}`);
+  let domainIndex = -1;
+  for (let i = parts.length - 1; i >= 0; i--) {
+    if (knownDomainIds.includes(parts[i])) {
+      domainIndex = i;
+      break;
+    }
+  }
+  if (domainIndex !== -1) {
+    return normalizeBasePath(`/${parts.slice(0, domainIndex).join("/")}`);
   }
 
   return normalizeBasePath(pathname.replace(/\/$/, ""));
@@ -97,6 +104,23 @@ export const getDomainRedirectUrl = (urlRoute: string) => {
   return `${originBase}/${domainId}/#${routePath}`;
 };
 
+export const buildPmsAuthUrl = (urlRoute: string) => {
+  const routePath = normalizeRoutePath(urlRoute);
+  const projectId = routePath.match(/^\/project\/([^/]+)/)?.[1] || "";
+  const token = localStorage.getItem("TOKEN") || "";
+  const pmsBase = import.meta.env.DEV
+    ? `${window.location.protocol}//${window.location.hostname}:5191`
+    : `${window.location.origin}${getLayoutBasePath()}/pms`;
+
+  return `${pmsBase}/#/auth?projectId=${projectId}&token=${encodeURIComponent(token)}&returnUrl=${encodeURIComponent(routePath)}`;
+};
+
+export const navigateToPmsAuthRoute = (urlRoute: string) => {
+  const targetUrl = buildPmsAuthUrl(urlRoute);
+  if (!targetUrl) return;
+  window.open(targetUrl, "_blank");
+};
+
 const isSameAppUrl = (targetUrl: string) => {
   const target = new URL(targetUrl, window.location.origin);
   const currentPath = window.location.pathname.replace(/\/$/, "");
@@ -118,4 +142,3 @@ export const navigateByDomainRoute = async (urlRoute: string, router?: any) => {
 
   window.location.href = targetUrl;
 };
-