diff --git a/config/config.ts b/config/config.ts index a0e4bd7d..9b714f0f 100644 --- a/config/config.ts +++ b/config/config.ts @@ -7,7 +7,7 @@ import proxy from './proxy'; import routes from './routes'; -const { REACT_APP_ENV = 'dev' } = process.env; +const { UMI_ENV = 'dev' } = process.env; /** * @name 使用公共路径 @@ -61,7 +61,7 @@ export default defineConfig({ * @doc 代理介绍 https://umijs.org/docs/guides/proxy * @doc 代理配置 https://umijs.org/docs/api/config#proxy */ - proxy: proxy[REACT_APP_ENV as keyof typeof proxy], + proxy: proxy[UMI_ENV as keyof typeof proxy], /** * @name 快速热更新配置 * @description 一个不错的热更新组件,更新时可以保留 state diff --git a/package.json b/package.json index 7f2aa897..457b1023 100644 --- a/package.json +++ b/package.json @@ -19,13 +19,13 @@ "openapi": "max openapi", "prepare": "husky", "preview": "npm run build && max preview --port 8000", - "record": "cross-env NODE_ENV=development REACT_APP_ENV=test max record --scene=login", + "record": "cross-env NODE_ENV=development UMI_ENV=test max record --scene=login", "serve": "umi-serve", "start": "cross-env UMI_ENV=dev max dev", - "start:dev": "cross-env REACT_APP_ENV=dev MOCK=none UMI_ENV=dev max dev", - "start:no-mock": "cross-env MOCK=none UMI_ENV=dev max dev", - "start:pre": "cross-env REACT_APP_ENV=pre UMI_ENV=dev max dev", - "start:test": "cross-env REACT_APP_ENV=test MOCK=none UMI_ENV=dev max dev", + "start:dev": "cross-env UMI_ENV=dev MOCK=none max dev", + "start:no-mock": "cross-env MOCK=none max dev", + "start:pre": "cross-env UMI_ENV=pre MOCK=none max dev", + "start:test": "cross-env UMI_ENV=test MOCK=none max dev", "test": "jest", "test:coverage": "npm run jest -- --coverage", "test:update": "npm run jest -- -u", diff --git a/src/app.tsx b/src/app.tsx index 96483655..b0d0e6cb 100644 --- a/src/app.tsx +++ b/src/app.tsx @@ -16,8 +16,8 @@ import defaultSettings from '../config/defaultSettings'; import { errorConfig } from './requestErrorConfig'; import '@ant-design/v5-patch-for-react-19'; -const isDev = - process.env.NODE_ENV === 'development' || process.env.CI; +const isDev = process.env.NODE_ENV === 'development'; +const isDevOrTest = isDev || process.env.CI; const loginPath = '/user/login'; /** @@ -73,9 +73,9 @@ export const layout: RunTimeLayoutConfig = ({ avatarProps: { src: initialState?.currentUser?.avatar, title: , - render: (_, avatarChildren) => { - return {avatarChildren}; - }, + render: (_, avatarChildren) => ( + {avatarChildren} + ), }, waterMarkProps: { content: initialState?.currentUser?.name, @@ -108,7 +108,7 @@ export const layout: RunTimeLayoutConfig = ({ width: '331px', }, ], - links: isDev + links: isDevOrTest ? [ @@ -125,7 +125,7 @@ export const layout: RunTimeLayoutConfig = ({ return ( <> {children} - {isDev && ( + {isDevOrTest && (