generator-mico-cli 0.2.14 → 0.2.16

package/generators/micro-react/templates/CICD/start_dev.sh

@@ -37,7 +37,7 @@ pnpm run build:development
 
 # 只有在 CI 环境时才写入版本号文件（覆盖写入）
 if [ "${CI}" = "true" ]; then
-  echo "VERSION=$VERSION" > .env_x_portal-web
+  echo "VERSION=$VERSION" > .env_x_<%= projectName %>portal-web
 fi
 
 

package/generators/micro-react/templates/CICD/start_prod.sh

@@ -37,6 +37,6 @@ pnpm run build:production
 
 # 只有在 CI 环境时才写入版本号文件（覆盖写入）
 if [ "${CI}" = "true" ]; then
-  echo "VERSION=$VERSION" > .env_x_portal-web
+  echo "VERSION=$VERSION" > .env_x_<%= projectName %>
 fi
 

package/generators/micro-react/templates/CICD/start_test.sh

@@ -38,6 +38,6 @@ pnpm run build:testing
 
 # 只有在 CI 环境时才写入版本号文件（覆盖写入）
 if [ "${CI}" = "true" ]; then
-  echo "VERSION=$VERSION" > .env_x_portal-web
+  echo "VERSION=$VERSION" > .env_x_<%= projectName %>
 fi
 

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

