generator-mico-cli 0.2.21 → 0.2.23

package/generators/micro-react/templates/apps/layout/mock/menus.ts

@@ -6,171 +6,116 @@
  * - id: 菜单唯一标识
  * - name: 菜单名称
  * - type: 'page' | 'group' (page: 页面, group: 分组)
- * - path: 路由路径 (group 类型为 null)
+ * - path: 路由路径 (type=page 时与 PAGES 中的 route 一致, group 类型为 null)
  * - icon: 图标名称
  * - enabled: 是否启用
  * - sortOrder: 排序权重
- * - pageId: 关联的页面 ID
- * - page: 页面配置 (微前端入口)
- *   - htmlUrl: 子应用入口地址
- *   - jsUrls: 额外 JS 资源
- *   - cssUrls: 额外 CSS 资源
+ * - pageId: 关联的页面 ID (通过 pageId 与 __MICO_PAGES__ 关联)
  * - children: 子菜单数组
  */
 
-import type { MenuItem, PageConfig } from '@/common/menu/types';
+import type { MenuItem } from '@/common/menu/types';
 
-/** Mock 页面配置 - 只需要核心字段 */
-type MockPageConfig = Pick<PageConfig,
-  | 'id' | 'name' | 'route' | 'enabled' | 'htmlUrl' | 'jsUrls' | 'cssUrls'
-  | 'adminOnly'
->;
-
-/** Mock 菜单项 - page 字段使用简化类型，包含多语言字段 */
-type MockMenuItem = Omit<MenuItem, 'page' | 'children'> & {
-  page: MockPageConfig | null;
+/** Mock 菜单项 */
+type MockMenuItem = Omit<MenuItem, 'children'> & {
   children: MockMenuItem[];
-  /** 英文名称（用于英文环境权限匹配） */
-  nameEn?: string;
-  /** 菜单唯一标识符（用于权限匹配的兜底） */
-  nameKey?: string;
 };
 
 const mockMenus: MockMenuItem[] = [
   {
-    "id": 1,
-    "name": "首页",
-    "nameEn": "Home",
-    "nameKey": "cs_web_menu_home",
-    "type": "page",
-    "path": null,
-    "icon": "Home",
-    "enabled": true,
-    "sortOrder": 0,
-    "pageId": 1,
-    "page": {
-      "id": 1,
-      "name": "home",
-      "route": "/",
-      "enabled": true,
-      "htmlUrl": "",
-      "jsUrls": [],
-      "cssUrls": []
-    },
-    "children": []
+    id: 1,
+    name: '首页',
+    nameEn: 'Home',
+    nameKey: 'cs_web_menu_home',
+    type: 'page',
+    path: '/',
+    icon: 'Home',
+    enabled: true,
+    sortOrder: 0,
+    pageId: 1,
+    children: [],
   },
   {
-    "id": 2,
-    "name": "示例模块",
-    "nameEn": "Example Module",
-    "nameKey": "cs_web_menu_example_module",
-    "type": "group",
-    "path": null,
-    "icon": "List",
-    "enabled": true,
-    "sortOrder": 1,
-    "pageId": null,
-    "page": null,
-    "children": [
+    id: 2,
+    name: '示例模块',
+    nameEn: 'Example Module',
+    nameKey: 'cs_web_menu_example_module',
+    type: 'group',
+    path: null,
+    icon: 'List',
+    enabled: true,
+    sortOrder: 1,
+    pageId: null,
+    children: [
       {
-        "id": 3,
-        "name": "示例页面",
-        "nameEn": "Example Page",
-        "nameKey": "cs_web_menu_example_page",
-        "type": "page",
-        "path": "/example/page",
-        "icon": "File",
-        "enabled": true,
-        "sortOrder": 1,
-        "pageId": 45,
-        "page": {
-          "id": 45,
-          "name": "example-page",
-          "route": "/example/page",
-          "enabled": true,
-          "htmlUrl": "",
-          "jsUrls": [],
-          "cssUrls": []
-        },
-        "children": []
-      }
-    ]
+        id: 3,
+        name: '示例页面',
+        nameEn: 'Example Page',
+        nameKey: 'cs_web_menu_example_page',
+        type: 'page',
+        path: '/example/page',
+        icon: 'File',
+        enabled: true,
+        sortOrder: 1,
+        pageId: 45,
+        children: [],
+      },
+    ],
   },
   {
-    "id": 5,
-    "name": "微应用示例",
-    "nameEn": "Microapp Example",
-    "nameKey": "cs_web_menu_microapp_example",
-    "type": "group",
-    "path": null,
-    "icon": "Apps",
-    "enabled": true,
-    "sortOrder": 2,
-    "pageId": null,
-    "page": null,
-    "children": [
+    id: 5,
+    name: '微应用示例',
+    nameEn: 'Microapp Example',
+    nameKey: 'cs_web_menu_microapp_example',
+    type: 'group',
+    path: null,
+    icon: 'Apps',
+    enabled: true,
+    sortOrder: 2,
+    pageId: null,
+    children: [
       {
-        "id": 6,
-        "name": "子应用页面",
-        "nameEn": "Subapp Page",
-        "nameKey": "cs_web_menu_subapp_page",
-        "type": "page",
-        "path": null,
-        "icon": "Desktop",
-        "enabled": true,
-        "sortOrder": 1,
-        "pageId": 55,
-        "page": {
-          "id": 55,
-          "name": "subapp-example",
-          "route": "/subapp",
-          "enabled": true,
-          "htmlUrl": "//localhost:8010",
-          "jsUrls": [],
-          "cssUrls": []
-        },
-        "children": []
-      }
-    ]
+        id: 6,
+        name: '子应用页面',
+        nameEn: 'Subapp Page',
+        nameKey: 'cs_web_menu_subapp_page',
+        type: 'page',
+        path: '/subapp/*',
+        icon: 'Desktop',
+        enabled: true,
+        sortOrder: 1,
+        pageId: 55,
+        children: [],
+      },
+    ],
   },
   {
-    "id": 7,
-    "name": "外部链接",
-    "nameEn": "External Link",
-    "nameKey": "cs_web_menu_external_link",
-    "type": "link",
-    "path": "https://github.com",
-    "icon": "Link",
-    "enabled": true,
-    "sortOrder": 3,
-    "pageId": null,
-    "page": null,
-    "children": []
+    id: 7,
+    name: '外部链接',
+    nameEn: 'External Link',
+    nameKey: 'cs_web_menu_external_link',
+    type: 'link',
+    path: 'https://github.com',
+    icon: 'Link',
+    enabled: true,
+    sortOrder: 3,
+    pageId: null,
+    children: [],
   },
   {
-    "id": 8,
-    "name": "权限管理",
-    "nameEn": "Permission Management",
-    "nameKey": "cs_web_menu_permission_management",
-    "type": "page",
-    "path": "/permission",
-    "icon": "Permission",
-    "enabled": true,
-    "sortOrder": 3,
-    "pageId": null,
-    "adminOnly": true,
-    "page": {
-      "id": 8,
-      "name": "permission",
-      "route": "/permission",
-      "enabled": true,
-      "adminOnly": true,
-      "htmlUrl": "https://cdn-portal.micoplatform.com/portal-center/common-web/0.0.1/permission/index.html",
-      "jsUrls": [],
-      "cssUrls": []
-    },
-    "children": []
-  }
-]
+    id: 8,
+    name: '权限管理',
+    nameEn: 'Permission Management',
+    nameKey: 'cs_web_menu_permission_management',
+    type: 'page',
+    path: '/permission',
+    icon: 'Permission',
+    enabled: true,
+    sortOrder: 3,
+    pageId: null,
+    adminOnly: true,
+    children: [],
+  },
+];
 
 export default mockMenus;

