generator-mico-cli 0.2.13 → 0.2.15

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

@@ -1,32 +1,60 @@
-@import '<%= packageScope %>/shared-styles/variables-only';
+@import '@mico-platform/theme/variables';
+
+.arco-tree-node:hover {
+  background-color: @color-fill-2;
+}
+
+body {
+  // 防止触发mac浏览器的双指水平滑动触发后退前进
+  overscroll-behavior-x: none;
+}
 
 .layout-container {
-  min-width: 100vw;
+  min-width: @size-base * 128;
   background: @color-fill-1;
-  overflow-x: auto;
-  overflow-y: hidden;
+  // overflow-x: auto;s
+  // overflow-y: hidden;
   display: flex;
   flex-direction: column;
+  // 适配子元素高度，覆盖 arco-layout 默认的 flex: 1
+  flex: none;
+  width: 100%;
 
   .layout-content {
-    overflow: hidden;
+    // overflow: hidden;
     flex: 1;
-    display: flex;
-    flex-direction: row;
+    margin-top: @header-height;
 
     .layout-content-right {
-      padding: @spacing-md @spacing-lg;
-      flex: 1;
-      display: flex;
-      flex-direction: column;
-      overflow: hidden;
+      padding: @spacing-md @spacing-md;
+      margin-left: var(--sider-width, @sidebar-width);
+      // flex: 1;
+      // display: flex;
+      // flex-direction: column;
+      // min-height: calc(100vh - @header-height);
+      // 当菜单折叠时，自适应调整 marginLeft
+      transition: margin-left 0.2s ease;
+      // overflow-y: auto;
+      // overflow: hidden auto;
+
+      .layout-content-scroll-container {
+        display: flex;
+        flex-direction: column;
+        min-height: 100%;
+      }
 
       .layout-content-outlet {
         flex: 1;
+        // overflow-y: scroll;
         overflow: hidden;
         background: none;
         border-radius: @border-radius-lg;
         position: relative;
+
+        --layout-content-outlet-margin-top: 32px;
+
+        margin-top: var(--layout-content-outlet-margin-top);
+        height: calc(100% - var(--layout-content-outlet-margin-top));
       }
     }
   }
@@ -34,6 +62,10 @@
   .arco-spin-children::after {
     background-color: color-mix(in srgb, var(--color-text-5) 60%, transparent);
   }
+
+  .arco-layout-sider-trigger {
+    background-color: @color-text-5;
+  }
 }
 
 .arco-form {
@@ -47,8 +79,9 @@
   }
 }
 
-.<%= projectName %>-sider {
+.mico-cs-sider {
   box-shadow: none;
+  background-color: @color-text-5;
 
   .arco-layout-sider-trigger {
     display: flex;
@@ -57,6 +90,7 @@
 
   .click-trigger-btn {
     cursor: pointer;
+    // width: 100%;
     display: flex;
   }
 
@@ -69,3 +103,39 @@
     justify-content: center;
   }
 }
+
+.arco-drawer-header {
+  border-bottom: 1px solid @color-line-2;
+}
+
+.arco-drawer-footer {
+  border-top: 1px solid @color-line-2;
+}
+
+.arco-dropdown-menu {
+  border-color: @color-line-2;
+}
+
+.arco-message-success,
+.arco-message-error,
+.arco-message-warning,
+.arco-message-loading {
+  border-color: @color-line-2;
+}
+
+// 按钮样式覆盖
+.arco-btn-secondary:not(.arco-btn-disabled) {
+  background-color: @color-fill-2;
+}
+
+.arco-btn-secondary:not(.arco-btn-disabled):not(.arco-btn-loading):hover {
+  background-color: @color-fill-3;
+}
+
+.arco-btn-secondary:not(.arco-btn-disabled):not(.arco-btn-loading):active {
+  background-color: @color-fill-4;
+}
+
+.arco-btn-secondary.arco-btn-disabled {
+  background-color: @color-fill-1;
+}

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

@@ -15,7 +15,7 @@ import {
 } from '@/constants';
 import { useRoutePermissionRefresh } from '@/hooks/useRoutePermissionRefresh';
 import ForbiddenPage from '@/pages/403';
-import { Layout, Spin } from '@arco-design/web-react';
+import { Layout, Spin } from '@mico-platform/ui';
 import { Outlet, useLocation, useModel } from '@umijs/max';
 import React, { Suspense, useMemo } from 'react';
 import LayoutHeader from './components/header';
@@ -91,7 +91,13 @@ const BasicLayout: React.FC = () => {
     });
 
     return forbidden;
