generator-mico-cli 0.2.18 → 0.2.19

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

@@ -48,7 +48,7 @@ const config: ReturnType<typeof defineConfig> = {
       // 依赖 origin 的功能可能需要这个，比如 cookie
       changeOrigin: true,
     },
-    '/proxy/audit_svr': {
+    '/proxy/<%= projectName %>_svr': {
       // 要代理的地址
       target: 'https://dashboard-api-test.micoplatform.com',
       // 配置了这个可以从 http 代理到 https
@@ -59,8 +59,8 @@ const config: ReturnType<typeof defineConfig> = {
   define: {
     'process.env.NODE_ENV': 'development',
     'process.env.APP_ID': '<%= projectName %>',
-    'process.env.API_BASE_URL': 'https://dashboard-api-test.micoplatform.com',
-    'process.env.PROXY_SUFFIX': '/proxy/audit_svr',
+    'process.env.API_BASE_URL': '',
+    'process.env.PROXY_SUFFIX': '/proxy/<%= projectName %>_svr',
     'process.env.LOGIN_ENDPOINT':
       'https://dashboard-api-test.micoplatform.com/api/yufu_login/',
     'process.env.REFRESH_ENDPOINT':

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

@@ -6,8 +6,8 @@ const config: ReturnType<typeof defineConfig> = {
   define: {
     'process.env.NODE_ENV': 'development',
     'process.env.APP_ID': '<%= projectName %>',
-    'process.env.API_BASE_URL': '',
-    'process.env.PROXY_SUFFIX': '/proxy/audit_svr',
+    'process.env.API_BASE_URL': 'https://dashboard-api-test.micoplatform.com',
+    'process.env.PROXY_SUFFIX': '/proxy/<%= projectName %>_svr',
     'process.env.LOGIN_ENDPOINT':
       'https://dashboard-api-test.micoplatform.com/api/yufu_login/',
     'process.env.REFRESH_ENDPOINT':

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

@@ -7,7 +7,7 @@ const config: ReturnType<typeof defineConfig> = {
     'process.env.NODE_ENV': 'testing',
     'process.env.APP_ID': '<%= projectName %>',
     'process.env.API_BASE_URL': 'https://dashboard-api-test.micoplatform.com',
-    'process.env.PROXY_SUFFIX': '/proxy/audit_svr',
+    'process.env.PROXY_SUFFIX': '/proxy/<%= projectName %>_svr',
     'process.env.LOGIN_ENDPOINT':
       'https://dashboard-api-test.micoplatform.com/api/yufu_login/',
     'process.env.REFRESH_ENDPOINT':

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

@@ -12,7 +12,7 @@ const config: ReturnType<typeof defineConfig> = {
     'process.env.NODE_ENV': 'production',
     'process.env.APP_ID': '<%= projectName %>',
     'process.env.API_BASE_URL': 'https://dashboard-api.micoplatform.com',
-    'process.env.PROXY_SUFFIX': '/proxy/audit_svr',
+    'process.env.PROXY_SUFFIX': '/proxy/<%= projectName %>_svr',
     'process.env.LOGIN_ENDPOINT':
       'https://dashboard-api.micoplatform.com/api/yufu_login/',
     'process.env.REFRESH_ENDPOINT':

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

@@ -22,7 +22,6 @@
     "test": "cross-env UMI_ENV=test max dev"
   },
   "dependencies": {
-    "<%= packageScope %>/common-intl": "workspace:*",
     "@mico-platform/ui": "<%= micoUiVersion %>",
     "@mico-platform/theme": "<%= themeVersion %>",
     "@umijs/max": "^4.6.15",

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

@@ -22,7 +22,7 @@ import {
 import { initTheme } from './common/theme';
 import MicroAppLoader from './components/MicroAppLoader';
 import { isNoAuthRoute } from '@/constants';
-import { getUmiLocale } from '@/common/locale';
+import { getCurrentLocale } from '@/common/locale';
 import './global.less';
 
 // ==================== qiankun 全局错误处理 ====================
@@ -93,16 +93,14 @@ if (typeof window !== 'undefined') {
 initTheme();
 
 // ==================== 国际化运行时配置 ====================
-// 使用 umi 本地文案，通过映射转换保持 localStorage 与 common-intl 统一
 
 /**
  * 运行时国际化配置
- * 自定义 getLocale 函数，将 common-intl 格式 (zh_CN, en) 转换为 umi 格式 (zh-CN, en-US)
  * @see https://umijs.org/docs/max/i18n#%E8%BF%90%E8%A1%8C%E6%97%B6%E9%85%8D%E7%BD%AE
  */
 export const locale = {
   getLocale() {
-    return getUmiLocale();
+    return getCurrentLocale();
   },
 };
 

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

@@ -12,39 +12,23 @@ const LOCALE_STORAGE_KEY = 'umi_locale';
 const URL_PARAM_KEY = 'lang';
 
 /**
- * common-intl 语言标识符（localStorage 存储格式）
+ * 支持的语言列表（umi 格式）
  */
-export const SUPPORTED_LOCALES = ['zh_CN', 'en', 'ar'] as const;
+export const SUPPORTED_LOCALES = ['zh-CN', 'en-US'] as const;
 export type SupportedLocale = (typeof SUPPORTED_LOCALES)[number];
 
 /**
- * umi 语言标识符（本地文案文件名格式）
+ * 语言枚举常量
  */
-export type UmiLocale = 'zh-CN' | 'en-US';
+export const LOCALE = {
+  ZH_CN: 'zh-CN',
+  EN_US: 'en-US',
+} as const;
 
 /**
- * 语言映射：common-intl → umi
- * localStorage 存储值 → umi 本地文案文件名
+ * 默认语言
  */
-const LOCALE_TO_UMI: Record<SupportedLocale, UmiLocale> = {
-  zh_CN: 'zh-CN',
-  en: 'en-US',
-  ar: 'en-US', // 阿拉伯语暂无本地文案，回退到英文
-};
-
-/**
- * 语言映射：umi → common-intl
- * umi 本地文案文件名 → localStorage 存储值
- */
-const UMI_TO_LOCALE: Record<UmiLocale, SupportedLocale> = {
-  'zh-CN': 'zh_CN',
-  'en-US': 'en',
-};
-
-/**
- * 默认语言（common-intl 格式）
- */
-const DEFAULT_LOCALE: SupportedLocale = 'en';
+const DEFAULT_LOCALE: SupportedLocale = 'en-US';
 
 /**
  * 从 URL 参数获取语言
@@ -74,20 +58,19 @@ function getLocaleFromStorage(): string | null {
 /**
  * 获取浏览器默认语言
  */
-function getBrowserLocale(): string {
+function getBrowserLocale(): SupportedLocale {
   if (typeof window === 'undefined') {
     return DEFAULT_LOCALE;
   }
   const browserLang = navigator.language || (navigator as any).userLanguage;
-  // 检查是否支持该语言
-  if (SUPPORTED_LOCALES.includes(browserLang as SupportedLocale)) {
-    return browserLang;
+  const locales = [...SUPPORTED_LOCALES];
+  // 检查是否直接支持该语言
+  if (locales.includes(browserLang as SupportedLocale)) {
+    return browserLang as SupportedLocale;
   }
-  // 检查语言前缀（如 zh-TW -> zh-CN）
+  // 检查语言前缀（如 zh-TW -> zh-CN, en-GB -> en-US）
   const langPrefix = browserLang.split('-')[0];
-  const matchedLocale = SUPPORTED_LOCALES.find((locale) =>
-    locale.startsWith(langPrefix),
-  );
+  const matchedLocale = locales.find((locale) => locale.startsWith(langPrefix));
   return matchedLocale || DEFAULT_LOCALE;
 }
 
@@ -98,7 +81,7 @@ function isValidLocale(locale: string | null): locale is SupportedLocale {
   if (!locale) {
     return false;
   }
-  return SUPPORTED_LOCALES.includes(locale as SupportedLocale);
+  return ([...SUPPORTED_LOCALES] as string[]).includes(locale);
 }
 
 /**
@@ -119,7 +102,7 @@ export function getCurrentLocale(): SupportedLocale {
   }
 
   // 3. 使用浏览器默认语言
-  return getBrowserLocale() as SupportedLocale;
+  return getBrowserLocale();
 }
 
 /**
@@ -140,36 +123,6 @@ export function setLocaleToStorage(locale: SupportedLocale): void {
  * 根据语言获取图标库路径
  */
 export function getIconFontPath(locale: SupportedLocale): string {
-  if (locale === 'ar-SA') {
-    return withPublicPath('/font/ar-SA.js');
-  }
+  // 如果后续需要支持 RTL 语言（如阿拉伯语），可在此扩展
   return withPublicPath('/font/default.js');
 }
-
-// ==================== 语言类型转换函数 ====================
-
-/**
- * 将 common-intl 语言标识符转换为 umi 格式
- * @param locale common-intl 格式的语言标识符 (zh_CN, en, ar)
- * @returns umi 格式的语言标识符 (zh-CN, en-US)
- */
-export function toUmiLocale(locale: SupportedLocale): UmiLocale {
-  return LOCALE_TO_UMI[locale] ?? 'en-US';
-}
-
-/**
- * 将 umi 语言标识符转换为 common-intl 格式
- * @param umiLocale umi 格式的语言标识符 (zh-CN, en-US)
- * @returns common-intl 格式的语言标识符 (zh_CN, en)
- */
-export function fromUmiLocale(umiLocale: UmiLocale): SupportedLocale {
-  return UMI_TO_LOCALE[umiLocale] ?? 'en';
-}
-
-/**
- * 获取当前语言的 umi 格式（供 umi locale 运行时配置使用）
- * @returns umi 格式的语言标识符
- */
-export function getUmiLocale(): UmiLocale {
-  return toUmiLocale(getCurrentLocale());
-}

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

@@ -1,7 +1,7 @@
-import { i18n, LANG } from '<%= packageScope %>/common-intl';
+import { getIntl } from '@umijs/max';
 import { isAuthDisabled, isNoPermissionRoute } from '@/constants';
 import type { MenuItem, ParsedMenuItem, ParsedRoute } from './types';
-import { getCurrentLocale } from '@/common/locale';
+import { getCurrentLocale, LOCALE } from '@/common/locale';
 
 /**
  * 获取 window 上挂载的菜单数据
@@ -35,7 +35,7 @@ export const buildMenuPath = (parentPath: string, name: string): string => {
  */
 export const isChineseLocale = (): boolean => {
   const locale = getCurrentLocale();
-  return locale === (LANG.ZH_CN as string);
+  return locale === LOCALE.ZH_CN;
 };
 
 /**
@@ -241,7 +241,8 @@ export const extractRoutes = (
  * @returns 翻译后的菜单名称
  */
 export const getMenuLabel = (key: string, fallbackName?: string): string => {
-  return i18n({ key, defaultMessage: fallbackName ?? key });
+  const intl = getIntl();
+  return intl.formatMessage({ id: key, defaultMessage: fallbackName ?? key });
 };
 
 /**

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

@@ -37,7 +37,7 @@ const joinProxyAndPath = (proxySuffix: string, path: string): string => {
  * 4. 其他情况 → 拼接 apiBaseUrl + proxySuffix + url
  *
  * 示例（testing 环境，apiBaseUrl = https://dashboard-api-test.micoplatform.com）：
- * - 默认: /api/user/info → https://dashboard-api-test.micoplatform.com/proxy/audit_svr/api/user/info
+ * - 默认: /api/user/info → https://dashboard-api-test.micoplatform.com/proxy/<%= projectName %>_svr/api/user/info
  * - skipProxy: /api/user/info → https://dashboard-api-test.micoplatform.com/api/user/info
  */
 export const resolveRequestUrl = (

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

@@ -1,6 +1,6 @@
 import { getAuthInfo } from '@/common/auth/auth-manager';
 import { EEnv, getEnv } from '@/common/env';
-import { getUmiLocale } from '@/common/locale';
+import { getCurrentLocale } from '@/common/locale';
 import { request } from '@/common/request';
 import { isAuthDisabled, isNoPermissionRoute } from '@/constants';
 import { Spin } from '@mico-platform/ui';
@@ -80,8 +80,8 @@ const MicroAppLoader: React.FC<MicroAppLoaderProps> = ({
       routePath,
       // 传递主应用的 request 实例，子应用可直接使用
       request,
-      // 传递当前多语言类型给子应用（umi 格式：zh-CN, en-US 等）
-      locale: getUmiLocale(),
+      // 传递当前多语言类型给子应用（zh-CN, en-US）
+      locale: getCurrentLocale(),
     };
   }, [env, routePath]);
 

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

@@ -10,8 +10,8 @@ import {
 	getCurrentLocale,
 	LOCALE,
 	setLocaleToStorage,
-	type TLocale,
-} from '<%= packageScope %>/common-intl';
+	type SupportedLocale,
+} from '@/common/locale';
 import IconFont from '@/components/IconFont';
 import { useTheme } from '@/hooks/useTheme';
 import { getTimezoneList, type ITimezone } from '@/services/config';
@@ -173,12 +173,11 @@ export const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu }) => {
 
 		// 处理语言切换
 		if (key.startsWith('language-')) {
-			const newLocale = key.replace('language-', '') as TLocale;
+			const newLocale = key.replace('language-', '') as SupportedLocale;
 			const currentLocale = getCurrentLocale();
 			if (newLocale === currentLocale) {
 				return;
 			}
-			// 存储 common-intl 格式的语言标识符，刷新后 umi 会通过映射转换
 			setLocaleToStorage(newLocale);
 			window.location.reload();
 			return;
@@ -313,7 +312,7 @@ export const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu }) => {
 
 			// 语言菜单项选中状态
 			if (item.key.startsWith('language-')) {
-				const locale = item.key.replace('language-', '') as TLocale;
+				const locale = item.key.replace('language-', '') as SupportedLocale;
 				const currentLocale = getCurrentLocale();
 				if (locale === currentLocale) {
 					displayLabel = (

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

@@ -82,7 +82,7 @@ body {
 .<%= projectName %>-sider {
   box-shadow: none;
   background-color: @color-text-5;
-  z-index: 1000;
+  z-index: 999;
 
   .arco-layout-sider-trigger {
     display: flex;

package/generators/micro-react/templates/apps/layout/src/locales/en-US.ts

@@ -18,6 +18,9 @@ export default {
   'loading.text': 'Loading...',
   'loading.error': 'Failed to load',
 
+  // Page titles
+  'page.home.title': 'Home',
+
   // AvatarDropdown
   'avatar.language': 'Language',
   'avatar.language.zh_CN': 'Simplified Chinese',

package/generators/micro-react/templates/apps/layout/src/locales/zh-CN.ts

@@ -17,6 +17,9 @@ export default {
   'loading.text': '加载中...',
   'loading.error': '加载失败',
 
+  // Page titles
+  'page.home.title': '首页',
+
   // AvatarDropdown
   'avatar.language': '语言',
   'avatar.language.zh_CN': '简体中文',

package/generators/micro-react/templates/apps/layout/src/pages/Home/index.tsx

@@ -1,7 +1,13 @@
+import { useIntl } from '@umijs/max';
 import styles from './index.less';
 
 const HomePage: React.FC = () => {
-  return <div className={styles.container}>首页2</div>;
+  const intl = useIntl();
+  return (
+    <div className={styles.container}>
+      {intl.formatMessage({ id: 'page.home.title' })}
+    </div>
+  );
 };
 
 export default HomePage;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-mico-cli",
-  "version": "0.2.18",
+  "version": "0.2.19",
   "description": "Yeoman generator for Mico CLI projects",
   "keywords": ["yeoman-generator", "generator", "cli"],
   "license": "MIT",