package/generators/micro-react/templates/apps/layout/mock/pages.ts

@@ -0,0 +1,83 @@
+/**
+ * Mock 页面数据
+ * 用于开发环境测试，模拟 window.__MICO_PAGES__ 数据
+ *
+ * 页面结构说明:
+ * - id: 页面唯一标识
+ * - name: 页面名称
+ * - route: 路由路径
+ * - htmlUrl: 微应用 HTML 入口 URL
+ * - jsUrls: 额外 JS 资源
+ * - cssUrls: 额外 CSS 资源
+ * - prefixPath: 路由前缀路径
+ * - routeMode: 路由匹配模式 (prefix | exact)
+ * - enabled: 是否启用
+ * - accessControlEnabled: 是否开启权限控制
+ * - adminOnly: 是否仅超级管理员可见
+ * - routeKey: 路由权限标识
+ * - mainDocumentId: 关联的主文档 ID
+ * - version: 当前版本号
+ */
+
+import type { PublicPageItem } from '@/common/menu/types';
+
+const mockPages: PublicPageItem[] = [
+  {
+    id: 125,
+    name: '登录页',
+    nameEn: 'Login',
+    nameKey: 'page.user.login',
+    route: '/user/login',
+    htmlUrl:
+      'https://cdn-portal.micoplatform.com/portal-center/common-web/0.0.4/login/index.html',
+    jsUrls: [],
+    cssUrls: [],
+    prefixPath: '/user',
+    routeMode: 'exact',
+    enabled: true,
+    accessControlEnabled: false,
+    adminOnly: false,
+    routeKey: null,
+    mainDocumentId: 59,
+    version: 'v2026.02.26-04.21-000',
+  },
+  {
+    id: 124,
+    name: '权限管理',
+    nameEn: 'Permission Management',
+    nameKey: 'page.permission',
+    route: '/permission',
+    htmlUrl:
+      'https://cdn-portal.micoplatform.com/portal-center/common-web/0.0.4/permission/index.html',
+    jsUrls: [],
+    cssUrls: [],
+    prefixPath: '',
+    routeMode: 'prefix',
+    enabled: true,
+    accessControlEnabled: true,
+    adminOnly: true,
+    routeKey: null,
+    mainDocumentId: 59,
+    version: 'v2026.02.26-04.13-419',
+  },
+  {
+    id: 115,
+    name: '兜底',
+    nameEn: 'Fallback',
+    nameKey: 'page.fallback',
+    route: '/*',
+    htmlUrl: '',
+    jsUrls: [],
+    cssUrls: [],
+    prefixPath: '',
+    routeMode: 'prefix',
+    enabled: true,
+    accessControlEnabled: true,
+    adminOnly: false,
+    routeKey: null,
+    mainDocumentId: 59,
+    version: 'v2026.01.26-14.25-095',
+  },
+];
+
+export default mockPages;

