generator-mico-cli 0.2.20 → 0.2.21

package/generators/micro-react/templates/apps/layout/docs/feature-/350/217/234/345/215/225/346/235/203/351/231/220/346/216/247/345/210/266.md

@@ -1,6 +1,6 @@
 # 菜单权限控制
 
-> 创建时间：2026-01-24 更新时间：2026-01-27
+> 创建时间：2026-01-24 更新时间：2026-02-08
 
 ## 功能概述
 
@@ -92,6 +92,10 @@
     ├── 是 → 允许访问所有菜单
     │
     ▼
+菜单项 adminOnly === true？
+    ├── 是 → 禁止访问（仅超级管理员可见）
+    │
+    ▼
 检查 side_menus 白名单
     ├── 精确匹配：menuPath === side_menus[i]
     ├── 前缀匹配：side_menus[i].startsWith(menuPath + '.')
@@ -241,7 +245,7 @@ export const NO_PERMISSION_ROUTE_LIST: string[] = ['/403', '/404'];
 │   └── 配置队列     ✅ 精确匹配 "列队管理.配置队列"
 ├── 质量管理         ❌ 不在白名单
 │   └── 抽样检查     ❌ 不在白名单
-└── 权限管理         ❌ 硬编码禁止（非超级用户）
+└── 权限管理         ❌ adminOnly=true，非超级用户不可见
 ```
 
 ### Layout 中的权限判断
@@ -288,6 +292,7 @@ if (!isAuthReady) {
 | 免权限路由的菜单 | 显示全部 | 用户访问公开页面时应能看到所有导航选项 |
 | 免权限路由的子应用 | 直接加载 | 不等待 currentUser，避免加载卡住 |
 | 静态路由不受权限控制 | 默认允许访问 | 见下方"静态路由与动态路由"说明 |
+| adminOnly 判断 | 读取菜单数据字段 | 替代硬编码菜单名称匹配，由后端数据驱动，支持多语言且无需前端维护 |
 
 ## 静态路由与动态路由
 

package/generators/micro-react/templates/apps/layout/docs/utils-timezone.md

@@ -307,12 +307,13 @@ getCurrentTimezone() / getTimezone()
    }
    ```
 
+
 ## 文件清单
 
 | 文件路径 | 说明 |
-|----------|------|
+| --- | --- |
 | `apps/layout/src/common/helpers.ts` | 时区工具函数实现 |
-| `apps/layout/src/common/auth/type.ts` | 存储键常量定义（`STORAGE_KEYS.TIMEZONE` 等） |
+| `apps/layout/src/constants/index.ts` | 存储键常量定义（`TIMEZONE`、`STORAGE_KEYS` 等） |
 | `apps/layout/src/services/config/index.ts` | 时区列表 API 服务 |
 | `apps/layout/src/services/config/type.ts` | 时区类型定义 |
 | `apps/layout/src/components/RightContent/AvatarDropdown.tsx` | 时区切换 UI 组件 |
@@ -320,3 +321,4 @@ getCurrentTimezone() / getTimezone()
 ## 相关文档
 
 - [AvatarDropdown 组件](../apps/layout/docs/feature-avatar-dropdown.md)
+

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

@@ -21,7 +21,10 @@
 import type { MenuItem, PageConfig } from '@/common/menu/types';
 
 /** Mock 页面配置 - 只需要核心字段 */
