generator-mico-cli 0.2.6 → 0.2.8

package/generators/micro-react/templates/.cursor/rules/development-guide.mdc

@@ -179,8 +179,7 @@ document.body.setAttribute('data-theme', 'dark');
 ### 文件位置
 ```
 apps/layout/mock/
-├── menus.json         # 菜单数据
-├── menus.ts           # 菜单数据处理
+├── menus.ts           # 菜单 Mock 数据（带类型）
 └── user.mock.ts       # 用户相关 Mock API
 ```
 

package/generators/micro-react/templates/.eslintrc.js

@@ -25,6 +25,7 @@ module.exports = {
     'dist/',
     'apps/',
     'scripts/',
+    '**/*.d.ts',
   ],
 };
 

package/generators/micro-react/templates/apps/layout/config/config.dev.ts

@@ -1,13 +1,9 @@
 // https://umijs.org/config/
 
 import { defineConfig } from '@umijs/max';
-import fs from 'fs';
-import path from 'path';
 
-// 使用 fs 读取 JSON 避免成为配置依赖，修改 menus.json 不会触发服务器重启
-const mockMenus = JSON.parse(
-  fs.readFileSync(path.join(__dirname, '../mock/menus.json'), 'utf-8'),
-);
+
+import mockMenus from '../mock/menus';
 
 const config: ReturnType<typeof defineConfig> = {
   publicPath: '/',
@@ -47,15 +43,15 @@ const config: ReturnType<typeof defineConfig> = {
   },
   define: {
     'process.env.NODE_ENV': 'development',
-    'process.env.APP_ID': 'mibot_dev',
+    'process.env.APP_ID': '<%= projectName %>',
     'process.env.API_BASE_URL': '',
-    'process.env.PROXY_SUFFIX': '/',
+    'process.env.PROXY_SUFFIX': '/proxy/audit_svr',
     'process.env.LOGIN_ENDPOINT':
-      '',
+      'https://dashboard-api-test.micoplatform.com/api/yufu_login/',
     'process.env.REFRESH_ENDPOINT':
-      '',
+      'https://dashboard-api-test.micoplatform.com/api/yufu_login/refresh/',
     'process.env.EXTERNAL_LOGIN_PATH':
-      '',
+      'https://micous-idp.cig.tencentcs.com/sso/xxxxxxx/cas',
   },
 };
 

package/generators/micro-react/templates/apps/layout/config/config.prod.development.ts

@@ -1,43 +1,19 @@
 // https://umijs.org/config/
 
 import { defineConfig } from '@umijs/max';
-import fs from 'fs';
-import path from 'path';
-
-// 使用 fs 读取 JSON 避免成为配置依赖，修改 menus.json 不会触发服务器重启
-const mockMenus = JSON.parse(
-  fs.readFileSync(path.join(__dirname, '../mock/menus.json'), 'utf-8'),
-);
 
 const config: ReturnType<typeof defineConfig> = {
-  publicPath: '/',
-  /**
-   * @name 注入到 HTML head 的脚本
-   * @description 开发环境注入 mock 菜单数据
-   * @doc https://umijs.org/docs/api/config#headscripts
-   */
-  headScripts: [
-    {
-      content: `
-        window.__MICO_MENUS__ = ${JSON.stringify(mockMenus)};
-        window.__MICO_CONFIG__ = {
-          appName: 'Mico Center',
-          apiBaseUrl: '',
-        };
-      `,
-    },
-  ],
   define: {
     'process.env.NODE_ENV': 'development',
-    'process.env.APP_ID': 'mibot_dev',
-    'process.env.API_BASE_URL': 'https://dashboard-api-test.micoplatform.com',
-    'process.env.PROXY_SUFFIX': '/',
+    'process.env.APP_ID': '<%= projectName %>',
+    'process.env.API_BASE_URL': '',
+    'process.env.PROXY_SUFFIX': '/proxy/audit_svr',
     'process.env.LOGIN_ENDPOINT':
-      '',
+      'https://dashboard-api-test.micoplatform.com/api/yufu_login/',
     'process.env.REFRESH_ENDPOINT':
-      '',
+      'https://dashboard-api-test.micoplatform.com/api/yufu_login/refresh/',
     'process.env.EXTERNAL_LOGIN_PATH':
-      '',
+      'https://micous-idp.cig.tencentcs.com/sso/xxxxxxx/cas',
   },
 };
 

package/generators/micro-react/templates/apps/layout/config/config.prod.testing.ts