@@ -27,7 +27,7 @@ const config: ReturnType<typeof defineConfig> = {
           // 不显示布局的路由（全屏页面）
           // noLayoutRouteList: ['/task-query/*'],
           // 关闭权限控制（调试用）
-          disableAuth: false,
+          disableAuth: true,
         };
       `,
     },

package/generators/micro-react/templates/apps/layout/docs/common-intl.md

@@ -65,7 +65,7 @@ import {
   initIntl,
   type ILang,
 } from "@portal-web/common-intl";
-import { Message } from "@arco-design/web-react";
+import { Message } from "@mico-platform/ui";
 import { request } from "@umijs/max";
 
 // 初始化国际化模块

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

@@ -143,6 +143,28 @@ const mockMenus: MockMenuItem[] = [
     "pageId": null,
     "page": 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,
+    "page": {
+      "id": 8,
+      "name": "permission",
+      "route": "/permission",
+      "enabled": true,
+      "htmlUrl": "//localhost:8010",
+      "jsUrls": [],
+      "cssUrls": []
+    },
+    "children": []
   }
 ]
 

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

@@ -1,4 +1,4 @@
-import { Dropdown, type DropdownProps } from '@arco-design/web-react';
+import { Dropdown, type DropdownProps } from '@mico-platform/ui';
 import React from 'react';
 
 export type HeaderDropdownProps = {

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

@@ -1,21 +1,21 @@
 import { logout, STORAGE_KEYS } from '@/common/auth';
 import {
-  getCurrentTimezone,
-  getTimezoneRegion,
-  setTimezoneRegion as setTimezoneRegionToStorage,
-  setTimezone as setTimezoneToStorage,
-  utcOffsetToTimezone,
+	getCurrentTimezone,
+	getTimezoneRegion,
+	setTimezoneRegion as setTimezoneRegionToStorage,
+	setTimezone as setTimezoneToStorage,
+	utcOffsetToTimezone,
 } from '@/common/helpers';
 import {
-  getCurrentLocale,
-  LOCALE,
-  setLocaleToStorage,
-  type TLocale,
+	getCurrentLocale,
+	LOCALE,
+	setLocaleToStorage,
+	type TLocale,
 } from '<%= packageScope %>/common-intl';
 import IconFont from '@/components/IconFont';
 import { useTheme } from '@/hooks/useTheme';
 import { getTimezoneList, type ITimezone } from '@/services/config';
-import { Avatar, Menu } from '@arco-design/web-react';
+import { Avatar, Menu } from '@mico-platform/ui';
 import { history, useIntl, useModel } from '@umijs/max';
 import React, { useEffect, useState, useTransition } from 'react';
 import { flushSync } from 'react-dom';
@@ -26,363 +26,363 @@ const MenuItem = Menu.Item;
 const SubMenu = Menu.SubMenu;
 
 export type GlobalHeaderRightProps = {
-  menu?: boolean;
-  children?: React.ReactNode;
+	menu?: boolean;
+	children?: React.ReactNode;
 };
 
 // 菜单项类型定义
 interface IMenuItem {
-  key: string;
-  label: string;
-  icon?: React.ReactNode;
-  path?: string;
-  children?: IMenuItem[];
+	key: string;
+	label: string;
+	icon?: React.ReactNode;
+	path?: string;
+	children?: IMenuItem[];
 }
 
 const DEFAULT_AVATAR =
-  'https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png';
+	'https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png';
 
 // TODO: 临时假数据，后续接入真实登录态
 const MOCK_USER = {
-  user_name: 'Test User',
-  avatar: DEFAULT_AVATAR,
+	user_name: 'Test User',
+	avatar: DEFAULT_AVATAR,
 };
 
 export const AvatarName: React.FC<{ userName?: string }> = ({ userName }) => {
-  return <span className="ml-2 mr-2">{userName}</span>;
+	return <span className="ml-2 mr-2">{userName}</span>;
 };
 
 const languageLabelMap: Record<string, string> = {
-  [LOCALE.ZH_CN]: '中文',
-  [LOCALE.EN_US]: 'English',
+	[LOCALE.ZH_CN]: '中文',
+	[LOCALE.EN_US]: 'English',
 };
 
 export const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu }) => {
-  const { setInitialState, initialState } = useModel('@@initialState');
-  const { formatMessage } = useIntl();
-  // TODO: 临时使用假数据，后续接入真实登录态
-  const currentUser = initialState?.currentUser || MOCK_USER;
-  const { theme, setTheme } = useTheme();
-  const [timezoneLoading, startTransition] = useTransition();
-
-  // 时区相关状态
-  const [timezoneList, setTimezoneList] = useState<ITimezone[]>([]);
-  const [currentTimezone, setCurrentTimezone] = useState<string>(
-    getCurrentTimezone(),
-  );
-
-  // 获取当前时区的显示名称
-  const getCurrentTimezoneLabel = (): string => {
-    const offsetNum = Number(
-      currentTimezone.replace('UTC', '').replace('+', ''),
-    );
-    const currentRegion = getTimezoneRegion();
-
-    // 从 timezoneList 中找到匹配的时区（同时匹配 region 和 utc_offset）
-    const matchedTimezone = timezoneList.find(
-      (tz) => tz.utc_offset === offsetNum && tz.region === currentRegion,
-    );
-
-    if (matchedTimezone) {
-      return `${matchedTimezone.region} (${utcOffsetToTimezone(matchedTimezone.utc_offset)})`;
-    }
-
-    // 回退：只匹配 utc_offset
-    const fallbackTimezone = timezoneList.find(
-      (tz) => tz.utc_offset === offsetNum,
-    );
-    if (fallbackTimezone) {
-      return `${fallbackTimezone.region} (${utcOffsetToTimezone(fallbackTimezone.utc_offset)})`;
-    }
-
-    return utcOffsetToTimezone(offsetNum);
-  };
-
-  // 管理头像 URL
-  const [avatarSrc, setAvatarSrc] = useState<string>(
-    currentUser?.avatar || DEFAULT_AVATAR,
-  );
-
-  useEffect(() => {
-    setAvatarSrc(currentUser?.avatar || DEFAULT_AVATAR);
-  }, [currentUser?.avatar]);
-
-  // 加载时区列表
-  useEffect(() => {
-    const loadTimezoneList = async () => {
-      try {
-        const response = await getTimezoneList();
-        if (response?.timezone_list) {
-          setTimezoneList(response.timezone_list);
-        }
-      } catch (error) {
-        console.error('加载时区列表失败:', error);
-      }
-    };
-
-    startTransition(loadTimezoneList as any);
-  }, []);
-
-  // 监听 localStorage 中时区的变化
-  useEffect(() => {
-    const handleStorageChange = (e: StorageEvent) => {
-      if (e.key === STORAGE_KEYS.TIMEZONE && e.newValue) {
-        const offsetNum = Number(e.newValue);
-        if (!Number.isNaN(offsetNum) && e.newValue.trim() !== '') {
-          setCurrentTimezone(utcOffsetToTimezone(offsetNum));
-        } else {
-          setCurrentTimezone(e.newValue);
-        }
-      }
-    };
-
-    window.addEventListener('storage', handleStorageChange);
-    return () => {
-      window.removeEventListener('storage', handleStorageChange);
-    };
-  }, []);
-
-  const handleAvatarError = () => {
-    setAvatarSrc(DEFAULT_AVATAR);
-  };
-
-  const loginOut = async () => {
-    logout();
-    const { search, pathname } = window.location;
-    const urlParams = new URL(window.location.href).searchParams;
-    const searchParams = new URLSearchParams({
-      redirect: pathname + search,
-    });
-    const redirect = urlParams.get('redirect');
-    if (window.location.pathname !== '/user/login' && !redirect) {
-      history.replace({
-        pathname: '/user/login',
-        search: searchParams.toString(),
-      });
-    }
-  };
-
-  const onMenuClick = (key: string, path?: string) => {
-    if (key === 'logout') {
-      flushSync(() => {
-        setInitialState((s) => ({ ...s, currentUser: undefined }));
-      });
-      loginOut();
-      return;
-    }
-
-    // 处理语言切换
-    if (key.startsWith('language-')) {
-      const newLocale = key.replace('language-', '') as TLocale;
-      const currentLocale = getCurrentLocale();
-      if (newLocale === currentLocale) {
-        return;
-      }
-      // 存储 common-intl 格式的语言标识符，刷新后 umi 会通过映射转换
-      setLocaleToStorage(newLocale);
-      window.location.reload();
-      return;
-    }
-
-    // 处理时区切换
-    if (key.includes('/')) {
-      const lastSlashIndex = key.lastIndexOf('/');
-      const region = key.substring(0, lastSlashIndex);
-      const utcOffsetStr = key.substring(lastSlashIndex + 1);
-      const utcOffsetNum = Number(utcOffsetStr);
-      const timezoneStr = utcOffsetToTimezone(utcOffsetNum);
-      const currentRegion = getTimezoneRegion();
-
-      if (timezoneStr === currentTimezone && region === currentRegion) {
-        return;
-      }
-
-      setTimezoneToStorage(utcOffsetStr);
-      setTimezoneRegionToStorage(region);
-      setCurrentTimezone(timezoneStr);
-      window.location.reload();
-      return;
-    }
-
-    // 处理主题切换
-    if (key.startsWith('theme-')) {
-      const themeMode = key.replace('theme-', '') as 'light' | 'dark';
-      // 如果切换的主题和当前主题一致，则无需切换
-      if (themeMode === theme) {
-        return;
-      }
-      // 切换主题
-      setTheme(themeMode);
-      return;
-    }
-
-    if (path) {
-      history.push(path);
-    } else {
-      history.push(`/account/${key}`);
-    }
-  };
-
-  // TODO: 临时关闭加载逻辑，使用假数据
-  // const loading = <Spin size={16} className="ml-2 mr-2" />;
-  // if (!initialState) {
-  //   return loading;
-  // }
-  // if (!currentUser || !currentUser.user_name) {
-  //   return loading;
-  // }
-
-  // 菜单配置
-  const menuItems: IMenuItem[] = [
-    ...(menu
-      ? [
-          {
-            key: 'language',
-            label: formatMessage({ id: 'avatar.language' }),
-            children: [
-              {
-                key: `language-${LOCALE.ZH_CN}`,
-                label: formatMessage({ id: 'avatar.language.zh_CN' }),
-              },
-              {
-                key: `language-${LOCALE.EN_US}`,
-                label: formatMessage({ id: 'avatar.language.en' }),
-              },
-            ],
-          },
-          {
-            key: 'timezone',
-            label: getCurrentTimezoneLabel(),
-            children:
-              timezoneLoading || timezoneList.length === 0
-                ? []
-                : timezoneList.map((tz) => ({
-                    key: `${tz.region}/${tz.utc_offset}`,
-                    label: `${tz.region} (${utcOffsetToTimezone(tz.utc_offset)})`,
-                  })),
-          },
-          {
-            key: 'theme',
-            label: formatMessage({ id: 'avatar.theme' }),
-            children: [
-              {
-                key: 'theme-light',
-                label: formatMessage({ id: 'avatar.theme.light' }),
-              },
-              {
-                key: 'theme-dark',
-                label: formatMessage({ id: 'avatar.theme.dark' }),
-              },
-            ],
-          },
-        ]
-      : []),
-    {
-      key: 'logout',
-      label: formatMessage({ id: 'avatar.logout' }),
-    },
-  ];
-
-  // 递归渲染菜单项
-  const renderMenuItems = (items: IMenuItem[]): React.ReactNode[] => {
-    return items.map((item) => {
-      if (item.children && item.children.length > 0) {
-        const subMenuTitle = (
-          <>
-            {item.icon && <span className="mr-2">{item.icon}</span>}
-            <span>{item.label}</span>
-          </>
-        );
-        return (
-          <SubMenu key={item.key} title={subMenuTitle}>
-            {renderMenuItems(item.children)}
-          </SubMenu>
-        );
-      }
-
-      let displayLabel: string | React.ReactNode = item.label;
-
-      // 否则渲染为普通菜单项
-      // 检查是否是主题菜单项，如果是则显示当前使用状态
-      if (item.key.startsWith('theme-')) {
-        const themeMode = item.key.replace('theme-', '') as 'light' | 'dark';
-        if (themeMode === theme) {
-          displayLabel = <span className="selected-label">{item.label}</span>;
-        }
-      }
-
-      // 语言菜单项选中状态
-      if (item.key.startsWith('language-')) {
-        const locale = item.key.replace('language-', '') as TLocale;
-        const currentLocale = getCurrentLocale();
-        if (locale === currentLocale) {
-          displayLabel = (
-            <>
-              <span className="selected-label">
-                {languageLabelMap[locale] || ''}
-              </span>{' '}
-              - <span className="label-name">{item.label}</span>
-            </>
-          );
-        } else {
-          displayLabel = (
-            <>
-              <span>{languageLabelMap[locale] || ''}</span> -{' '}
-              <span className="label-name">{item.label}</span>
-            </>
-          );
-        }
-      }
-
-      // 时区菜单项选中状态
-      if (item.key.includes('/')) {
-        const lastSlashIndex = item.key.lastIndexOf('/');
-        const region = item.key.substring(0, lastSlashIndex);
-        const utcOffsetStr = item.key.substring(lastSlashIndex + 1);
-        const utcOffsetNum = Number(utcOffsetStr);
-        const timezoneStr = utcOffsetToTimezone(utcOffsetNum);
-        const currentRegion = getTimezoneRegion();
-
-        if (timezoneStr === currentTimezone && region === currentRegion) {
-          displayLabel = <span className="selected-label">{item.label}</span>;
-        }
-      }
-
-      return (
-        <MenuItem
-          key={item.key}
-          onClick={() => onMenuClick(item.key, item.path)}
-        >
-          {item.icon && <span className="mr-2">{item.icon}</span>}
-          <span>{displayLabel}</span>
-        </MenuItem>
-      );
-    });
-  };
-
-  return (
-    <HeaderDropdown
-      position="br"
-      triggerProps={{ popupAlign: { bottom: [0, 20] } }}
-      droplist={
-        <Menu className="avatar-dropdown-menu">
-          {renderMenuItems(menuItems)}
-        </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>
-        <AvatarName userName={currentUser?.user_name} />
-        <IconFont
-          type="webcs-outline_down1"
-          className="avatar-dropdown-icon"
-          fontSize={12}
-        />
-      </div>
-    </HeaderDropdown>
-  );
+	const { setInitialState, initialState } = useModel('@@initialState');
+	const { formatMessage } = useIntl();
+	// TODO: 临时使用假数据，后续接入真实登录态
+	const currentUser = initialState?.currentUser || MOCK_USER;
+	const { theme, setTheme } = useTheme();
+	const [timezoneLoading, startTransition] = useTransition();
+
+	// 时区相关状态
+	const [timezoneList, setTimezoneList] = useState<ITimezone[]>([]);
+	const [currentTimezone, setCurrentTimezone] = useState<string>(
+		getCurrentTimezone(),
+	);
+
+	// 获取当前时区的显示名称
+	const getCurrentTimezoneLabel = (): string => {
+		const offsetNum = Number(
+			currentTimezone.replace('UTC', '').replace('+', ''),
+		);
+		const currentRegion = getTimezoneRegion();
+
+		// 从 timezoneList 中找到匹配的时区（同时匹配 region 和 utc_offset）
+		const matchedTimezone = timezoneList.find(
+			(tz) => tz.utc_offset === offsetNum && tz.region === currentRegion,
+		);
+
+		if (matchedTimezone) {
+			return `${matchedTimezone.region} (${utcOffsetToTimezone(matchedTimezone.utc_offset)})`;
+		}
+
+		// 回退：只匹配 utc_offset
+		const fallbackTimezone = timezoneList.find(
+			(tz) => tz.utc_offset === offsetNum,
+		);
+		if (fallbackTimezone) {
+			return `${fallbackTimezone.region} (${utcOffsetToTimezone(fallbackTimezone.utc_offset)})`;
+		}
+
+		return utcOffsetToTimezone(offsetNum);
+	};
+
+	// 管理头像 URL
+	const [avatarSrc, setAvatarSrc] = useState<string>(
+		currentUser?.avatar || DEFAULT_AVATAR,
+	);
+
+	useEffect(() => {
+		setAvatarSrc(currentUser?.avatar || DEFAULT_AVATAR);
+	}, [currentUser?.avatar]);
+
+	// 加载时区列表
+	useEffect(() => {
+		const loadTimezoneList = async () => {
+			try {
+				const response = await getTimezoneList();
+				if (response?.timezone_list) {
+					setTimezoneList(response.timezone_list);
+				}
+			} catch (error) {
+				console.error('加载时区列表失败:', error);
+			}
+		};
+
+		startTransition(loadTimezoneList as any);
+	}, []);
+
+	// 监听 localStorage 中时区的变化
+	useEffect(() => {
+		const handleStorageChange = (e: StorageEvent) => {
+			if (e.key === STORAGE_KEYS.TIMEZONE && e.newValue) {
+				const offsetNum = Number(e.newValue);
+				if (!Number.isNaN(offsetNum) && e.newValue.trim() !== '') {
+					setCurrentTimezone(utcOffsetToTimezone(offsetNum));
+				} else {
+					setCurrentTimezone(e.newValue);
+				}
+			}
+		};
+
+		window.addEventListener('storage', handleStorageChange);
+		return () => {
+			window.removeEventListener('storage', handleStorageChange);
+		};
+	}, []);
+
+	const handleAvatarError = () => {
+		setAvatarSrc(DEFAULT_AVATAR);
+	};
+
+	const loginOut = async () => {
+		logout();
+		const { search, pathname } = window.location;
+		const urlParams = new URL(window.location.href).searchParams;
+		const searchParams = new URLSearchParams({
+			redirect: pathname + search,
+		});
+		const redirect = urlParams.get('redirect');
+		if (window.location.pathname !== '/user/login' && !redirect) {
+			history.replace({
+				pathname: '/user/login',
+				search: searchParams.toString(),
+			});
+		}
+	};
+
+	const onMenuClick = (key: string, path?: string) => {
+		if (key === 'logout') {
+			flushSync(() => {
+				setInitialState((s) => ({ ...s, currentUser: undefined }));
+			});
+			loginOut();
+			return;
+		}
+
+		// 处理语言切换
+		if (key.startsWith('language-')) {
+			const newLocale = key.replace('language-', '') as TLocale;
+			const currentLocale = getCurrentLocale();
+			if (newLocale === currentLocale) {
+				return;
+			}
+			// 存储 common-intl 格式的语言标识符，刷新后 umi 会通过映射转换
+			setLocaleToStorage(newLocale);
+			window.location.reload();
+			return;
+		}
+
+		// 处理时区切换
+		if (key.includes('/')) {
+			const lastSlashIndex = key.lastIndexOf('/');
+			const region = key.substring(0, lastSlashIndex);
+			const utcOffsetStr = key.substring(lastSlashIndex + 1);
+			const utcOffsetNum = Number(utcOffsetStr);
+			const timezoneStr = utcOffsetToTimezone(utcOffsetNum);
+			const currentRegion = getTimezoneRegion();
+
+			if (timezoneStr === currentTimezone && region === currentRegion) {
+				return;
+			}
+
+			setTimezoneToStorage(utcOffsetStr);
+			setTimezoneRegionToStorage(region);
+			setCurrentTimezone(timezoneStr);
+			window.location.reload();
+			return;
+		}
+
+		// 处理主题切换
+		if (key.startsWith('theme-')) {
+			const themeMode = key.replace('theme-', '') as 'light' | 'dark';
+			// 如果切换的主题和当前主题一致，则无需切换
+			if (themeMode === theme) {
+				return;
+			}
+			// 切换主题
+			setTheme(themeMode);
+			return;
+		}
+
+		if (path) {
+			history.push(path);
+		} else {
+			history.push(`/account/${key}`);
+		}
+	};
+
+	// TODO: 临时关闭加载逻辑，使用假数据
+	// const loading = <Spin size={16} className="ml-2 mr-2" />;
+	// if (!initialState) {
+	//   return loading;
+	// }
+	// if (!currentUser || !currentUser.user_name) {
+	//   return loading;
+	// }
+
+	// 菜单配置
+	const menuItems: IMenuItem[] = [
+		...(menu
+			? [
+					{
+						key: 'language',
+						label: formatMessage({ id: 'avatar.language' }),
+						children: [
+							{
+								key: `language-${LOCALE.ZH_CN}`,
+								label: formatMessage({ id: 'avatar.language.zh_CN' }),
+							},
+							{
+								key: `language-${LOCALE.EN_US}`,
+								label: formatMessage({ id: 'avatar.language.en' }),
+							},
+						],
+					},
+					{
+						key: 'timezone',
+						label: getCurrentTimezoneLabel(),
+						children:
+							timezoneLoading || timezoneList.length === 0
+								? []
+								: timezoneList.map((tz) => ({
+										key: `${tz.region}/${tz.utc_offset}`,
+										label: `${tz.region} (${utcOffsetToTimezone(tz.utc_offset)})`,
+									})),
+					},
+					{
+						key: 'theme',
+						label: formatMessage({ id: 'avatar.theme' }),
+						children: [
+							{
+								key: 'theme-light',
+								label: formatMessage({ id: 'avatar.theme.light' }),
+							},
+							{
+								key: 'theme-dark',
+								label: formatMessage({ id: 'avatar.theme.dark' }),
+							},
+						],
+					},
+				]
+			: []),
+		{
+			key: 'logout',
+			label: formatMessage({ id: 'avatar.logout' }),
+		},
+	];
+
+	// 递归渲染菜单项
+	const renderMenuItems = (items: IMenuItem[]): React.ReactNode[] => {
+		return items.map((item) => {
+			if (item.children && item.children.length > 0) {
+				const subMenuTitle = (
+					<>
+						{item.icon && <span className="mr-2">{item.icon}</span>}
+						<span>{item.label}</span>
+					</>
+				);
+				return (
+					<SubMenu key={item.key} title={subMenuTitle}>
+						{renderMenuItems(item.children)}
+					</SubMenu>
+				);
+			}
+
+			let displayLabel: string | React.ReactNode = item.label;
+
+			// 否则渲染为普通菜单项
+			// 检查是否是主题菜单项，如果是则显示当前使用状态
+			if (item.key.startsWith('theme-')) {
+				const themeMode = item.key.replace('theme-', '') as 'light' | 'dark';
+				if (themeMode === theme) {
+					displayLabel = <span className="selected-label">{item.label}</span>;
+				}
+			}
+
+			// 语言菜单项选中状态
+			if (item.key.startsWith('language-')) {
+				const locale = item.key.replace('language-', '') as TLocale;
+				const currentLocale = getCurrentLocale();
+				if (locale === currentLocale) {
+					displayLabel = (
+						<>
+							<span className="selected-label">
+								{languageLabelMap[locale] || ''}
+							</span>{' '}
+							- <span className="label-name">{item.label}</span>
+						</>
+					);
+				} else {
+					displayLabel = (
+						<>
+							<span>{languageLabelMap[locale] || ''}</span> -{' '}
+							<span className="label-name">{item.label}</span>
+						</>
+					);
+				}
+			}
+
+			// 时区菜单项选中状态
+			if (item.key.includes('/')) {
+				const lastSlashIndex = item.key.lastIndexOf('/');
+				const region = item.key.substring(0, lastSlashIndex);
+				const utcOffsetStr = item.key.substring(lastSlashIndex + 1);
+				const utcOffsetNum = Number(utcOffsetStr);
+				const timezoneStr = utcOffsetToTimezone(utcOffsetNum);
+				const currentRegion = getTimezoneRegion();
+
+				if (timezoneStr === currentTimezone && region === currentRegion) {
+					displayLabel = <span className="selected-label">{item.label}</span>;
+				}
+			}
+
+			return (
+				<MenuItem
+					key={item.key}
+					onClick={() => onMenuClick(item.key, item.path)}
+				>
+					{item.icon && <span className="mr-2">{item.icon}</span>}
+					<span>{displayLabel}</span>
+				</MenuItem>
+			);
+		});
+	};
+
+	return (
+		<HeaderDropdown
+			position="br"
+			triggerProps={{ popupAlign: { bottom: [0, 20] } }}
+			droplist={
+				<Menu className="avatar-dropdown-menu">
+					{renderMenuItems(menuItems)}
+				</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>
+				<AvatarName userName={currentUser?.user_name} />
+				<IconFont
+					type="webcs-outline_down1"
+					className="avatar-dropdown-icon"
+					fontSize={12}
+				/>
+			</div>
+		</HeaderDropdown>
+	);
 };

package/generators/micro-react/templates/apps/layout/src/components/RightContent/avatar-dropdown.less

@@ -1,4 +1,4 @@
-@import '<%= packageScope %>/shared-styles/variables-only';
+@import '@mico-platform/theme/variables';
 
 .avatar-dropdown-trigger {
   background-color: @color-fill-2;

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

@@ -1,60 +1,12 @@
-import { useTheme } from '@/hooks/useTheme';
-import { logout } from '@/common/auth';
-import { DEFAULT_NAME } from '@/constants';
-import { ROUTES } from '@/constants';
-import {
-  Avatar,
-  Divider,
-  Dropdown,
-  Layout,
-  Menu,
-  Space,
-} from '@mico-platform/ui';
-
-import {
-  IconMoonFill,
-  IconPoweroff,
-  IconSettings,
-  IconSunFill,
-} from '@mico-platform/ui/icon';
-import { useModel } from '@umijs/max';
-import React, { useCallback } from 'react';
 import { AvatarDropdown } from '@/components/RightContent';
+import { DEFAULT_NAME } from '@/constants';
+import { Layout, Space } from '@mico-platform/ui';
+import React from 'react';
 import './index.less';
 
 const Header = Layout.Header;
 
 const LayoutHeader: React.FC = () => {
-  const { initialState } = useModel('@@initialState');
-  const { theme, toggleTheme } = useTheme();
-
-  const handleMenuClick = useCallback((key: string) => {
-    if (key === 'logout') {
-      // 清除本地存储的认证信息
-      logout();
-      // 跳转到登录页
-      window.location.href = ROUTES.LOGIN;
-      return;
-    } else if (key === 'settings') {
-      // TODO: Navigate to settings page
-      console.log('settings');
-    }
-  }, []);
-
-  const droplist = (
-    <Menu onClickMenuItem={handleMenuClick}>
-      <Menu.Item key="settings">
-        <IconSettings style={{ marginRight: 8 }} />
-        设置
-      </Menu.Item>
-      <Divider style={{ margin: '4px 0' }} />
-      <Menu.Item key="logout">
-        <IconPoweroff style={{ marginRight: 8 }} />
-        退出登录
-      </Menu.Item>
-    </Menu>
-  );
-
   return (
     <Header className="layout-header">
       {/* Logo */}

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

@@ -1,4 +1,4 @@
-@import '<%= packageScope %>/shared-styles/variables-only';
+@import '@mico-platform/theme/variables';
 
 .container {
   padding-top: 30px;

package/generators/micro-react/templates/packages/common-intl/README.md

@@ -50,7 +50,7 @@ import {
   initIntl,
   type ILang,
 } from "@portal-web/common-intl";
-import { Message } from "@arco-design/web-react";
+import { Message } from "@mico-platform/ui";
 import { request } from "@umijs/max";
 
 // 初始化国际化模块
@@ -99,7 +99,6 @@ import { intl } from "@portal-web/common-intl";
 
 ```typescript
 import { initIntl } from "@portal-web/common-intl";
-import { Toast } from "@arco-design/mobile-react";
 import { request } from "@umijs/max";
 import { convertLocaleToLangParam } from "./locales/utils";
 import { getSearchParams } from "@/common/jsbridge/jsbridge";
@@ -110,8 +109,8 @@ const fetchMultilingualData = initIntl({
   requestInstance: request,
   // 消息提示实例（必填）
   messageInstance: {
-    error: (msg: string) => Toast.error(msg),
-    warning: (msg: string) => Toast.warn(msg),
+    error: (msg: string) => console.error(msg),
+    warning: (msg: string) => console.warn(msg),
   },
   // 多语言中台接口参数（必填）
   fetchMultilingualDataParams: {

package/package.json

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