package/generators/micro-react/templates/apps/layout/package.json

@@ -32,6 +32,7 @@
     "spark-md5": "^3.0.2"
   },
   "devDependencies": {
+    "@common-web/sentry": "^0.0.3",
     "@types/react": "^18.0.33",
     "@types/react-dom": "^18.0.11",
     "@types/spark-md5": "^3.0.5",

package/generators/micro-react/templates/apps/layout/src/app.tsx

@@ -1,15 +1,16 @@
 import { history, type RequestConfig } from '@umijs/max';
 import { addGlobalUncaughtErrorHandler } from 'qiankun';
+import { SentryErrorBoundary } from '@common-web/sentry';
 import { errorConfig } from './requestErrorConfig';
 // 将 @mico-platform/ui 暴露到 window，供子应用 externals 使用
 import * as micoUI from '@mico-platform/ui';
 import React from 'react';
-import ReactDOM from 'react-dom/client';
+import ReactDOM from 'react-dom';
 
 import { getStoredAuthToken } from './common/auth/auth-manager';
 import type { IUserInfo } from './common/auth/type';
 import { fetchUserInfo } from './services/user';
-import { extractRoutes, getWindowMenus } from './common/menu';
+import { getDynamicRoutes, isPageAuthFree } from './common/menu';
 import {
   clearMicroAppProps,
   type IMicroAppProps,
@@ -23,6 +24,7 @@ import { initTheme } from './common/theme';
 import MicroAppLoader from './components/MicroAppLoader';
 import { isNoAuthRoute } from '@/constants';
 import { getCurrentLocale } from '@/common/locale';
+import '@mico-platform/theme/dist/css/theme.css';
 import './global.less';
 
 // ==================== qiankun 全局错误处理 ====================
@@ -127,9 +129,10 @@ export async function getInitialState(): Promise<{
 
   const { location } = history;
   const noAuthRoute = isNoAuthRoute(location.pathname);
+  const skipAuth = noAuthRoute || isPageAuthFree(location.pathname);
 
   // 非免认证路由：走 SSO 流程
-  if (!noAuthRoute) {
+  if (!skipAuth) {
     await ensureSsoSession();
   }
 
@@ -145,7 +148,7 @@ export async function getInitialState(): Promise<{
   }
 
   // 非免认证路由且没有 token，跳转到 SSO 登录
-  if (!noAuthRoute) {
+  if (!skipAuth) {
     handleAuthFailureRedirect();
     // 返回空状态，页面会被重定向
     return {
@@ -168,6 +171,10 @@ export const request: RequestConfig = {
   ...errorConfig,
 };
 
+export function rootContainer(container: React.ReactNode) {
+  return <SentryErrorBoundary>{container}</SentryErrorBoundary>;
+}
+
 /**
  * Umi 路由类型定义
  */
@@ -182,15 +189,13 @@ interface UmiRoute {
 
 /**
  * @name 动态路由配置
- * 从 window.__MICO_MENUS__ 获取菜单数据，生成动态路由
+ * 优先从 window.__MICO_PAGES__ 获取页面数据，无数据时降级到 window.__MICO_MENUS__
  * @doc https://umijs.org/docs/max/router#%E5%8A%A8%E6%80%81%E8%B7%AF%E7%94%B1
  */
 export function patchClientRoutes({ routes }: { routes: UmiRoute[] }) {
-  const menus = getWindowMenus();
-  const dynamicRoutes = extractRoutes(menus);
+  const dynamicRoutes = getDynamicRoutes();
 
   console.log('[app.tsx] patchClientRoutes:', {
-    menus,
     dynamicRoutes,
     routes,
   });

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

@@ -1,15 +1,82 @@
-import { getIntl } from '@umijs/max';
-import { isAuthDisabled, isNoPermissionRoute } from '@/constants';
-import type { MenuItem, ParsedMenuItem, ParsedRoute } from './types';
 import { getCurrentLocale, LOCALE } from '@/common/locale';
+import { getMenuPage, getPages } from '@/common/portal-data';
+import { isAuthDisabled, isNoPermissionRoute } from '@/constants';
+import { getIntl } from '@umijs/max';
+import type {
+  MenuItem,
+  ParsedMenuItem,
+  ParsedRoute,
+  PublicPageItem,
+} from './types';
+
+/**
+ * 从页面数据提取路由配置
+ */
+export const extractRoutesFromPages = (
+  pages: PublicPageItem[],
+): ParsedRoute[] => {
+  return pages
+    .filter((page) => page.enabled)
+    .map((page) => {
+      const hasEntry = page.htmlUrl || (page.jsUrls && page.jsUrls.length > 0);
+      return {
+        path: page.route,
+        name: page.name,
+        icon: '',
+        loadType: (hasEntry ? 'microapp' : 'internal') as
+          | 'internal'
+          | 'microapp',
+        entry: page.htmlUrl || page.jsUrls?.[0] || undefined,
+      };
+    });
+};
 
 /**
- * 获取 window 上挂载的菜单数据
+ * 获取动态路由（从 __MICO_PAGES__）
  */
-export const getWindowMenus = (): MenuItem[] => {
-  if (typeof window === 'undefined') return [];
-  const menus = window.__MICO_MENUS__;
-  return Array.isArray(menus) ? menus : [];
+export const getDynamicRoutes = (): ParsedRoute[] => {
+  return extractRoutesFromPages(getPages());
+};
+
+/**
+ * 根据路径查找对应的页面配置
+ * 匹配逻辑与 findRouteByPath 一致（精确匹配 + 通配符匹配）
+ */
+/**
+ * 判断指定路径的页面是否为免认证页面
+ * 当 accessControlEnabled === false 时，跳过 SSO 认证和权限校验
+ */
+export const isPageAuthFree = (pathname: string): boolean => {
+  const page = findPageByPath(getPages(), pathname);
+  return page?.accessControlEnabled === false;
+};
+
+export const findPageByPath = (
+  pages: PublicPageItem[],
+  pathname: string,
+): PublicPageItem | undefined => {
+  let exact: PublicPageItem | undefined;
+  let bestWildcard: { page: PublicPageItem; basePath: string } | undefined;
+
+  for (const page of pages) {
+    if (!page.enabled) continue;
+
+    if (page.route === pathname) {
+      exact = page;
+      continue;
+    }
+
+    if (page.route.endsWith('/*')) {
+      const basePath = page.route.slice(0, -2);
+      if (pathname === basePath || pathname.startsWith(`${basePath}/`)) {
+        if (!bestWildcard || basePath.length > bestWildcard.basePath.length) {
+          bestWildcard = { page, basePath };
+        }
+      }
+    }
+  }
+
+  return exact || bestWildcard?.page;
 };
 
 export interface MenuFilterOptions {
@@ -19,7 +86,7 @@ export interface MenuFilterOptions {
   sideMenus?: string[];
 }
 
-const isSuperuserUser = (value?: boolean | number): boolean => {
+export const isSuperuserUser = (value?: boolean | number): boolean => {
   return value === true || value === 1;
 };
 
@@ -67,12 +134,12 @@ const isMenuAllowed = (
   item: MenuItem,
   options: MenuFilterOptions,
 ): boolean => {
-
   // 关闭权限控制时，所有菜单都允许访问
   if (isAuthDisabled()) return true;
 
   // 免权限校验路由，始终允许访问
-  if (item.page?.route && isNoPermissionRoute(item.page.route)) {
+  const itemRoute = item.path ?? getMenuPage(item)?.route;
+  if (itemRoute && isNoPermissionRoute(itemRoute)) {
     return true;
   }
 
@@ -155,15 +222,13 @@ export const filterMenuItems = (
  * 判断页面的加载类型
  * 有 htmlUrl 或 jsUrls 时使用 qiankun 微应用加载
  */
-const getLoadType = (page: MenuItem['page']): 'internal' | 'microapp' => {
+const getLoadType = (
+  page: PublicPageItem | null | undefined,
+): 'internal' | 'microapp' => {
   if (!page) return 'internal';
-
-  // 有 htmlUrl 或 jsUrls 使用 qiankun 微应用加载
   if (page.htmlUrl || (page.jsUrls && page.jsUrls.length > 0)) {
     return 'microapp';
   }
-
-  // 否则使用内部路由
   return 'internal';
 };
 
@@ -171,7 +236,9 @@ const getLoadType = (page: MenuItem['page']): 'internal' | 'microapp' => {
  * 获取微应用入口 URL
  * 优先使用 htmlUrl，其次使用 jsUrls[0]
  */
-const getEntry = (page: MenuItem['page']): string | undefined => {
+const getEntry = (
+  page: PublicPageItem | null | undefined,
+): string | undefined => {
   if (!page) return undefined;
   return page.htmlUrl || page.jsUrls?.[0] || undefined;
 };
@@ -197,17 +264,19 @@ export const extractRoutes = (
 
     const menuPath = buildMenuPath(parentPath, getMenuIdentifierDefault(item));
 
-    if (item.type === 'page' && item.page && item.page.enabled) {
-      const loadType = getLoadType(item.page);
-      routes.push({
-        path: item.page.route,
-        name: item.name,
-        nameEn: item.nameEn,
-        icon: item.icon,
-        loadType,
-        entry: getEntry(item.page),
-        pageConfig: item.page,
-      });
+    if (item.type === 'page' && item.pageId) {
+      const page = getMenuPage(item);
+      if (page && page.enabled) {
+        routes.push({
+          path: page.route,
+          name: item.name,
+          nameEn: item.nameEn,
+          icon: item.icon,
+          loadType: getLoadType(page),
+          entry: getEntry(page),
+          pageConfig: page,
+        });
+      }
     }
 
     if (item.children && item.children.length > 0) {
@@ -219,18 +288,25 @@ export const extractRoutes = (
 };
 
 /**
- * 获取菜单项的国际化名称
- * - 使用 key 作为 intl key 查找翻译
- * - 如果 intl 中没有对应的 key，则使用 fallbackName 作为兜底
- * - 如果没有传入 fallbackName，则使用 key 本身作为兜底
- *
- * @param key 国际化 key
- * @param fallbackName 保底名称（可选，默认使用 key）
- * @returns 翻译后的菜单名称
+ * 获取菜单项的显示名称
+ * 优先级：name/nameEn > nameKey（走 intl 国际化） > 兜底 name
  */
-export const getMenuLabel = (key: string, fallbackName?: string): string => {
-  const intl = getIntl();
-  return intl.formatMessage({ id: key, defaultMessage: fallbackName ?? key });
+export const getMenuLabel = (
+  fields: { name?: string; nameEn?: string; nameKey?: string },
+  isChinese: boolean,
+): string => {
+  const directName = isChinese ? fields.name : fields.nameEn;
+  if (directName) return directName;
+
+  if (fields.nameKey) {
+    const intl = getIntl();
+    return intl.formatMessage({
+      id: fields.nameKey,
+      defaultMessage: fields.nameKey,
+    });
+  }
+
+  return fields.name || '';
 };
 
 /**
@@ -244,18 +320,17 @@ export const parseMenuItems = (items: MenuItem[]): ParsedMenuItem[] => {
     .filter((item) => item.enabled)
     .sort((a, b) => a.sortOrder - b.sortOrder)
     .map((item) => {
-      const name = getMenuIdentifier(item, isChinese);
       const parsed: ParsedMenuItem = {
         key: String(item.id),
-        label: item.nameKey ? getMenuLabel(item.nameKey, name) : name,
+        label: getMenuLabel(item, isChinese),
         icon: item.icon,
         type: item.type,
       };
 
       if (item.type === 'link' && item.path) {
         parsed.path = item.path;
-      } else if (item.type === 'page' && item.page) {
-        parsed.path = item.page.route;
+      } else if (item.type === 'page') {
+        parsed.path = item.path ?? getMenuPage(item)?.route;
       }
 
       if (item.children && item.children.length > 0) {