hrp-ui-base 1.3.7 → 1.4.0

package/package.json

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

package/packages/approval-process/package.json

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

package/src/components/layout/ApprovalCenterDrawer.vue

@@ -79,8 +79,8 @@ import { ref, watch, inject } from "vue";
 import FlowInstanceController from "../../api/bms/flow/FlowInstanceController";
 import type AssociatedApprovalVO from "../../api/bms/flow/bo/AssociatedApprovalVO";
 import TableQueryCriteriaVO from "../../api/common/TableQueryCriteriaVO";
-import { useLayoutMenuStore } from "./stores/useLayoutMenuStore";
 import { LAYOUT_ROUTER_KEY } from "./plugin";
+import { navigateByDomainRoute } from "./utils/redirect";
 
 // 默认头像 - 使用一个简单的 SVG data URI
 const defaultAvatar = "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32'%3E%3Ccircle cx='16' cy='16' r='16' fill='%23e0e0e0'/%3E%3Ccircle cx='16' cy='12' r='5' fill='%23fff'/%3E%3Cpath d='M6 28c0-5.5 4.5-10 10-10s10 4.5 10 10' fill='%23fff'/%3E%3C/svg%3E";
@@ -94,7 +94,6 @@ const emit = defineEmits<{
 }>();
 
 const router = inject<any>(LAYOUT_ROUTER_KEY);
-const menuStore = useLayoutMenuStore();
 
 const drawerVisible = ref(false);
 const loading = ref(false);