-  }, [currentRoute, allRoutes, allowedRoutes, location.pathname, filterOptions]);
+  }, [
+    currentRoute,
+    allRoutes,
+    allowedRoutes,
+    location.pathname,
+    filterOptions,
+  ]);
 
   // 判断是否需要显示布局
   const showLayout = !isNoLayoutRoute(location.pathname);
@@ -121,18 +127,20 @@ const BasicLayout: React.FC = () => {
         <>
           {/* 权限刷新中显示覆盖层，但不卸载 MicroAppLoader，避免子应用被中断 */}
           {isRefreshing && (
-            <div style={{
-              position: 'absolute',
-              top: 0,
-              left: 0,
-              right: 0,
-              bottom: 0,
-              display: 'flex',
-              alignItems: 'center',
-              justifyContent: 'center',
-              background: 'var(--color-bg-1)',
-              zIndex: 100,
-            }}>
+            <div
+              style={{
+                position: 'absolute',
+                top: 0,
+                left: 0,
+                right: 0,
+                bottom: 0,
+                display: 'flex',
+                alignItems: 'center',
+                justifyContent: 'center',
+                background: 'var(--color-bg-1)',
+                zIndex: 100,
+              }}
+            >
               <Spin dot />
             </div>
           )}
@@ -154,20 +162,25 @@ const BasicLayout: React.FC = () => {
 
     // 权限刷新中，显示 loading（仅对非微应用路由）
     if (isRefreshing) {
-      return <Spin dot style={{ width: '100%', marginTop: 100, textAlign: 'center' }} />;
+      return (
+        <Spin
+          dot
+          style={{ width: '100%', marginTop: 100, textAlign: 'center' }}
+        />
+      );
     }
 
     // 默认：使用 Outlet 渲染内部路由
     return <Outlet />;
   };
 
-  // 不需要布局的页面
+  // 不需要布局的页面（仍需检查权限）
   if (!showLayout) {
     return (
       <Suspense
         fallback={<Spin dot style={{ width: '100%', marginTop: 100 }} />}
       >
-        <Outlet />
+        {isForbidden ? <ForbiddenPage /> : renderContent()}
       </Suspense>
     );
   }
@@ -178,14 +191,16 @@ const BasicLayout: React.FC = () => {
       <Layout className="layout-content">
         <LayoutMenu />
         <Layout className="layout-content-right">
-          <AppTabs />
-          <Content className="layout-content-outlet">
-            <Suspense
-              fallback={<Spin dot style={{ width: '100%', marginTop: 100 }} />}
-            >
-              {renderContent()}
-            </Suspense>
-          </Content>
+          <div className="layout-content-scroll-container">
+            <AppTabs />
+            <Content className="layout-content-outlet">
+              <Suspense
+                fallback={<Spin dot style={{ width: '100%', marginTop: 100 }} />}
+              >
+                {renderContent()}
+              </Suspense>
+            </Content>
+          </div>
         </Layout>
       </Layout>
     </Layout>

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

@@ -17,4 +17,13 @@ export default {
 
   'loading.text': 'Loading...',
   'loading.error': 'Failed to load',
+
+  // AvatarDropdown
+  'avatar.language': 'Language',
+  'avatar.language.zh_CN': 'Simplified Chinese',
+  'avatar.language.en': 'English',
+  'avatar.theme': 'Theme',
+  'avatar.theme.light': 'Light Mode',
+  'avatar.theme.dark': 'Dark Mode',
+  'avatar.logout': 'Logout',
 };

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

@@ -16,4 +16,13 @@ export default {
 
   'loading.text': '加载中...',
   'loading.error': '加载失败',
+
+  // AvatarDropdown
+  'avatar.language': '语言',
+  'avatar.language.zh_CN': '简体中文',
+  'avatar.language.en': 'English',
+  'avatar.theme': '主题',
+  'avatar.theme.light': '浅色模式',
+  'avatar.theme.dark': '深色模式',
+  'avatar.logout': '退出登录',
 };

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

@@ -1,4 +1,4 @@
-import { Button, Result } from '@arco-design/web-react';
+import { Button, Result } from '@mico-platform/ui';
 import { history } from '@umijs/max';
 import React from 'react';
 
@@ -10,6 +10,7 @@ const ForbiddenPage: React.FC = () => {
       alignItems: 'center',
       height: '100%',
       minHeight: 400,
+      margin: '0 auto',
     }}>
       <Result
         status="403"

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

@@ -5,7 +5,7 @@ import {
   type MenuFilterOptions,
 } from '@/common/menu';
 import { isAuthDisabled } from '@/constants';
-import { Button, Result, Space } from '@arco-design/web-react';
+import { Button, Result, Space } from '@mico-platform/ui';
 import { history, useModel } from '@umijs/max';
 import React, { useMemo } from 'react';
 

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

@@ -1,3 +1,6 @@
+@import '@mico-platform/theme/variables';
+
 .container {
   padding-top: 30px;
+  color: @color-text-1;
 }

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

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

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

@@ -1,5 +1,5 @@
-import { Button, Form, Input, Message, Space, Typography } from '@arco-design/web-react';
-import { IconLock, IconUser } from '@arco-design/web-react/icon';
+import { Button, Form, Input, Message, Space, Typography } from '@mico-platform/ui';
+import { IconLock, IconUser } from '@mico-platform/ui/icon';
 import { useLocation, useModel,useNavigate } from '@umijs/max';
 import React, { useCallback, useMemo, useState } from 'react';
 import { loginStaff } from '@/services/auth';
@@ -92,7 +92,7 @@ const LoginPage: React.FC = () => {
             </svg>
           </div>
           <div className={styles.titleBlock}>
-            <Title level={3} className={styles.title}>
+            <Title className={styles.title}>
               {window.__MICO_WORKSPACE__?.name}
             </Title>
             <Text className={styles.subTitle}><%= ProjectName %> Management Center</Text>

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

@@ -3,7 +3,7 @@ import {
   createBusinessError,
   notifyHostError,
 } from '@/common/micro';
-import { Message, Notification } from '@arco-design/web-react';
+import { Message, Notification } from '@mico-platform/ui';
 import type { RequestConfig } from '@umijs/max';
 
 // 错误处理方案： 错误类型

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

@@ -0,0 +1,63 @@
+import { request } from '@/common/request';
+import type {
+  IGetTimezoneListRequest,
+  IGetTimezoneListResponse,
+  ITimezone,
+} from './type';
+
+/**
+ * 静态时区列表（兜底配置）
+ * 当未配置 timezoneListUrl 时使用此静态列表
+ * 覆盖 UTC-12 到 UTC+14 共 27 个时区
+ */
+const STATIC_TIMEZONE_LIST: ITimezone[] = [
+  { region: 'AZ', utc_offset: 3 },
+  { region: 'BR', utc_offset: -3 },
+  { region: 'DE', utc_offset: 1 },
+  { region: 'FJ', utc_offset: 15 },
+  { region: 'FR', utc_offset: 1 },
+  { region: 'Global', utc_offset: 8 },
+  { region: 'ID', utc_offset: 7 },
+  { region: 'IN', utc_offset: 5 },
+  { region: 'JP', utc_offset: 9 },
+  { region: 'MECA', utc_offset: 3 },
+  { region: 'MY', utc_offset: 8 },
+  { region: 'PH', utc_offset: 8 },
+  { region: 'PK', utc_offset: 5 },
+  { region: 'TH', utc_offset: 7 },
+  { region: 'TR', utc_offset: 3 },
+  { region: 'TW', utc_offset: 8 },
+  { region: 'US', utc_offset: -5 },
+  { region: 'UU', utc_offset: -8 },
+  { region: 'VN', utc_offset: 7 },
+];
+
+/**
+ * 获取时区配置
+ * 获取系统支持的时区配置列表
+ *
+ * - 如果配置了 window.__MICO_CONFIG__.timezoneListUrl，则请求该 API
+ * - 如果未配置，则返回静态时区列表
+ */
+export async function getTimezoneList(
+  payload: IGetTimezoneListRequest = {},
+): Promise<IGetTimezoneListResponse> {
+  const timezoneListUrl = window.__MICO_CONFIG__?.timezoneListUrl;
+
+  // 未配置 API 地址时，返回静态时区列表
+  if (!timezoneListUrl) {
+    return {
+      result: { code: 0 },
+      timezone_list: STATIC_TIMEZONE_LIST,
+    };
+  }
+
+  // 配置了 API 地址时，请求接口
+  return await request<IGetTimezoneListResponse>(timezoneListUrl, {
+    method: 'POST',
+    data: payload,
+  });
+}
+
+// 导出类型
+export type { ITimezone, IGetTimezoneListResponse } from './type';

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

@@ -0,0 +1,32 @@
+/**
+ * 配置管理相关类型定义
+ */
+
+/**
+ * 时区信息
+ */
+export interface ITimezone {
+  /** UTC偏移量 */
+  utc_offset: number;
+  /** 时区地区 */
+  region: string;
+}
+
+/**
+ * 获取时区配置请求
+ */
+export interface IGetTimezoneListRequest {
+  // 空请求体
+}
+
+/**
+ * 获取时区配置响应
+ */
+export interface IGetTimezoneListResponse {
+  result: {
+    code: number;
+    message?: string;
+  };
+  /** 时区列表 */
+  timezone_list?: ITimezone[];
+}

package/generators/micro-react/templates/apps/layout/src/services/user.ts

@@ -1,8 +1,27 @@
 import { request } from '@/common/request';
 import type { IUserInfo } from '@/common/auth/type';
+import { getCurrentLocale, type SupportedLocale } from '@/common/locale';
 
 const USER_INFO_API = '/api/user/info';
 
+/**
+ * 语言代码到接口 lang 参数的映射
+ * - zh_CN: 1 (中文)
+ * - en: 2 (英文)
+ */
+const LOCALE_TO_LANG: Partial<Record<SupportedLocale, number>> = {
+  zh_CN: 1,
+  en: 2,
+};
+
+/**
+ * 获取当前语言对应的 API lang 参数
+ */
+function getApiLangParam(): number {
+  const locale = getCurrentLocale();
+  return LOCALE_TO_LANG[locale] ?? 1;
+}
+
 export interface IUserInfoResponse {
   code: number;
   data: IUserInfo;
@@ -15,7 +34,10 @@ export interface IUserInfoResponse {
  * @throws 当接口返回非 200 code 时抛出错误
  */
 export async function fetchUserInfo(): Promise<IUserInfo> {
-  const response = await request<IUserInfoResponse>(USER_INFO_API, {
+  const lang = getApiLangParam();
+  const url = `${USER_INFO_API}?lang=${lang}`;
+
+  const response = await request<IUserInfoResponse>(url, {
     method: 'GET',
     skipProxy: true,
   });

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

@@ -6,7 +6,9 @@
   "pnpm": {
     "overrides": {
       "@types/react": "^18.3.26",
-      "@types/react-dom": "^18.3.7"
+      "@types/react-dom": "^18.3.7",
+      "@mico-platform/hooks": "^0.0.1",
+      "@mico-platform/utils": "^0.0.1"
     }
   },
   "scripts": {
@@ -18,6 +20,7 @@
     "build:local": "dotenv -e .env -e .env.local -- turbo run build:local && node scripts/collect-dist.js",
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx && turbo run lint",
     "lint:fix": "eslint . --ext .js,.jsx,.ts,.tsx --fix && turbo run lint:fix",
+    "check-types": "turbo run check-types",
     "lint-staged": "pnpm exec lint-staged --quiet",
     "prepare": "husky install",
     "test": "dotenv -e .env -e .env.local -- turbo run test",

package/generators/micro-react/templates/packages/common-intl/.turbo/turbo-build.log

@@ -0,0 +1,13 @@
+
+
+> @portal-web/common-intl@0.0.1 build /Users/mico/projects/portal-web/packages/common-intl
+> vite build && tsc --emitDeclarationOnly
+
+vite v7.3.1 building client environment for production...
+transforming (1) src/index.ts✓ 4 modules transformed.
+rendering chunks (1)...
+[vite:dts] Start generate declaration files...
+computing gzip size (0)...computing gzip size (1)...dist/index.js  155.52 kB │ gzip: 21.87 kB
+[vite:dts] Declaration files built in 808ms.
+
+✓ built in 957ms