xto-fronted 0.4.99 → 0.4.101

package/package.json

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

package/src/components/Layout/Sidebar.vue

@@ -36,25 +36,44 @@ const displayMenuList = computed(() => props.menuList.length > 0 ? props.menuLis
 const isCollapsed = computed(() => appStore.isCollapsed)
 const activeMenu = computed(() => route.path)
 
-// 菜单展开状态持久化
+// 获取菜单的唯一标识（优先使用 menuId，其次 menuCode，最后 menuUrl）
+const getMenuKey = (menu: any): string => {
+  return menu.menuId || menu.menuCode || menu.menuUrl || ''
+}
+
+// 菜单展开状态持久化（基于当前菜单列表的标识）
 const OPENED_MENUS_KEY = 'sidebar_opened_menus'
-const openedMenus = ref<string[]>(local.get<string[]>(OPENED_MENUS_KEY) || [])
+const MENU_LIST_KEY = 'sidebar_menu_list_key'
+
+// 获取当前菜单列表的唯一标识
+const getCurrentMenuListKey = (): string => {
+  return displayMenuList.value.map(getMenuKey).join(',')
+}
+
+// 初始化展开状态：只有当菜单列表相同时才恢复之前的展开状态
+const savedMenuListKey = local.get<string>(MENU_LIST_KEY) || ''
+const currentKey = getCurrentMenuListKey()
+const initialOpenedMenus = savedMenuListKey === currentKey
+  ? (local.get<string[]>(OPENED_MENUS_KEY) || [])
+  : []
+const openedMenus = ref<string[]>(initialOpenedMenus)
 
 // 监听变化并持久化
 watch(openedMenus, (val) => {
   local.set(OPENED_MENUS_KEY, val)
+  local.set(MENU_LIST_KEY, getCurrentMenuListKey())
 }, { deep: true })
 
-// 递归查找当前路由对应的父菜单路径
-const findMenuPath = (menus: any[], path: string, parentUrls: string[] = []): string[] | null => {
+// 递归查找当前路由对应的父菜单路径（返回 menuId）
+const findMenuPath = (menus: any[], path: string, parentIds: string[] = []): string[] | null => {
   for (const menu of menus) {
-    // 当前菜单匹配
-    if (path === menu.menuUrl || path.startsWith(menu.menuUrl + '/')) {
-      return [...parentUrls, menu.menuUrl]
+    // 当前菜单匹配（使用 menuUrl 匹配路由）
+    if (menu.menuUrl && (path === menu.menuUrl || path.startsWith(menu.menuUrl + '/'))) {
+      return [...parentIds, getMenuKey(menu)]
     }
     // 递归查找子菜单
     if (menu.children?.length) {
-      const result = findMenuPath(menu.children, path, [...parentUrls, menu.menuUrl])
+      const result = findMenuPath(menu.children, path, [...parentIds, getMenuKey(menu)])
       if (result) return result
     }
   }
@@ -81,8 +100,9 @@ watch(displayMenuList, (newList, oldList) => {
   if (newList !== oldList) {
     openedMenus.value = []
     local.set(OPENED_MENUS_KEY, [])
+    local.set(MENU_LIST_KEY, getCurrentMenuListKey())
   }
-})
+}, { immediate: false })
 
 // 菜单主题相关
 const menuBgColor = computed(() => appStore.isDark ? '#1d1e1f' : '#fff')
@@ -126,7 +146,7 @@ const handleLogout = () => {
       class="sidebar__menu"
       @select="handleMenuSelect"
     >
-      <template v-for="menu in displayMenuList" :key="menu.menuUrl">
+      <template v-for="menu in displayMenuList" :key="getMenuKey(menu)">
         <SidebarMenuItem :menu="menu" />
       </template>
     </Menu>

package/src/components/Layout/SidebarMenuItem.vue

@@ -85,6 +85,11 @@ const iconExists = (iconName: string): boolean => {
   return knownIcons.has(iconName)
 }
 
+// 获取菜单的唯一标识（优先使用 menuId，其次 menuCode，最后 menuUrl）
+const menuIndex = computed(() => {
+  return props.menu.menuId || props.menu.menuCode || props.menu.menuUrl || ''
+})
+
 // 是否有子菜单
 const hasChildren = computed(() => {
   return props.menu.children && props.menu.children.length > 0
@@ -93,7 +98,7 @@ const hasChildren = computed(() => {
 
 <template>
   <!-- 有子菜单 -->
-  <SubMenu v-if="hasChildren" :index="menu.menuUrl">
+  <SubMenu v-if="hasChildren" :index="menuIndex">
     <template #title>
       <span class="menu-item__content">
         <span class="menu-item__icon">
@@ -104,13 +109,13 @@ const hasChildren = computed(() => {
       </span>
     </template>
     <!-- 递归渲染子菜单 -->
-    <template v-for="child in menu.children" :key="child.menuUrl">
+    <template v-for="child in menu.children" :key="child.menuId || child.menuCode || child.menuUrl">
       <SidebarMenuItem :menu="child" />
     </template>
   </SubMenu>
 
   <!-- 无子菜单 -->
-  <MenuItem v-else :index="menu.menuUrl">
+  <MenuItem v-else :index="menu.menuUrl || menuIndex">
     <span class="menu-item__content">
       <span v-if="menu.menuName !== '首页'" class="menu-item__icon">
         <Icon v-if="iconExists(getMenuIcon(menu.icon))" :name="getMenuIcon(menu.icon)" :size="16" />