xto-fronted 0.6.2 → 0.6.3

package/dist/index.js

@@ -1,5 +1,5 @@
-import { F as a, c as t, G as o, d as r, e as n, H as u, L as i, i as p, M as l, b as T, f as d, g, h as R, S as c, a as h, j as k, T as f, k as S, l as U, m, n as A, o as M, p as y, q as x, r as L, s as C, t as D, u as b, v as I, w as B, x as F, y as G, z as E, A as P, B as O, C as v, D as w, E as H, I as N, J as j, K as q, N as z } from "./index-Dpv33ZXi.js";
-import { K, b as X, A as Q, c as V, a as W, d as Y, e as Z, f as _, g as $, G as ee, D as se, E as ae, C as te, L as oe, h as re, i as ne, M as ue, N as ie, j as pe, k as le, y as Te, O as de, P as ge, l as Re, m as ce, n as he, z as ke, Q as fe, I as Se, R as Ue, F as me, x as Ae, S as Me, o as ye, p as xe, r as Le, q as Ce, T as De, U as be, H as Ie, J as Be, V as Fe, W as Ge, X as Ee, Y as Pe, Z as Oe, B as ve, _ as we, u as He, s as Ne, t as je, v as qe, w as ze } from "./user-ChcAx-5W.js";
+import { F as a, c as t, G as o, d as r, e as n, H as u, L as i, i as p, M as l, b as T, f as d, g, h as R, S as c, a as h, j as k, T as f, k as S, l as U, m, n as A, o as M, p as y, q as x, r as L, s as C, t as D, u as b, v as I, w as B, x as F, y as G, z as E, A as P, B as O, C as v, D as w, E as H, I as N, J as j, K as q, N as z } from "./index-IOKG7Gwo.js";
+import { K, b as X, B as Q, c as V, a as W, d as Y, e as Z, f as _, g as $, G as ee, y as se, E as ae, D as te, L as oe, h as re, i as ne, M as ue, N as ie, j as pe, k as le, z as Te, O as de, P as ge, l as Re, m as ce, n as he, A as ke, Q as fe, I as Se, R as Ue, F as me, x as Ae, S as Me, o as ye, p as xe, r as Le, q as Ce, T as De, U as be, H as Ie, J as Be, V as Fe, W as Ge, X as Ee, Y as Pe, Z as Oe, C as ve, _ as we, u as He, s as Ne, t as je, v as qe, w as ze } from "./user-77I_qZ8j.js";
 export {
   a as Footer,
   t as Forbidden,

package/dist/{user-ChcAx-5W.js → user-77I_qZ8j.js}

@@ -1130,10 +1130,10 @@ function st(l) {
   return F.post(`/user/${l}/reset-password`);
 }
 export {
-  Ue as A,
-  Tr as B,
-  br as C,
-  Ar as D,
+  Sr as A,
+  Ue as B,
+  Tr as C,
+  br as D,
   jr as E,
   Lr as F,
   Fr as G,
@@ -1181,6 +1181,6 @@ export {
   tt as v,
   ot as w,
   K as x,
-  ze as y,
-  Sr as z
+  Ar as y,
+  ze as z
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xto-fronted",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "private": false,
   "type": "module",
   "description": "XTO 前端应用框架",

package/src/router/guards.ts

@@ -73,7 +73,18 @@ export function setupRouterGuards(router: Router, options: RouterGuardOptions =
       } else {
         // 检查是否已获取用户信息
         if (userStore.isLoggedIn) {
-          // 已有用户信息，直接放行
+          // 已有用户信息，直接放行；但当前应用菜单为空时（跨应用共享 localStorage 场景）补拉菜单
+          if (!menuStore.hasMenu) {
+            try {
+              const menuList = options.fetchMenu
+                ? await options.fetchMenu()
+                : await getMenuTree(options.appId)
+              menuStore.setMenuList(menuList)
+            } catch (error) {
+              // 菜单拉取失败不影响页面访问，仅记录日志
+              console.warn('补拉菜单失败:', error)
+            }
+          }
           // 添加缓存页面
           if (to.name && to.meta.keepAlive) {
             appStore.addCachedView(to.name as string)

package/src/stores/menu.ts

@@ -6,10 +6,19 @@ import { defineStore } from 'pinia'
 import { ref, computed } from 'vue'
 import type { MenuItem } from '@/types/api'
 import { local } from '@/utils/storage'
+import { getAppId } from '@/utils/config'
 
 const MENU_LIST_KEY = 'menu_list'
 const PERMISSION_LIST_KEY = 'permission_list'
 
+/**
+ * 菜单存储 key 按应用隔离：
+ * 多个前端部署在同一域名下（如 appli.tooyu.service/portal、/tangyang）共享 localStorage，
+ * 固定 key 会导致 A 应用的菜单被 B 应用复用，必须加 appId 命名空间
+ */
+const menuListKey = () => `${MENU_LIST_KEY}_${getAppId()}`
+const permissionListKey = () => `${PERMISSION_LIST_KEY}_${getAppId()}`
+
 // 首页菜单（参考 tineco-ui）
 const indexMenu: MenuItem = {
   menuCode: 'home',
@@ -62,9 +71,9 @@ function extractPermissions(menus: MenuItem[]): string[] {
 
 export const useMenuStore = defineStore('menu', () => {
   // 状态
-  const menuList = ref<MenuItem[]>(local.get<MenuItem[]>(MENU_LIST_KEY) || [])
+  const menuList = ref<MenuItem[]>(local.get<MenuItem[]>(menuListKey()) || [])
   // 功能权限列表
-  const permissions = ref<string[]>(local.get<string[]>(PERMISSION_LIST_KEY) || [])
+  const permissions = ref<string[]>(local.get<string[]>(permissionListKey()) || [])
 
   // 计算属性
   const hasMenu = computed(() => menuList.value.length > 0)
@@ -73,22 +82,22 @@ export const useMenuStore = defineStore('menu', () => {
   const setMenuList = (menus: MenuItem[]) => {
     // 提取功能权限
     permissions.value = extractPermissions(menus)
-    local.set(PERMISSION_LIST_KEY, permissions.value)
+    local.set(permissionListKey(), permissions.value)
 
     // 过滤菜单，只保留菜单项（type !== 1）
     const filteredMenus = filterMenus(menus)
 
     // 添加首页菜单到开头
     menuList.value = [indexMenu, ...filteredMenus]
-    local.set(MENU_LIST_KEY, menuList.value)
+    local.set(menuListKey(), menuList.value)
   }
 
   // 清除菜单
   const clearMenu = () => {
     menuList.value = []
     permissions.value = []
-    local.remove(MENU_LIST_KEY)
-    local.remove(PERMISSION_LIST_KEY)
+    local.remove(menuListKey())
+    local.remove(permissionListKey())
   }
 
   // 检查是否有某个权限