-type MockPageConfig = Pick<PageConfig, 'id' | 'name' | 'route' | 'enabled' | 'htmlUrl' | 'jsUrls' | 'cssUrls'>;
+type MockPageConfig = Pick<PageConfig,
+  | 'id' | 'name' | 'route' | 'enabled' | 'htmlUrl' | 'jsUrls' | 'cssUrls'
+  | 'adminOnly'
+>;
 
 /** Mock 菜单项 - page 字段使用简化类型，包含多语言字段 */
 type MockMenuItem = Omit<MenuItem, 'page' | 'children'> & {
@@ -155,12 +158,14 @@ const mockMenus: MockMenuItem[] = [
     "enabled": true,
     "sortOrder": 3,
     "pageId": null,
+    "adminOnly": true,
     "page": {
       "id": 8,
       "name": "permission",
       "route": "/permission",
       "enabled": true,
-      "htmlUrl": "//localhost:8010",
+      "adminOnly": true,
+      "htmlUrl": "https://cdn-portal.micoplatform.com/portal-center/common-web/0.0.1/permission/index.html",
       "jsUrls": [],
       "cssUrls": []
     },

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

@@ -25,8 +25,6 @@
     "@mico-platform/ui": "<%= micoUiVersion %>",
     "@mico-platform/theme": "<%= themeVersion %>",
     "@umijs/max": "^4.6.15",
-    "babel-plugin-dynamic-import-node": "^2.3.3",
-    "cross-env": "^10.1.0",
     "dayjs": "^1.11.19",
     "qiankun": "^2.10.16",
     "react": "^18.2.0",
@@ -37,6 +35,9 @@
     "@types/react": "^18.0.33",
     "@types/react-dom": "^18.0.11",
     "@types/spark-md5": "^3.0.5",
+    "babel-plugin-dynamic-import-node": "^2.3.3",
+    "babel-plugin-import": "^1.13.8",
+    "cross-env": "^10.1.0",
     "lint-staged": "^13.2.0",
     "prettier": "^2.8.7",
     "prettier-plugin-organize-imports": "^3.2.2",

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

@@ -55,14 +55,11 @@ export const getMenuIdentifier = (
   return item.nameEn || item.nameKey || '';
 };
 
-// 权限管理菜单的多格式标识符（用于硬编码权限判断）
-const PERMISSION_MENU_IDENTIFIERS = ['权限管理', 'Permission', 'permission'];
-
 /**
  * 检查菜单路径是否允许访问（白名单逻辑）
  * - 免权限校验路由，始终允许访问
  * - 超级用户可以访问所有菜单
- * - 非超级用户不能访问"权限管理"
+ * - 非超级用户不能访问 adminOnly 菜单
  * - 菜单路径在 sideMenus 中，或是 sideMenus 中某项的前缀（父级菜单）
  */
 const isMenuAllowed = (
@@ -82,11 +79,8 @@ const isMenuAllowed = (
   // 超级用户可以访问所有菜单
   if (isSuperuserUser(options.isSuperuser)) return true;
 
-  // 非超级用户不能访问"权限管理"（支持多格式匹配）
-  if (PERMISSION_MENU_IDENTIFIERS.includes(menuPath)) return false;
-
-  // 非超级用户不能访问"权限管理"
-  if (menuPath === '权限管理') return false;
+  // 非超级用户不能访问 adminOnly 菜单
+  if (item.adminOnly) return false;
 
   const sideMenus = options.sideMenus || [];
 
@@ -103,12 +97,6 @@ const isMenuAllowed = (
   });
 };
 
-export const isRouteAllowed = (
-  menuPath: string,
-  options: MenuFilterOptions = {},
-): boolean => {
-  return isMenuAllowed(menuPath, options);
-};
 /**
  * 根据权限过滤菜单项（白名单逻辑）
  */

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

@@ -28,6 +28,8 @@ export interface PageConfig {
   prefixPath: string;
   /** 路由匹配模式 */
   routeMode: PageRouteMode;
+  /** 是否仅超级管理员可见 */
+  adminOnly?: boolean;
   /** 关联的主文档 ID */
   mainDocumentId: number;
   /** 所属工作空间子域名 */
@@ -67,6 +69,8 @@ export interface MenuItem {
   pageId: number | null;
   /** 页面配置（type=page 时存在） */
   page: PageConfig | null;
+  /** 是否仅超级管理员可见 */
+  adminOnly?: boolean;
   children: MenuItem[];
 }
 

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

@@ -8,7 +8,6 @@
 }
 
 #root {
-  height: 100vh;
-  min-height: 800px;
+  min-height: 100vh;
   display: flex;
 }

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

@@ -26,7 +26,8 @@
     "lint-staged": "pnpm exec lint-staged --quiet",
     "prepare": "husky",
     "test": "dotenv -e .env -e .env.local -- turbo run test",
-    "create:umi-app": "./scripts/create-umi-app.sh"
+    "create:umi-app": "./scripts/create-umi-app.sh",
+    "upgrade:mico": "npx @mico-platform/mico-up"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.5.0",

package/generators/subapp-react/index.js

@@ -9,10 +9,10 @@ const {
   collectFiles,
   transformDestPath,
   isTemplateFile,
-  getLatestNpmVersion,
+  getPackageVersionsParallel,
   setupErrorHandlers,
   createLogger,
-  // isVerbose,
+  loadMicorc,
 } = require('../../lib/utils');
 
 const IGNORE_LIST = require('./ignore-list.json');
@@ -24,6 +24,18 @@ module.exports = class extends Generator {
   initializing() {
     this.monorepoRoot = process.cwd();
     this.logger = createLogger(this);
+
+    // 检查 dry-run 模式
+    this.isDryRun = this.options.dryRun || process.env.MICO_DRY_RUN === '1';
+
+    // 加载 .micorc 配置
+    const { config: rcConfig, configPath } = loadMicorc(this.monorepoRoot);
+    this.rcConfig = rcConfig;
+    if (configPath) {
+      this.logger.verbose('Loaded config from:', configPath);
+      this.logger.verbose('Config:', JSON.stringify(rcConfig, null, 2));
+    }
+
     const appsDir = path.join(this.monorepoRoot, 'apps');
     const workspaceFile = path.join(this.monorepoRoot, 'pnpm-workspace.yaml');
 
@@ -77,13 +89,14 @@ module.exports = class extends Generator {
       }
 
       const detectedScope = this._detectPackageScope();
+      const rc = this.rcConfig || {};
 
       this.answers = await this.prompt([
         {
           type: 'input',
           name: 'appName',
           message: 'Sub app name',
-          default: 'subapp',
+          default: rc.defaultSubappName || 'subapp',
           filter: (input) => toKebab(input),
           validate: (input) => {
             const value = toKebab(input);
@@ -99,7 +112,7 @@ module.exports = class extends Generator {
           type: 'input',
           name: 'packageScope',
           message: 'Package scope',
-          default: detectedScope || '@my-project',
+          default: rc.packageScope || detectedScope || '@my-project',
           validate: (input) => {
             if (!input) return 'Package scope is required';
             if (!input.startsWith('@')) return 'Package scope must start with @';
@@ -122,7 +135,7 @@ module.exports = class extends Generator {
     }
   }
 
-  writing() {
+  async writing() {
     try {
       if (!fs.existsSync(this.templateDir)) {
         console.error('');
@@ -132,20 +145,25 @@ module.exports = class extends Generator {
         process.exit(1);
       }
 
-      this.log('');
-      this.log(`📦 Creating sub-app: ${this.appName}`);
-      this.log(`   Destination: apps/${this.appName}`);
-      this.log('');
-
       this.logger.verbose('Template directory:', this.templateDir);
       this.logger.verbose('Destination directory:', this.destDir);
 
       // 在 mico_cli 根目录执行 npm view，以使用该目录 .npmrc 中的 Nexus 认证
       const cliRoot = path.resolve(__dirname, '../..');
-      this.logger.verbose('Fetching latest package versions...');
+      this.logger.verbose('Fetching latest package versions (parallel)...');
+
+      // 并行获取版本
+      const versions = await getPackageVersionsParallel(
+        [
+          { name: '@mico-platform/ui', fallback: '1.0.0' },
+          { name: '@mico-platform/theme', fallback: '1.0.0' },
+        ],
+        8000,
+        cliRoot,
+      );
 
-      const micoUiVer = getLatestNpmVersion('@mico-platform/ui', '1.0.0', 8000, cliRoot);
-      const themeVer = getLatestNpmVersion('@mico-platform/theme', '1.0.0', 8000, cliRoot);
+      const micoUiVer = versions['@mico-platform/ui'];
+      const themeVer = versions['@mico-platform/theme'];
 
       this.logger.verbose('@mico-platform/ui version:', micoUiVer);
       this.logger.verbose('@mico-platform/theme version:', themeVer);
@@ -171,6 +189,50 @@ module.exports = class extends Generator {
         process.exit(1);
       }
 
+      // Dry-run 模式：只列出文件，不实际创建
+      if (this.isDryRun) {
+        this.log('');
+        this.log('\x1b[33m📋 Dry run mode - no files will be created\x1b[0m');
+        this.log('');
+        this.log(`   Sub-app: ${this.appName}`);
+        this.log(`   Scope: ${this.packageScope}`);
+        this.log(`   Destination: apps/${this.appName}`);
+        this.log('');
+        this.log('   Would create the following files:');
+        this.log('');
+
+        let templateCount = 0;
+        let copyCount = 0;
+
+        for (const relPath of files) {
+          const destRelPath = transformDestPath(relPath);
+          const isTemplate = isTemplateFile(relPath);
+          const tag = isTemplate ? '\x1b[32m[tpl]\x1b[0m' : '\x1b[36m[cpy]\x1b[0m';
+          this.log(`   ${tag} apps/${this.appName}/${destRelPath}`);
+
+          if (isTemplate) {
+            templateCount++;
+          } else {
+            copyCount++;
+          }
+        }
+
+        this.log('');
+        this.log(`   Total: ${files.length} files (${templateCount} templates, ${copyCount} static)`);
+        this.log('');
+        this.log('   Run without --dry-run to actually create these files.');
+        this.log('');
+
+        // 设置标记以跳过后续阶段
+        this._skipInstall = true;
+        return;
+      }
+
+      this.log('');
+      this.log(`📦 Creating sub-app: ${this.appName}`);
+      this.log(`   Destination: apps/${this.appName}`);
+      this.log('');
+
       this.logger.verbose(`Processing ${files.length} files...`);
 
       let templateCount = 0;
@@ -203,6 +265,9 @@ module.exports = class extends Generator {
   }
 
   install() {
+    // 跳过 dry-run 模式
+    if (this._skipInstall) return;
+
     this.log('');
     this.log('📦 正在安装依赖...');
     this.spawnCommandSync('pnpm', ['install'], {
@@ -211,6 +276,9 @@ module.exports = class extends Generator {
   }
 
   end() {
+    // 跳过 dry-run 模式
+    if (this._skipInstall) return;
+
     this.log('');
     this.log('✅ 子应用创建成功！');
     this.log('');

package/generators/subapp-react/templates/homepage/config/config.dev.ts

@@ -2,6 +2,13 @@
 
 import { defineConfig } from '@umijs/max';
 
+/**
+ * ⚠️⚠️ 不要修改这个变量名，版本升级工具会读取这个变量名，进行版本升级
+ * @name mico-ui 版本
+ * @description 开发环境使用 mico-ui 的最新版本
+ */
+const MICO_UI_VERSION = '<%= micoUiVersionExact %>';
+
 /**
  * 开发环境配置
  * - 不配置 externals，直接打包依赖，方便独立运行调试
@@ -52,7 +59,7 @@ const config: ReturnType<typeof defineConfig> = {
    */
   styles: [
     // @mico-platform/ui 基础样式（使用运行时解析的最新版本号，避免 latest 标签）
-    'https://cdn-portal-test.micoplatform.com/portal-center/mico-ui/<%= micoUiVersionExact %>/ui/dist/css/mico-ui.min.css'
+    `https://cdn-portal.micoplatform.com/portal-center/mico-ui/${MICO_UI_VERSION}/ui/dist/css/mico-ui.min.css`,
   ],
 };
 

package/generators/subapp-react/templates/homepage/config/config.ts

@@ -102,6 +102,27 @@ const config: ReturnType<typeof defineConfig> = {
   codeSplitting: {
     jsStrategy: 'granularChunks',
   },
+
+  /**
+   * @name 额外 Babel Presets
+   * @description 使用 @mico-platform/ui 的 babel preset，实现组件与图标的按需加载
+   */
+  extraBabelPresets: ['@mico-platform/ui/babel-preset'],
+
+  /**
+   * @name MFSU 配置
+   * @description
+   * - exclude: theme 子路径解析；ui 尽量与主应用一起编译
+   * - shared: React 单例，确保 MFSU 预打包里的组件（如 UI 库）与应用共用同一份 React，否则 useContext 报 null
+   * @doc https://umijs.org/docs/guides/mfsu
+   */
+  mfsu: {
+    exclude: ['@mico-platform/theme', '@mico-platform/ui'],
+    shared: {
+      react: { singleton: true },
+      'react-dom': { singleton: true },
+    },
+  },
 };
 
 export default defineConfig(config);

package/generators/subapp-react/templates/homepage/config/routes.ts

@@ -1,6 +1,6 @@
 /**
  * @name 路由配置
- * @description homepage 子应用的路由配置
+ * @description <%= appName %> 子应用的路由配置
  */
 export default [
   { path: '/<%= appName %>', component: '@/pages/index' },

package/generators/subapp-react/templates/homepage/mock/api.mock.ts

@@ -1,6 +1,6 @@
 /**
  * @name Mock API
- * @description homepage 子应用的 Mock 数据
+ * @description <%= appName %> 子应用的 Mock 数据
  * @doc https://umijs.org/docs/guides/mock
  */
 
@@ -12,7 +12,7 @@ export default {
   //     id: 1001,
   //     name: '张三',
   //     email: 'zhangsan@example.com',
-  //     avatar: 'https://api.dicebear.com/7.x/avataaars/svg?seed=homepage',
+  //     avatar: 'https://api.dicebear.com/7.x/avataaars/svg?seed=<%= appName %>',
   //     role: 'admin',
   //     department: '技术部',
   //   },

package/generators/subapp-react/templates/homepage/package.json

@@ -17,8 +17,6 @@
   "dependencies": {
     "@mico-platform/theme": "<%= themeVersion %>",
     "@umijs/max": "^4.4.8",
-    "babel-plugin-dynamic-import-node": "^2.3.3",
-    "cross-env": "^10.1.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
@@ -26,6 +24,9 @@
     "@mico-platform/ui": "<%= micoUiVersion %>",
     "@types/react": "^18.0.33",
     "@types/react-dom": "^18.0.11",
+    "babel-plugin-dynamic-import-node": "^2.3.3",
+    "babel-plugin-import": "^1.13.8",
+    "cross-env": "^10.1.0",
     "typescript": "^5.0.3"
   }
 }

package/generators/subapp-react/templates/homepage/src/app.tsx

@@ -1,6 +1,6 @@
 /**
  * @name 应用入口配置
- * @description homepage 子应用的运行时配置
+ * @description <%= appName %> 子应用的运行时配置
  * @doc https://umijs.org/docs/max/micro-frontend#子应用配置
  *
  * 注意：app.tsx 只能导出 Umi 规定的 API（qiankun、getInitialState 等）

package/generators/subapp-react/templates/homepage/src/common/request.ts

@@ -26,12 +26,12 @@ export async function request<T = any>(
 
   if (mainAppRequest) {
     // 微前端模式：使用主应用的 request
-    console.log('[homepage] Using main app request:', url);
+    console.log('[<%= appName %>] Using main app request:', url);
     return mainAppRequest<T>(url, options);
   }
 
   // 独立运行模式：使用 umi request
-  console.log('[homepage] Using umi request:', url);
+  console.log('[<%= appName %>] Using umi request:', url);
   // umi request 默认返回 data，skipErrorHandler 可选
   return umiRequest<T>(url, {
     skipErrorHandler: true,

package/generators/subapp-react/templates/homepage/src/global.less

@@ -20,7 +20,8 @@ body {
     'Noto Sans', sans-serif;
 }
 
-#homepage-root {
+#<%= appName %>-root {
   width: 100%;
   height: 100%;
+  background-color: var(--color-fill-1);
 }

package/generators/subapp-react/templates/homepage/src/pages/index.less

@@ -6,7 +6,7 @@
 // 导入主题变量（仅 Less 变量，子应用用）
 @import '@mico-platform/theme/variables';
 
-.homepage {
+.<%= appName %> {
   padding: @spacing-lg;
   min-height: 100vh;
   // 使用主题色变量 - 背景色会随主题切换自动变化

package/generators/subapp-react/templates/homepage/src/pages/index.tsx

@@ -135,7 +135,7 @@ export default function HomePage() {
   };
 
   return (
-    <div className="homepage">
+    <div className="<%= appName %>">
       <Title heading={2}>🎨 子应用主题 & 组件示例</Title>
       <Paragraph type="secondary">
         子应用复用主应用的 React 和 @mico-platform/ui，无重复打包，主题自动同步
@@ -316,44 +316,44 @@ export default function HomePage() {
         </Paragraph>
 
         <Title heading={6}>品牌色 & 功能色</Title>
-        <div className="homepage-colors">
-          <div className="homepage-color-item">
-            <div className="homepage-color-box brand-1" />
-            <span className="homepage-color-label">@Brand1-6</span>
+        <div className="<%= appName %>-colors">
+          <div className="<%= appName %>-color-item">
+            <div className="<%= appName %>-color-box brand-1" />
+            <span className="<%= appName %>-color-label">@Brand1-6</span>
           </div>
-          <div className="homepage-color-item">
-            <div className="homepage-color-box brand-2" />
-            <span className="homepage-color-label">@Brand2-6</span>
+          <div className="<%= appName %>-color-item">
+            <div className="<%= appName %>-color-box brand-2" />
+            <span className="<%= appName %>-color-label">@Brand2-6</span>
           </div>
-          <div className="homepage-color-item">
-            <div className="homepage-color-box success" />
-            <span className="homepage-color-label">@Success-6</span>
+          <div className="<%= appName %>-color-item">
+            <div className="<%= appName %>-color-box success" />
+            <span className="<%= appName %>-color-label">@Success-6</span>
           </div>
-          <div className="homepage-color-item">
-            <div className="homepage-color-box warning" />
-            <span className="homepage-color-label">@Warning-6</span>
+          <div className="<%= appName %>-color-item">
+            <div className="<%= appName %>-color-box warning" />
+            <span className="<%= appName %>-color-label">@Warning-6</span>
           </div>
-          <div className="homepage-color-item">
-            <div className="homepage-color-box danger" />
-            <span className="homepage-color-label">@Danger-6</span>
+          <div className="<%= appName %>-color-item">
+            <div className="<%= appName %>-color-box danger" />
+            <span className="<%= appName %>-color-label">@Danger-6</span>
           </div>
         </div>
 
         <Title heading={6} style={{ marginTop: 16 }}>
           中性色（随主题自动切换）
         </Title>
-        <div className="homepage-colors">
-          <div className="homepage-color-item">
-            <div className="homepage-color-box fill-1" />
-            <span className="homepage-color-label">@color-fill-1</span>
+        <div className="<%= appName %>-colors">
+          <div className="<%= appName %>-color-item">
+            <div className="<%= appName %>-color-box fill-1" />
+            <span className="<%= appName %>-color-label">@color-fill-1</span>
           </div>
-          <div className="homepage-color-item">
-            <div className="homepage-color-box fill-2" />
-            <span className="homepage-color-label">@color-fill-2</span>
+          <div className="<%= appName %>-color-item">
+            <div className="<%= appName %>-color-box fill-2" />
+            <span className="<%= appName %>-color-label">@color-fill-2</span>
           </div>
-          <div className="homepage-color-item">
-            <div className="homepage-color-box fill-3" />
-            <span className="homepage-color-label">@color-fill-3</span>
+          <div className="<%= appName %>-color-item">
+            <div className="<%= appName %>-color-box fill-3" />
+            <span className="<%= appName %>-color-label">@color-fill-3</span>
           </div>
         </div>
       </Card>