@@ -5,15 +5,15 @@ import { defineConfig } from '@umijs/max';
 const config: ReturnType<typeof defineConfig> = {
   define: {
     'process.env.NODE_ENV': 'testing',
-    'process.env.APP_ID': 'mibot',
-    'process.env.API_BASE_URL': 'https://dashboard-api-test.micoplatform.com',
-    'process.env.PROXY_SUFFIX': '/',
+    'process.env.APP_ID': '<%= projectName %>',
+    'process.env.API_BASE_URL': '',
+    'process.env.PROXY_SUFFIX': '/proxy/audit_svr',
     'process.env.LOGIN_ENDPOINT':
-      '',
+      'https://dashboard-api-test.micoplatform.com/api/yufu_login/',
     'process.env.REFRESH_ENDPOINT':
-      '',
+      'https://dashboard-api-test.micoplatform.com/api/yufu_login/refresh/',
     'process.env.EXTERNAL_LOGIN_PATH':
-      '',
+      'https://micous-idp.cig.tencentcs.com/sso/xxxxxxx/cas',
   },
 };
 

package/generators/micro-react/templates/apps/layout/config/config.prod.ts

@@ -10,15 +10,15 @@ const PUBLIC_PATH: string = CDN_PUBLIC_PATH
 const config: ReturnType<typeof defineConfig> = {
   define: {
     'process.env.NODE_ENV': 'production',
-    'process.env.APP_ID': 'mibot',
-    'process.env.API_BASE_URL': 'https://dashboard-api.micoplatform.com',
-    'process.env.PROXY_SUFFIX': '/',
+    'process.env.APP_ID': '<%= projectName %>',
+    'process.env.API_BASE_URL': '',
+    'process.env.PROXY_SUFFIX': '/proxy/audit_svr',
     'process.env.LOGIN_ENDPOINT':
-      '',
+      'https://dashboard-api-test.micoplatform.com/api/yufu_login/',
     'process.env.REFRESH_ENDPOINT':
-      '',
+      'https://dashboard-api-test.micoplatform.com/api/yufu_login/refresh/',
     'process.env.EXTERNAL_LOGIN_PATH':
-      '',
+      'https://micous-idp.cig.tencentcs.com/sso/xxxxxxx/cas',
   },
   // 生产环境：将所有代码打包到一个文件
   extraBabelPlugins: ['babel-plugin-dynamic-import-node'],

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

@@ -98,6 +98,7 @@ const config: ReturnType<typeof defineConfig> = {
    */
   mock: {
     include: ['mock/**/_mock.ts', 'mock/**/*.mock.ts', 'src/pages/**/_mock.ts'],
+    exclude: ['mock/**/menus.ts'],
   },
 
   /**

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

@@ -2,10 +2,132 @@
  * Mock 菜单数据
  * 用于开发环境测试
  *
- * 注意：实际数据存放在 menus.json 中
- * 修改菜单数据请编辑 menus.json 文件，不会触发服务器重启
+ * 菜单结构说明:
+ * - id: 菜单唯一标识
+ * - name: 菜单名称
+ * - type: 'page' | 'group' (page: 页面, group: 分组)
+ * - path: 路由路径 (group 类型为 null)
+ * - icon: 图标名称
+ * - enabled: 是否启用
+ * - sortOrder: 排序权重
+ * - pageId: 关联的页面 ID
+ * - page: 页面配置 (微前端入口)
+ *   - htmlUrl: 子应用入口地址
+ *   - jsUrls: 额外 JS 资源
+ *   - cssUrls: 额外 CSS 资源
+ * - children: 子菜单数组
  */
-import mockMenusData from './menus.json';
 
-export const mockMenus = mockMenusData;
+import type { MenuItem, PageConfig } from '@/common/menu/types';
+
+/** Mock 页面配置 - 只需要核心字段 */
+type MockPageConfig = Pick<PageConfig, 'id' | 'name' | 'route' | 'enabled' | 'htmlUrl' | 'jsUrls' | 'cssUrls'>;
+
+/** Mock 菜单项 - page 字段使用简化类型 */
+type MockMenuItem = Omit<MenuItem, 'page' | 'children'> & {
+  page: MockPageConfig | null;
+  children: MockMenuItem[];
+};
+
+const mockMenus: MockMenuItem[] = [
+  {
+    "id": 1,
+    "name": "首页",
+    "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": 2,
+    "name": "示例模块",
+    "type": "group",
+    "path": null,
+    "icon": "List",
+    "enabled": true,
+    "sortOrder": 1,
+    "pageId": null,
+    "page": null,
+    "children": [
+      {
+        "id": 3,
+        "name": "示例页面",
+        "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": 5,
+    "name": "微应用示例",
+    "type": "group",
+    "path": null,
+    "icon": "Apps",
+    "enabled": true,
+    "sortOrder": 2,
+    "pageId": null,
+    "page": null,
+    "children": [
+      {
+        "id": 6,
+        "name": "子应用页面",
+        "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": 7,
+    "name": "外部链接",
+    "type": "link",
+    "path": "https://github.com",
+    "icon": "Link",
+    "enabled": true,
+    "sortOrder": 3,
+    "pageId": null,
+    "page": null,
+    "children": []
+  }
+]
+
 export default mockMenus;

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

@@ -1,5 +1,5 @@
-import { history, Navigate, type RequestConfig } from '@umijs/max';
-import { addGlobalUncaughtErrorHandler, prefetchApps } from 'qiankun';
+import { history, type RequestConfig } from '@umijs/max';
+import { addGlobalUncaughtErrorHandler } from 'qiankun';
 import { errorConfig } from './requestErrorConfig';
 // 解决「React19 中无法使用 Message/Notification」的问题。 @see https://github.com/arco-design/arco-design/issues/2900#issuecomment-2796571653
 import * as arco from '@arco-design/web-react';

package/generators/micro-react/templates/apps/layout/src/constants/index.ts

@@ -1,7 +1,7 @@
 /**
  * 应用常量定义
  */
-
+export const DEFAULT_NAME = 'Mico';
 /**
  * 路由路径常量
  */

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

@@ -14,7 +14,6 @@ import {
   IconPoweroff,
   IconSettings,
   IconSunFill,
-  IconUser,
 } from '@arco-design/web-react/icon';
 import { useModel } from '@umijs/max';
 import React, { useCallback } from 'react';

package/generators/micro-react/templates/apps/layout/tailwind.config.js

@@ -1,6 +1,9 @@
 module.exports = {
   content: [
     './src/**/*.{js,jsx,ts,tsx,less,css}',
+    // 排除 .umi 目录，避免 Tailwind 重建时触发自己的 watch，导致无限循环
+    '!./src/.umi/**',
+    '!./src/.umi-production/**',
     './README.md',
     './docs/**/*.{md,mdx}',
   ],

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

@@ -46,4 +46,31 @@ export function getRequestSource(): 'main-app' | 'umi' {
   return getMainAppRequest() ? 'main-app' : 'umi';
 }
 
+/**
+ * 从错误对象中提取错误消息
+ * 优先使用后端返回的 msg，否则使用默认消息
+ */
+export function getErrorMessage(error: unknown, defaultMsg: string): string {
+  if (error && typeof error === 'object') {
+    // 尝试从 error.data.msg 获取（umi-request 格式）
+    const err = error as Record<string, any>;
+    if (err.data?.msg) {
+      return err.data.msg;
+    }
+    // 尝试从 error.response.data.msg 获取（axios 格式）
+    if (err.response?.data?.msg) {
+      return err.response.data.msg;
+    }
+    // 尝试从 error.msg 获取
+    if (err.msg) {
+      return err.msg;
+    }
+    // 尝试从 error.message 获取
+    if (err.message) {
+      return err.message;
+    }
+  }
+  return defaultMsg;
+}
+
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-mico-cli",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "description": "Yeoman generator for Mico CLI projects",
   "keywords": [
     "yeoman-generator",

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

@@ -1,100 +0,0 @@
-[
-  {
-    "id": 1,
-    "name": "首页",
-    "type": "page",
-    "path": null,
-    "icon": "Home",
-    "enabled": true,
-    "sortOrder": 0,
-    "pageId": 1,
-    "page": {
-      "id": 1,
-      "name": "home",
-      "route": "/",
-      "enabled": true,
-      "htmlUrl": null,
-      "jsUrls": [],
-      "cssUrls": []
-    },
-    "children": []
-  },
-  {
-    "id": 2,
-    "name": "示例模块",
-    "type": "group",
-    "path": null,
-    "icon": "List",
-    "enabled": true,
-    "sortOrder": 1,
-    "pageId": null,
-    "page": null,
-    "children": [
-      {
-        "id": 3,
-        "name": "示例页面",
-        "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": null,
-          "jsUrls": [],
-          "cssUrls": []
-        },
-        "children": []
-      }
-    ]
-  },
-  {
-    "id": 5,
-    "name": "微应用示例",
-    "type": "group",
-    "path": null,
-    "icon": "Apps",
-    "enabled": true,
-    "sortOrder": 2,
-    "pageId": null,
-    "page": null,
-    "children": [
-      {
-        "id": 6,
-        "name": "子应用页面",
-        "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": 7,
-    "name": "外部链接",
-    "type": "link",
-    "path": "https://github.com",
-    "icon": "Link",
-    "enabled": true,
-    "sortOrder": 3,
-    "pageId": null,
-    "page": null,
-    "children": []
-  }
-]