@@ -152,11 +151,7 @@ const handlePageChange = () => {
 /** 跳转到审批详情页 */
 const gotoRelatedPage = async (item: AssociatedApprovalVO) => {
   if (!item.approveUrl) return;
-  // 跨系统判断
-  if (item.funSystem && item.funSystem !== localStorage.getItem("current-application-id")) {
-    await menuStore.getDomainAndHomeMenu(item.approveUrl, router);
-  }
-  router?.push(item.approveUrl);
+  await navigateByDomainRoute(item.approveUrl, router);
   emit("update:visible", false);
 };
 </script>

package/src/components/layout/LayoutContainer.vue

@@ -110,6 +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";
 
 defineOptions({ name: "LayoutContainer" });
 
@@ -287,10 +288,11 @@ const handleMessageNavigate = async (notice: NoticeVO) => {
   await noticeStore.readNoticeInfo(notice.noticeId);
   await noticeStore.getNoReadNoticeCount();
   updateNum.value += 1;
-  if (notice.urlRoute.startsWith("/project/")) {
-    options?.onCrossAppNavigate?.(notice.urlRoute);
+  if (!notice.urlRoute) return;
+  if (notice.urlRoute.startsWith("/project/") && options?.onCrossAppNavigate) {
+    options.onCrossAppNavigate(notice.urlRoute);
   } else {
-    await router?.push(buildRouteLocation(notice.urlRoute));
+    await navigateByDomainRoute(notice.urlRoute, router);
   }
 };
 
@@ -298,7 +300,11 @@ const handleMessageDownload = async (notice: NoticeVO) => {
   await noticeStore.readNoticeInfo(notice.noticeId);
   await noticeStore.getNoReadNoticeCount();
   updateNum.value += 1;
-  options?.onFileDownload?.(notice);
+  if (options?.onFileDownload) {
+    options.onFileDownload(notice);
+  } else {
+    await navigateByDomainRoute("/bms/base-manage/base-information/export-center", router);
+  }
 };
 
 const handleMessageUpdateCount = async () => {
@@ -410,11 +416,15 @@ const showNoticeNotification = async (notice: NoticeVO) => {
     await noticeStore.getNoReadNoticeCount();
     updateNum.value += 1;
     if (notice.noticeType === "file-notice") {
-      options?.onFileDownload?.(notice);
-    } else if (notice.urlRoute.startsWith("/project/")) {
-      options?.onCrossAppNavigate?.(notice.urlRoute);
+      if (options?.onFileDownload) {
+        options.onFileDownload(notice);
+      } else {
+        await navigateByDomainRoute("/bms/base-manage/base-information/export-center", router);
+      }
+    } else if (notice.urlRoute?.startsWith("/project/") && options?.onCrossAppNavigate) {
+      options.onCrossAppNavigate(notice.urlRoute);
     } else {
-      await router?.push(buildRouteLocation(notice.urlRoute));
+      await navigateByDomainRoute(notice.urlRoute, router);
     }
     closeNotification();
   };
@@ -455,18 +465,6 @@ const showNoticeNotification = async (notice: NoticeVO) => {
   updateNum.value += 1;
 };
 
-// ====== 辅助函数 ======
-const buildRouteLocation = (urlRoute: string) => {
-  const [path, search] = urlRoute.split("?");
-  const query: Record<string, string> = {};
-  if (search) {
-    new URLSearchParams(search).forEach((value, key) => {
-      query[key] = value;
-    });
-  }
-  return { path: path || "/", query };
-};
-
 // ====== 生命周期 ======
 onMounted(async () => {
   // 初始化用户配置

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

@@ -0,0 +1,120 @@
+/**
+ * Layout cross-system route redirect helpers.
+ * Mirrors ui-hrp-entry/public/utils/redirect.js for runtime layout components.
+ */
+
+const menuStateRelation: Record<string, string> = {
+  imd: "imd",
+  agoal: "agoal",
+  scm: "scm",
+  bms: "bms",
+  coc: "coc",
+  hws: "hws",
+  fms: "fms",
+  hrm: "hrm",
+  hrms: "hrms",
+  itr: "itrms",
+  personalization: "imd",
+  projectManagement: "projectManagement",
+};
+
+const loginPaths = ["/auth-login", "/oa-login", "/login"];
+
+const normalizeBasePath = (path: string) => {
+  if (!path || path === "/") return "";
+  return path.endsWith("/") ? path.slice(0, -1) : path;
+};
+
+const getKnownDomainIds = () => {
+  return Array.from(new Set(Object.values(menuStateRelation)));
+};
+
+/**
+ * Get deploy base path before app segment.
+ *
+ * Examples:
+ * - /login -> ""
+ * - /hrp/login -> /hrp
+ * - /hws/ -> ""
+ * - /hrp/hws/ -> /hrp
+ */
+export const getLayoutBasePath = () => {
+  const pathname = window.location.pathname || "/";
+
+  for (const loginPath of loginPaths) {
+    const idx = pathname.indexOf(loginPath);
+    if (idx !== -1) {
+      return normalizeBasePath(pathname.substring(0, idx));
+    }
+  }
+
+  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("/")}`);
+  }
+
+  return normalizeBasePath(pathname.replace(/\/$/, ""));
+};
+
+export const normalizeRoutePath = (urlRoute: string) => {
+  if (!urlRoute) return "";
+  if (/^https?:\/\//i.test(urlRoute)) return urlRoute;
+
+  const [path = "", search = ""] = urlRoute.split("?");
+  const normalizedPath = path.startsWith("/") ? path : `/${path}`;
+  return search ? `${normalizedPath}?${search}` : normalizedPath;
+};
+
+export const buildRouteLocation = (urlRoute: string) => {
+  const routePath = normalizeRoutePath(urlRoute);
+  const [path, search] = routePath.split("?");
+  const query: Record<string, string> = {};
+  if (search) {
+    new URLSearchParams(search).forEach((value, key) => {
+      query[key] = value;
+    });
+  }
+  return { path: path || "/", query };
+};
+
+export const getDomainRedirectUrl = (urlRoute: string) => {
+  const routePath = normalizeRoutePath(urlRoute);
+  if (!routePath) return "";
+  if (/^https?:\/\//i.test(routePath)) return routePath;
+
+  const cleaned = routePath.replace(/^\/+/, "");
+  const firstValue = cleaned.split("/")[0] || "";
+  const basePath = getLayoutBasePath();
+  const domainId = menuStateRelation[firstValue];
+  const originBase = `${window.location.origin}${basePath}`;
+
+  if (domainId === "bms" || !domainId) {
+    return `${originBase}/#${routePath}`;
+  }
+  return `${originBase}/${domainId}/#${routePath}`;
+};
+
+const isSameAppUrl = (targetUrl: string) => {
+  const target = new URL(targetUrl, window.location.origin);
+  const currentPath = window.location.pathname.replace(/\/$/, "");
+  const targetPath = target.pathname.replace(/\/$/, "");
+  return target.origin === window.location.origin && targetPath === currentPath;
+};
+
+export const navigateByDomainRoute = async (urlRoute: string, router?: any) => {
+  const routePath = normalizeRoutePath(urlRoute);
+  if (!routePath) return;
+
+  const targetUrl = getDomainRedirectUrl(routePath);
+  if (!targetUrl) return;
+
+  if (router && isSameAppUrl(targetUrl)) {
+    await router.push(buildRouteLocation(routePath));
+    return;
+  }
+
+  window.location.href = targetUrl;
+};
+