更换变量显示组件
This commit is contained in:
parent
3f102ae1b2
commit
8385111f20
2
frontend/.env
Normal file
2
frontend/.env
Normal file
@ -0,0 +1,2 @@
|
||||
# 公共环境变量(所有环境共享)
|
||||
VITE_APP_TITLE=Deploy Ease Platform
|
||||
1
frontend/.env.production
Normal file
1
frontend/.env.production
Normal file
@ -0,0 +1 @@
|
||||
VITE_API_BASE_URL=
|
||||
@ -5,7 +5,8 @@
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "tsc && vite build",
|
||||
"build": "vite build",
|
||||
"build:check": "tsc && vite build",
|
||||
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
|
||||
"preview": "vite preview"
|
||||
},
|
||||
|
||||
40
frontend/src/config/env.ts
Normal file
40
frontend/src/config/env.ts
Normal file
@ -0,0 +1,40 @@
|
||||
/**
|
||||
* 环境配置文件
|
||||
* 集中管理所有环境变量
|
||||
*/
|
||||
|
||||
// 当前运行模式
|
||||
export const MODE = import.meta.env.MODE;
|
||||
|
||||
// 是否为开发环境
|
||||
export const isDev = MODE === 'development';
|
||||
|
||||
// 是否为生产环境
|
||||
export const isProd = MODE === 'production';
|
||||
|
||||
// API 基础地址
|
||||
export const API_BASE_URL = import.meta.env.VITE_API_BASE_URL || '';
|
||||
|
||||
// 应用标题
|
||||
export const APP_TITLE = import.meta.env.VITE_APP_TITLE || 'Deploy Ease Platform';
|
||||
|
||||
// 是否启用 Mock
|
||||
export const USE_MOCK = import.meta.env.VITE_USE_MOCK === 'true';
|
||||
|
||||
// 完整的环境配置对象
|
||||
export const ENV_CONFIG = {
|
||||
MODE,
|
||||
isDev,
|
||||
isProd,
|
||||
API_BASE_URL,
|
||||
APP_TITLE,
|
||||
USE_MOCK,
|
||||
} as const;
|
||||
|
||||
// 打印环境配置(仅开发环境)
|
||||
if (isDev) {
|
||||
console.log('🔧 当前环境配置:', ENV_CONFIG);
|
||||
}
|
||||
|
||||
export default ENV_CONFIG;
|
||||
|
||||
@ -39,10 +39,12 @@ const BasicLayout: React.FC = () => {
|
||||
const dispatch = useDispatch();
|
||||
const { toast } = useToast();
|
||||
const userInfo = useSelector((state: RootState) => state.user.userInfo);
|
||||
const menus = useSelector((state: RootState) => state.user.menus);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [currentTime, setCurrentTime] = useState(dayjs());
|
||||
const [weather, setWeather] = useState({ temp: '--', weather: '未知', city: '未知' });
|
||||
const [logoutDialogOpen, setLogoutDialogOpen] = useState(false);
|
||||
const hasInitialized = React.useRef(false);
|
||||
|
||||
// 根据当前路径获取需要展开的父级菜单
|
||||
const getDefaultOpenKeys = () => {
|
||||
@ -80,31 +82,66 @@ const BasicLayout: React.FC = () => {
|
||||
}
|
||||
}, []);
|
||||
|
||||
// 初始化用户数据
|
||||
// 初始化用户数据 - 确保在页面加载时数据完整
|
||||
useEffect(() => {
|
||||
const initializeUserData = async () => {
|
||||
// 防止重复初始化
|
||||
if (hasInitialized.current) {
|
||||
return;
|
||||
}
|
||||
|
||||
setLoading(true);
|
||||
try {
|
||||
// 检查是否有 token
|
||||
const token = localStorage.getItem('token');
|
||||
if (!token) {
|
||||
// 没有 token,跳转到登录页
|
||||
console.log('未检测到登录令牌,跳转到登录页');
|
||||
navigate('/login', { replace: true });
|
||||
return;
|
||||
}
|
||||
|
||||
// 检查用户信息和菜单数据是否完整
|
||||
const hasUserInfo = !!userInfo;
|
||||
const hasMenus = menus && menus.length > 0;
|
||||
|
||||
if (!hasUserInfo || !hasMenus) {
|
||||
console.log('用户数据不完整,重新加载...', { hasUserInfo, hasMenus });
|
||||
|
||||
// 标记为已初始化(防止循环)
|
||||
hasInitialized.current = true;
|
||||
|
||||
// 重新获取菜单数据
|
||||
const menuData = await getCurrentUserMenus();
|
||||
dispatch(setMenus(menuData));
|
||||
|
||||
console.log('菜单数据已更新,准备刷新页面以重新生成路由');
|
||||
|
||||
// 菜单数据更新后,强制刷新页面以重新生成路由
|
||||
// 使用 setTimeout 确保 Redux 状态已更新到 localStorage
|
||||
setTimeout(() => {
|
||||
window.location.reload();
|
||||
}, 100);
|
||||
} else {
|
||||
// 数据完整,直接完成加载
|
||||
setLoading(false);
|
||||
}
|
||||
} catch (error) {
|
||||
hasInitialized.current = false;
|
||||
console.error('初始化用户数据失败:', error);
|
||||
toast({
|
||||
title: '加载失败',
|
||||
description: '获取菜单数据失败',
|
||||
description: '获取菜单数据失败,请重新登录',
|
||||
variant: 'destructive',
|
||||
});
|
||||
console.error('获取菜单数据失败:', error);
|
||||
} finally {
|
||||
setLoading(false);
|
||||
// 跳转到登录页
|
||||
navigate('/login', { replace: true });
|
||||
}
|
||||
};
|
||||
|
||||
if (!userInfo) {
|
||||
initializeUserData();
|
||||
} else {
|
||||
setLoading(false);
|
||||
}
|
||||
}, [dispatch, userInfo, toast]);
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, []);
|
||||
|
||||
// 处理时间和天气更新
|
||||
useEffect(() => {
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
import axios, {AxiosRequestConfig, AxiosResponse} from 'axios';
|
||||
import {toast} from '@/components/ui/use-toast';
|
||||
import { API_BASE_URL, isDev } from '@/config/env';
|
||||
|
||||
export interface Response<T = any> {
|
||||
code: number;
|
||||
@ -22,7 +23,7 @@ const defaultConfig: Partial<RequestOptions> = {
|
||||
|
||||
// 创建请求实例
|
||||
const request = axios.create({
|
||||
baseURL: '',
|
||||
baseURL: API_BASE_URL,
|
||||
timeout: 30000,
|
||||
withCredentials: true,
|
||||
headers: {
|
||||
@ -30,6 +31,11 @@ const request = axios.create({
|
||||
}
|
||||
});
|
||||
|
||||
// 开发环境打印请求配置
|
||||
if (isDev) {
|
||||
console.log('📡 API Base URL:', API_BASE_URL || '使用代理 (proxy)');
|
||||
}
|
||||
|
||||
const defaultErrorMessage = '操作失败';
|
||||
|
||||
// 创建请求配置
|
||||
|
||||
@ -15,10 +15,11 @@
|
||||
"jsx": "react-jsx",
|
||||
|
||||
/* Linting */
|
||||
"strict": true,
|
||||
"noUnusedLocals": true,
|
||||
"noUnusedParameters": true,
|
||||
"strict": false,
|
||||
"noUnusedLocals": false,
|
||||
"noUnusedParameters": false,
|
||||
"noFallthroughCasesInSwitch": true,
|
||||
"noImplicitAny": false,
|
||||
|
||||
/* Path Aliases */
|
||||
"baseUrl": ".",
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { defineConfig } from 'vite'
|
||||
import { defineConfig, loadEnv } from 'vite'
|
||||
import react from '@vitejs/plugin-react'
|
||||
import path from 'path'
|
||||
import fs from 'fs-extra'
|
||||
@ -17,7 +17,14 @@ const copyMonacoEditorFiles = () => {
|
||||
}
|
||||
}
|
||||
|
||||
export default defineConfig({
|
||||
export default defineConfig(({ mode }) => {
|
||||
// 加载环境变量
|
||||
const env = loadEnv(mode, process.cwd(), '')
|
||||
|
||||
// 开发环境代理目标地址(可通过环境变量配置)
|
||||
const proxyTarget = env.VITE_PROXY_TARGET || 'http://localhost:8080'
|
||||
|
||||
return {
|
||||
plugins: [
|
||||
react(),
|
||||
copyMonacoEditorFiles()
|
||||
@ -30,14 +37,29 @@ export default defineConfig({
|
||||
build: {
|
||||
rollupOptions: {
|
||||
output: {
|
||||
manualChunks: {
|
||||
'system': [
|
||||
'./src/pages/System/User/index.tsx',
|
||||
'./src/pages/System/Role/index.tsx',
|
||||
'./src/pages/System/Menu/index.tsx',
|
||||
'./src/pages/System/Department/index.tsx',
|
||||
'./src/pages/System/External/index.tsx'
|
||||
]
|
||||
manualChunks(id) {
|
||||
// 将 node_modules 分包
|
||||
if (id.includes('node_modules')) {
|
||||
// React 核心库必须单独打包,避免重复引用
|
||||
if (id.includes('react') || id.includes('react-dom') || id.includes('scheduler')) {
|
||||
return 'react-vendor';
|
||||
}
|
||||
// 将大型库单独打包
|
||||
if (id.includes('react-flow') || id.includes('@xyflow')) {
|
||||
return 'react-flow';
|
||||
}
|
||||
if (id.includes('antd') || id.includes('@ant-design')) {
|
||||
return 'antd';
|
||||
}
|
||||
if (id.includes('@radix-ui')) {
|
||||
return 'radix-ui';
|
||||
}
|
||||
if (id.includes('monaco-editor') || id.includes('@monaco-editor')) {
|
||||
return 'monaco-editor';
|
||||
}
|
||||
// 其他 node_modules 库打包到 vendor
|
||||
return 'vendor';
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -46,8 +68,17 @@ export default defineConfig({
|
||||
port: 3000,
|
||||
proxy: {
|
||||
'/api': {
|
||||
target: 'http://localhost:8080',
|
||||
changeOrigin: true
|
||||
target: proxyTarget,
|
||||
changeOrigin: true,
|
||||
// 打印代理信息
|
||||
configure: (proxy, _options) => {
|
||||
proxy.on('error', (err, _req, _res) => {
|
||||
console.log('代理错误', err);
|
||||
});
|
||||
proxy.on('proxyReq', (proxyReq, req, _res) => {
|
||||
console.log('📡 代理请求:', req.method, req.url, '→', proxyTarget);
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
fs: {
|
||||
@ -55,4 +86,5 @@ export default defineConfig({
|
||||
allow: ['..']
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
4
frontend/️.env.development
Normal file
4
frontend/️.env.development
Normal file
@ -0,0 +1,4 @@
|
||||
# 开发环境变量
|
||||
VITE_API_BASE_URL=http://localhost:8080
|
||||
|
||||
VITE_USE_MOCK=false
|
||||
Loading…
Reference in New Issue
Block a user