generator-mico-cli 0.2.21 → 0.2.23

package/generators/micro-react/templates/apps/layout/src/common/menu/types.ts

@@ -30,6 +30,10 @@ export interface PageConfig {
   routeMode: PageRouteMode;
   /** 是否仅超级管理员可见 */
   adminOnly?: boolean;
+  /** 是否开启权限控制 */
+  accessControlEnabled: boolean;
+  /** 路由权限标识（用于匹配 sideMenus） */
+  routeKey: string | null;
   /** 关联的主文档 ID */
   mainDocumentId: number;
   /** 所属工作空间子域名 */
@@ -46,6 +50,15 @@ export interface PageConfig {
   updatedAt: string;
 }
 
+/**
+ * 公共页面配置 - 从 window.__MICO_PAGES__ 获取
+ * PageConfig 的子集，用于动态路由注册和页面级权限控制
+ */
+export type PublicPageItem = Omit<
+  PageConfig,
+  'workspaceSubdomain' | 'publishedBy' | 'versions' | 'createdAt' | 'updatedAt'
+>;
+
 /**
  * 菜单项类型
  */
@@ -67,8 +80,6 @@ export interface MenuItem {
   enabled: boolean;
   sortOrder: number;
   pageId: number | null;
-  /** 页面配置（type=page 时存在） */
-  page: PageConfig | null;
   /** 是否仅超级管理员可见 */
   adminOnly?: boolean;
   children: MenuItem[];
@@ -91,7 +102,7 @@ export interface ParsedRoute {
   /** 微应用入口 URL (htmlUrl 或 jsUrls[0]) */
   entry?: string;
   /** 原始页面配置 */
-  pageConfig?: PageConfig;
+  pageConfig?: PublicPageItem;
 }
 
 /**
@@ -111,7 +122,7 @@ export interface ParsedMenuItem {
  */
 export interface MicroAppProps {
   /** 主应用标识 */
-  mainApp: '<%= projectName %>';
+  mainApp: 'common-web';
   /** 共享的 request 实例，子应用可直接使用 */
   request: <T = any>(url: string, options?: any) => Promise<T>;
 }
@@ -132,6 +143,8 @@ export type WorkspaceStatus = 'active' | 'inactive' | 'pending';
 export interface WorkspaceConfig {
   /** 关联的应用 ID（可能为空） */
   appId: number | null;
+  /** CAS 服务端登录 URL，用于 SSO 外部登录跳转 */
+  casServerLoginUrl?: string;
   /** 创建时间 */
   createdAt: string;
   /** 创建者 ID */
@@ -165,10 +178,24 @@ export interface WorkspaceConfig {
  */
 declare global {
   interface Window {
+    __MICO_PAGES__?: PublicPageItem[];
     __MICO_MENUS__?: MenuItem[];
     __MICO_CONFIG__?: {
       appName?: string;
+      /** 站点/产品标题，用于登录页标题文案、logo alt 等 */
+      title?: string;
+      /** 登录页 logo 图片地址，不配置时使用应用内置 logo */
+      logo?: string;
+      appId?: string;
       apiBaseUrl?: string;
+      proxySuffix?: string;
+      loginEndpoint?: string;
+      refreshEndpoint?: string;
+      externalLoginPath?: string;
+      /** 请求客户端配置覆盖，与 config 中 defaultClientOptions 同名字段 */
+      defaultClientOptions?: Partial<
+        import('../request/types').RequestClientOptions
+      >;
       /** 默认重定向路径，访问 "/" 时自动跳转到此路径 */
       defaultPath?: string;
       /**

package/generators/micro-react/templates/apps/layout/src/common/micro-prefetch.ts

@@ -6,7 +6,8 @@
  */
 
 import { prefetchApps } from 'qiankun';
-import { extractRoutes, getWindowMenus } from './menu';
+import { extractRoutes } from './menu';
+import { getMenus } from './portal-data';
 import { getAppNameFromEntry } from './micro';
 
 /**
@@ -45,7 +46,7 @@ export const getMicroAppsForPrefetch = (
   excludeEntry?: string,
 ): Array<{ name: string; entry: string }> => {
   try {
-    const menus = getWindowMenus();
+    const menus = getMenus();
     const routes = extractRoutes(menus);
 
     return routes

package/generators/micro-react/templates/apps/layout/src/common/portal-data.ts

@@ -0,0 +1,45 @@
+/**
+ * 全局数据源管理
+ *
+ * 统一管理 window.__MICO_PAGES__ 和 window.__MICO_MENUS__ 的访问与索引。
+ * 数据由中台注入，每次直接从 window 读取（避免缓存导致时序问题）。
+ * pageId 索引惰性构建，数据就绪后缓存。
+ */
+import type { MenuItem, PublicPageItem } from './menu/types';
+
+/** 获取页面列表 (window.__MICO_PAGES__) */
+export const getPages = (): PublicPageItem[] => {
+  if (typeof window === 'undefined') return [];
+  return Array.isArray(window.__MICO_PAGES__) ? window.__MICO_PAGES__ : [];
+};
+
+/** 获取菜单树 (window.__MICO_MENUS__) */
+export const getMenus = (): MenuItem[] => {
+  if (typeof window === 'undefined') return [];
+  return Array.isArray(window.__MICO_MENUS__) ? window.__MICO_MENUS__ : [];
+};
+
+/** 是否有页面数据可用 */
+export const hasPages = (): boolean => {
+  return getPages().length > 0;
+};
+
+let _pageIdIndex: Map<number, PublicPageItem> | null = null;
+
+const getPageIdIndex = (): Map<number, PublicPageItem> => {
+  const pages = getPages();
+  if (!_pageIdIndex || (_pageIdIndex.size === 0 && pages.length > 0)) {
+    _pageIdIndex = new Map(pages.map((p) => [p.id, p]));
+  }
+  return _pageIdIndex;
+};
+
+/** 通过 pageId 查找页面（O(1)） */
+export const getPageById = (pageId: number): PublicPageItem | undefined => {
+  return getPageIdIndex().get(pageId);
+};
+
+/** 获取菜单项关联的页面 */
+export const getMenuPage = (item: MenuItem): PublicPageItem | undefined => {
+  return item.pageId ? getPageById(item.pageId) : undefined;
+};

package/generators/micro-react/templates/apps/layout/src/common/request/config.ts

@@ -1,20 +1,59 @@
 /**
  * 请求客户端配置管理
+ * appId 优先从 window.__MICO_WORKSPACE__ 获取；
+ * externalLoginPath 优先从 window.__MICO_WORKSPACE__.casServerLoginUrl 获取；
+ * 其余 defaultClientOptions / apiBaseUrl / proxySuffix / loginEndpoint / refreshEndpoint 优先从 window.__MICO_CONFIG__ 同名字段获取。
  */
 
 import { getStoredAuthToken } from '../auth/auth-manager';
 import type { RequestClientOptions, TokenResolver } from './types';
 
-const defaultClientOptions: RequestClientOptions = {
-  appId: process.env.APP_ID ?? '',
-  ticketParam: 'ticket',
-  logoutPath: '/logout',
-  apiBaseUrl: process.env.API_BASE_URL ?? '',
-  proxySuffix: process.env.PROXY_SUFFIX ?? '',
-  loginEndpoint: process.env.LOGIN_ENDPOINT ?? '',
-  refreshEndpoint: process.env.REFRESH_ENDPOINT ?? '',
-  externalLoginPath: process.env.EXTERNAL_LOGIN_PATH ?? '',
-};
+function getMicoConfig(): Window['__MICO_CONFIG__'] {
+  if (typeof window === 'undefined') return undefined;
+  return window.__MICO_CONFIG__;
+}
+
+function getMicoWorkspace(): Window['__MICO_WORKSPACE__'] {
+  if (typeof window === 'undefined') return undefined;
+  return window.__MICO_WORKSPACE__ ?? undefined;
+}
+
+function buildDefaultClientOptions(): RequestClientOptions {
+  const envDefaults: RequestClientOptions = {
+    appId: process.env.APP_ID ?? '',
+    ticketParam: 'ticket',
+    logoutPath: '/logout',
+    apiBaseUrl: process.env.API_BASE_URL ?? '',
+    proxySuffix: process.env.PROXY_SUFFIX ?? '',
+    loginEndpoint: process.env.LOGIN_ENDPOINT ?? '',
+    refreshEndpoint: process.env.REFRESH_ENDPOINT ?? '',
+    externalLoginPath: process.env.EXTERNAL_LOGIN_PATH ?? '',
+  };
+  const mico = getMicoConfig();
+  const workspace = getMicoWorkspace();
+  const appIdFromWorkspace =
+    workspace?.appId !== undefined && workspace?.appId !== null
+      ? String(workspace.appId)
+      : undefined;
+  const externalLoginFromWorkspace = workspace?.casServerLoginUrl;
+  if (!mico && !appIdFromWorkspace && !externalLoginFromWorkspace)
+    return envDefaults;
+  return {
+    ...envDefaults,
+    ...(mico?.defaultClientOptions ?? {}),
+    appId: appIdFromWorkspace ?? mico?.appId ?? envDefaults.appId,
+    apiBaseUrl: mico?.apiBaseUrl ?? envDefaults.apiBaseUrl,
+    proxySuffix: mico?.proxySuffix ?? envDefaults.proxySuffix,
+    loginEndpoint: mico?.loginEndpoint ?? envDefaults.loginEndpoint,
+    refreshEndpoint: mico?.refreshEndpoint ?? envDefaults.refreshEndpoint,
+    externalLoginPath:
+      externalLoginFromWorkspace ??
+      mico?.externalLoginPath ??
+      envDefaults.externalLoginPath,
+  };
+}
+
+const defaultClientOptions: RequestClientOptions = buildDefaultClientOptions();
 
 let clientOptions: RequestClientOptions = { ...defaultClientOptions };
 

package/generators/micro-react/templates/apps/layout/src/common/request/interceptors.ts

@@ -68,7 +68,7 @@ export const runResponseInterceptors = async <T>(
 ): Promise<T> => {
   let current = response;
   for (const { handler } of responseInterceptors) {
-    current = await handler(current, ctx);
+    current = await handler(current, ctx) as T;
   }
   return current;
 };

package/generators/micro-react/templates/apps/layout/src/common/request/sso.ts

@@ -7,6 +7,7 @@ import {
   maybePersistTokens,
   setStoredAuthToken,
 } from '@/common/auth/auth-manager';
+import { isPageAuthFree } from '@/common/menu';
 import { isNoAuthRoute, ROUTES } from '@/constants';
 import {
   getTicketParam,
@@ -37,6 +38,11 @@ export const handleAuthFailureRedirect = (): void => {
     return;
   }
 
+  if (isPageAuthFree(window.location.pathname)) {
+    console.log('[SSO] 页面 accessControlEnabled=false，跳过 SSO 重定向');
+    return;
+  }
+
   // 从 URL 中获取当前 redirect 登录的次数
   const currentUrl = new URL(window.location.href);
   const redirectCountParam = currentUrl.searchParams.get('redirect_count');

package/generators/micro-react/templates/apps/layout/src/common/theme.ts

@@ -50,10 +50,8 @@ export function applyTheme(theme: ThemeMode): void {
   if (typeof document === 'undefined') return;
 
   if (theme === 'dark') {
-    document.body.setAttribute('arco-theme', 'dark');
     document.body.setAttribute('data-theme', 'dark');
   } else {
-    document.body.removeAttribute('arco-theme');
     document.body.setAttribute('data-theme', 'normal');
   }
 }

package/generators/micro-react/templates/apps/layout/src/components/AppTabs/index.less

@@ -20,7 +20,6 @@
 
   .arco-tabs-header-title {
     border: none;
-    background-color: transparent;
     border-radius: @border-radius-lg;
 
     &-active {

package/generators/micro-react/templates/apps/layout/src/components/AppTabs/index.tsx

@@ -188,10 +188,10 @@ function AppTabs() {
     >
       {tabs.map((tab) => {
         const isChinese = isChineseLocale();
-        const fallbackName = isChinese ? tab.title : (tab.titleEn || tab.title);
-        const label = tab.nameKey
-          ? getMenuLabel(tab.nameKey, fallbackName)
-          : fallbackName;
+        const label = getMenuLabel(
+          { name: tab.title, nameEn: tab.titleEn, nameKey: tab.nameKey },
+          isChinese,
+        );
         return <TabPane destroyOnHide key={tab.key} title={label} />;
       })}
     </Tabs>

package/generators/micro-react/templates/apps/layout/src/components/IconFont/index.tsx

@@ -1,4 +1,4 @@
-import { getCurrentLocale, getIconFontPath } from '@/common/locale';
+import { getIconFontPath } from '@/common/locale';
 import { Icon } from '@mico-platform/ui';
 
 // 该组件用于自定义的图标，用法见https://arco.design/react/components/icon#%E6%B7%BB%E5%8A%A0-iconbox-%E9%A1%B9%E7%9B%AE
@@ -7,13 +7,12 @@ import { Icon } from '@mico-platform/ui';
 // 字体库地址：https://arco.design/iconbox/mime/lib/1945/0
 
 /**
- * 根据当前语言加载对应的图标库
+ * 根据当前语言加载对应的图标库(当前只有中文)
  * 语言切换时会重新加载页面，所以这里只需要在初始化时根据当前语言加载
  */
 function createIconFont() {
-  // 获取当前语言（按优先级：URL参数 > localStorage > 浏览器默认）
-  const currentLocale = getCurrentLocale();
-  const iconPath = getIconFontPath(currentLocale);
+  // TODO: 后续支持多语言时，需要根据当前语言加载对应的图标库
+  const iconPath = getIconFontPath();
 
   // 创建 IconFont 实例
   return Icon.addFromIconFontCn({ src: iconPath });

package/generators/micro-react/templates/apps/layout/src/components/MicroAppLoader/index.less

@@ -4,20 +4,17 @@
 
 .micro-app-container {
   width: 100%;
-  height: 100%;
   position: relative;
+  display: flex;
+  flex-direction: column;
   overflow: auto;
 }
 
 .micro-app-loading {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
   display: flex;
   align-items: center;
   justify-content: center;
+  min-height: 600px;
   background: var(--color-bg-1);
   z-index: 10;
 }
@@ -48,10 +45,28 @@
   // 激活时在文档流中，继承占位元素的尺寸
   width: 100%;
   height: 100%;
+  display: flex;
+  flex: 1;
+  flex-direction: column;
   overflow: auto;
+  min-height: calc(100vh - 134px);
+
 
   > div {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+  }
+
+  > div > div {
     height: 100%;
+    display: flex;
+    flex: 1 1;
+  }
+
+  > div > div > div {
+    width: 100%;
+    flex: 1 1;
   }
 
   // 隐藏状态（在 body 中）

package/generators/micro-react/templates/apps/layout/src/components/MicroAppLoader/index.tsx

@@ -2,7 +2,8 @@ import { getAuthInfo } from '@/common/auth/auth-manager';
 import { EEnv, getEnv } from '@/common/env';
 import { getCurrentLocale } from '@/common/locale';
 import { request } from '@/common/request';
-import { isAuthDisabled, isNoPermissionRoute } from '@/constants';
+import { isPageAuthFree } from '@/common/menu/parser';
+import { isAuthDisabled, isNoAuthRoute, isNoPermissionRoute } from '@/constants';
 import { Spin } from '@mico-platform/ui';
 import { useLocation, useModel } from '@umijs/max';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
@@ -46,12 +47,12 @@ const MicroAppLoader: React.FC<MicroAppLoaderProps> = ({
     mounted: false,
   });
 
-  // 获取 initialState，等待用户信息准备好再加载子应用
-  // disableAuth 模式或免权限校验路由下跳过等待
   const { initialState } = useModel('@@initialState');
   const location = useLocation();
   const isAuthReady =
     isAuthDisabled() ||
+    isPageAuthFree(location.pathname) ||
+    isNoAuthRoute(location.pathname) ||
     isNoPermissionRoute(location.pathname) ||
     !!initialState?.currentUser;
 

package/generators/micro-react/templates/apps/layout/src/components/MicroAppLoader/micro-app-manager.ts

@@ -391,6 +391,12 @@ class MicroAppManager {
         activateContainer(container, request.target);
 
         console.log('🔍[路由调试] 调用 loadMicroApp', { name: request.name, qiankunName, entry: request.entry });
+
+        if (process.env.NODE_ENV === 'development') {
+          // 重置标志，使子应用能初始化自己的 react-refresh 运行时以支持 HMR
+          (window as any).__reactRefreshInjected = false;
+        }
+
         const microApp = loadMicroApp(
           {
             name: qiankunName,
@@ -399,7 +405,7 @@ class MicroAppManager {
             props: request.props,
           },
           {
-            sandbox: { strictStyleIsolation: false, experimentalStyleIsolation: true },
+            sandbox: { strictStyleIsolation: false, experimentalStyleIsolation: false, loose: true },
           },
         );
 

package/generators/micro-react/templates/apps/layout/src/components/RightContent/AvatarDropdown.tsx

@@ -1,4 +1,5 @@
 import { logout, STORAGE_KEYS } from '@/common/auth';
+import type { IUserInfo } from '@/common/auth/type';
 import {
 	getCurrentTimezone,
 	getTimezoneRegion,
@@ -39,13 +40,10 @@ interface IMenuItem {
 	children?: IMenuItem[];
 }
 
-const DEFAULT_AVATAR =
-	'https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png';
-
 // TODO: 临时假数据，后续接入真实登录态
-const MOCK_USER = {
+const MOCK_USER: Partial<IUserInfo> = {
 	user_name: 'Test User',
-	avatar: DEFAULT_AVATAR,
+	username: 'test@micous.com',
 };
 
 export const AvatarName: React.FC<{ userName?: string }> = ({ userName }) => {
@@ -100,11 +98,11 @@ export const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu }) => {
 
 	// 管理头像 URL
 	const [avatarSrc, setAvatarSrc] = useState<string>(
-		currentUser?.avatar || DEFAULT_AVATAR,
+		currentUser?.avatar || '',
 	);
 
 	useEffect(() => {
-		setAvatarSrc(currentUser?.avatar || DEFAULT_AVATAR);
+		setAvatarSrc(currentUser?.avatar || '');
 	}, [currentUser?.avatar]);
 
 	// 加载时区列表
@@ -142,10 +140,6 @@ export const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu }) => {
 		};
 	}, []);
 
-	const handleAvatarError = () => {
-		setAvatarSrc(DEFAULT_AVATAR);
-	};
-
 	const loginOut = async () => {
 		logout();
 		const { search, pathname } = window.location;
@@ -370,11 +364,13 @@ export const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu }) => {
 			}
 		>
 			<div className="flex items-center avatar-dropdown-trigger">
-				<div className="flex items-center">
-					<Avatar size={24} shape="circle">
-						<img src={avatarSrc} alt="avatar" onError={handleAvatarError} />
-					</Avatar>
-				</div>
+				{avatarSrc && (
+					<div className="flex items-center">
+						<Avatar size={24} shape="circle">
+							<img src={avatarSrc} alt="avatar" />
+						</Avatar>
+					</div>
+				)}
 				<AvatarName userName={currentUser?.user_name} />
 				<IconFont
 					type="webcs-outline_down1"

package/generators/micro-react/templates/apps/layout/src/global.less

@@ -1,13 +1,26 @@
 
 // 再导入 @mico-platform/theme 主题变量（CSS Variables + Less Variables）
 // 这样项目的变量定义会在 UI 库之后，可以正确覆盖
-@import '@mico-platform/theme';
+@import '@mico-platform/theme/variables';
 
 * {
   box-sizing: border-box;
 }
 
+// 禁用 Mac 触摸板双指左右滑动触发的浏览器前进/后退手势
+html {
+  overscroll-behavior-x: none;
+  height: 100%;
+}
+
+body {
+  overscroll-behavior-x: none;
+  height: 100%;
+  background-color: @color-fill-1;
+}
+
 #root {
-  min-height: 100vh;
+  min-height: max(100%, 800px);
+  // 这里是为了让子容器撑满高度，正常的height: 100%并不能撑满
   display: flex;
 }

package/generators/micro-react/templates/apps/layout/src/hooks/useMenu.ts

@@ -1,5 +1,6 @@
 import type { MenuItem, ParsedMenuItem, ParsedRoute } from '@/common/menu';
-import { extractRoutes, getWindowMenus, parseMenuItems } from '@/common/menu';
+import { extractRoutes, parseMenuItems } from '@/common/menu';
+import { getMenus } from '@/common/portal-data';
 import { useMemo } from 'react';
 
 /**
@@ -8,7 +9,7 @@ import { useMemo } from 'react';
 export const useMenu = () => {
   // 获取原始菜单数据
   const rawMenus = useMemo<MenuItem[]>(() => {
-    return getWindowMenus();
+    return getMenus();
   }, []);
 
   // 解析后的菜单项（用于渲染菜单组件）

package/generators/micro-react/templates/apps/layout/src/layouts/components/menu/index.less

@@ -9,8 +9,10 @@
   }
 }
 
-.layout-menu {
+.layout-menu.arco-menu-dark,
+.layout-menu.arco-menu {
   font-size: @font-size-base;
+  background-color: @color-text-5;
 
   // Base menu item styles
   .arco-menu-item {
@@ -48,7 +50,7 @@
   }
 
   .arco-menu-indent {
-    width: 32px;
+    width: 12px;
   }
 
   .layout-menu-level-3 {
@@ -133,10 +135,12 @@
 }
 
 // Sider styles
-.<%= projectName %>-sider {
+.layout-web-sider {
   box-shadow: none;
+  background-color: @color-text-5 !important;
   position: fixed !important;
-  height: calc(100vh - 56px) !important;
+  height: calc(100vh - @header-height) !important;
+  z-index: 999;
 
   .arco-layout-sider-trigger {
     display: flex;
@@ -148,6 +152,10 @@
   .click-trigger-btn {
     cursor: pointer;
     display: flex;
+    width: 24px;
+    height: 24px;
+    align-items: center;
+    justify-content: center;
 
     // 图标颜色适配主题
     .arco-icon {
@@ -163,4 +171,24 @@
   .click-trigger-btn.collapsed {
     justify-content: center;
   }
+
+  .arco-menu-collapse .arco-menu-item .arco-icon,
+  .arco-menu-collapse .arco-menu-pop-header .arco-icon {
+    margin-left: 0;
+  }
+
+  .arco-menu .arco-menu-item,
+  .arco-menu .arco-menu-group-title,
+  .arco-menu .arco-menu-pop-header,
+  .arco-menu .arco-menu-inline-header .arco-menu-dark .arco-menu-item,
+  .arco-menu-dark .arco-menu-group-title,
+  .arco-menu-dark .arco-menu-pop-header,
+  .arco-menu-dark .arco-menu-inline-header {
+    background-color: @color-text-5;
+    color: @color-text-2;
+
+    &.arco-menu-selected {
+      color: @Brand1-6;
+    }
+  }
 }

package/generators/micro-react/templates/apps/layout/src/layouts/components/menu/index.tsx

@@ -1,12 +1,13 @@
 import type { ParsedMenuItem } from '@/common/menu';
-import { filterMenuItems, getWindowMenus, parseMenuItems } from '@/common/menu';
-import { isAuthDisabled, isNoPermissionRoute } from '@/constants';
+import { filterMenuItems, parseMenuItems } from '@/common/menu';
+import { getMenus } from '@/common/portal-data';
 import IconFont from '@/components/IconFont';
+import { isAuthDisabled } from '@/constants';
 import { useMenuState } from '@/hooks/useMenuState';
 import { useTheme } from '@/hooks/useTheme';
 import { Layout, Menu } from '@mico-platform/ui';
 import * as Icons from '@mico-platform/ui/icon';
-import { useLocation, useModel } from '@umijs/max';
+import { useModel } from '@umijs/max';
 import React, { useEffect, useMemo, useRef } from 'react';
 import './index.less';
 
@@ -30,6 +31,16 @@ const ICON_ALIAS_MAP: Record<string, keyof typeof Icons> = {
 const getIconComponent = (iconName: string): React.ReactNode => {
   if (!iconName) return null;
 
+  // 从中台配置的 icon 是有 Icon 前缀的。类似 IconMenu 这种
+  const directIconKey = iconName as keyof typeof Icons;
+  const DirectIconComponent = Icons[directIconKey] as
+    | React.ComponentType
+    | undefined;
+
+  if (DirectIconComponent) {
+    return <DirectIconComponent />;
+  }
+
   // 尝试直接匹配 Icon${name} 格式
   const iconKey = `Icon${iconName}` as keyof typeof Icons;
   const IconComponent = Icons[iconKey] as React.ComponentType | undefined;
@@ -104,16 +115,15 @@ interface LayoutMenuProps {
 const LayoutMenu: React.FC<LayoutMenuProps> = () => {
   const siderRef = useRef<HTMLDivElement>(null);
   const { isDark } = useTheme();
-  const location = useLocation();
-
   const { initialState } = useModel('@@initialState');
   const currentUser = initialState?.currentUser;
 
   // Parse menu data
-  // disableAuth 或免权限校验路由时不过滤，显示全部菜单
+  // isMenuAllowed 内部已对每个菜单项单独检查 isNoPermissionRoute，
+  // 无需在此按当前页面路径全局跳过过滤，避免菜单可见性随页面变化
   const menuItems = useMemo(() => {
-    const menus = getWindowMenus();
-    if (isAuthDisabled() || isNoPermissionRoute(location.pathname)) {
+    const menus = getMenus();
+    if (isAuthDisabled()) {
       return parseMenuItems(menus);
     }
     const filteredMenus = filterMenuItems(menus, {
@@ -121,7 +131,7 @@ const LayoutMenu: React.FC<LayoutMenuProps> = () => {
       sideMenus: (currentUser?.side_menus || []) as string[],
     });
     return parseMenuItems(filteredMenus);
-  }, [currentUser?.is_superuser, currentUser?.side_menus, location.pathname]);
+  }, [currentUser?.is_superuser, currentUser?.side_menus]);
 
   // 使用菜单状态 Hook
   const {
@@ -166,7 +176,7 @@ const LayoutMenu: React.FC<LayoutMenuProps> = () => {
       onCollapse={handleCollapsed}
       collapsible
       breakpoint="xl"
-      className="<%= projectName %>-sider"
+      className="layout-web-sider"
       trigger={clickTriggerBtn}
       theme={isDark ? 'dark' : 'light'}
     >