@@ -139,7 +123,7 @@ const AccountSelector = ({ onChanged, currentUser, viewingUserId: propViewingUse
value={accountId || ''}
onChange={(e) => {
const v = parseInt(e.target.value, 10)
- setAccountId(Number.isFinite(v) && v > 0 ? v : 1)
+ dispatch(setAccountId(Number.isFinite(v) && v > 0 ? v : 1))
}}
title="切换账号后：配置/持仓/交易记录/统计会按账号隔离；推荐仍是全局"
disabled={isAdmin && !effectiveUserId}
@@ -160,4 +144,3 @@ const AccountSelector = ({ onChanged, currentUser, viewingUserId: propViewingUse
}
export default AccountSelector
-
diff --git a/frontend/src/components/ConfigPanel.jsx b/frontend/src/components/ConfigPanel.jsx
index 87e3715..d5000ac 100644
--- a/frontend/src/components/ConfigPanel.jsx
+++ b/frontend/src/components/ConfigPanel.jsx
@@ -1,9 +1,25 @@
import React, { useState, useEffect } from 'react'
import { Link } from 'react-router-dom'
-import { api, getCurrentAccountId, setCurrentAccountId } from '../services/api'
+import { useSelector, useDispatch } from 'react-redux'
+import { api } from '../services/api'
+import {
+ setAccountId,
+ selectAccountId,
+ selectCurrentUser,
+ selectViewingUserId,
+ selectIsAdmin,
+ selectEffectiveUserId,
+} from '../store/appSlice'
import './ConfigPanel.css'
-const ConfigPanel = ({ currentUser, viewingUserId }) => {
+const ConfigPanel = () => {
+ const dispatch = useDispatch()
+ const accountId = useSelector(selectAccountId) // 从 Redux 获取当前账号ID
+ const currentUser = useSelector(selectCurrentUser)
+ const viewingUserId = useSelector(selectViewingUserId)
+ const isAdmin = useSelector(selectIsAdmin)
+ const effectiveUserId = useSelector(selectEffectiveUserId)
+
const [configs, setConfigs] = useState({})
const [loading, setLoading] = useState(true)
const [saving, setSaving] = useState(false)
@@ -17,11 +33,6 @@ const ConfigPanel = ({ currentUser, viewingUserId }) => {
const [accountTradingErr, setAccountTradingErr] = useState('')
const [currentAccountMeta, setCurrentAccountMeta] = useState(null)
const [configMeta, setConfigMeta] = useState(null)
-
- // 多账号：当前账号（仅用于配置页提示；全局切换器在顶部导航）
- const [accountId, setAccountId] = useState(getCurrentAccountId())
-
- const isAdmin = (currentUser?.role || '') === 'admin'
const globalStrategyAccountId = parseInt(String(configMeta?.global_strategy_account_id || '1'), 10) || 1
const isGlobalStrategyAccount = isAdmin && accountId === globalStrategyAccountId
const loadConfigMeta = async () => {
@@ -469,7 +480,6 @@ const ConfigPanel = ({ currentUser, viewingUserId }) => {
// 切换账号时，刷新页面数据（先加载account meta，再加载其他）
useEffect(() => {
- setCurrentAccountId(accountId)
setMessage('')
setLoading(true)
loadCurrentAccountMeta().then(() => {
@@ -477,41 +487,7 @@ const ConfigPanel = ({ currentUser, viewingUserId }) => {
checkFeasibility()
loadAccountTradingStatus()
})
- }, [accountId])
-
- // 顶部导航切换账号时：即时同步（比 setInterval 更及时）
- useEffect(() => {
- const onChanged = (e) => {
- const next = parseInt(String(e?.detail?.accountId || ''), 10)
- if (Number.isFinite(next) && next > 0 && next !== accountId) {
- setAccountId(next)
- // 立即重新加载相关数据（先加载account meta，再加载其他）
- loadCurrentAccountMeta().then(() => {
- loadConfigs()
- loadAccountTradingStatus()
- })
- }
- }
- window.addEventListener('ats:account:changed', onChanged)
- return () => window.removeEventListener('ats:account:changed', onChanged)
- }, [accountId])
-
- // 顶部导航切换账号时（localStorage更新），这里做一个轻量同步
- useEffect(() => {
- const timer = setInterval(() => {
- const cur = getCurrentAccountId()
-
- if (cur !== accountId) {
- setAccountId(cur)
- // 同步时也重新加载数据（先加载account meta）
- loadCurrentAccountMeta().then(() => {
- loadConfigs()
- loadAccountTradingStatus()
- })
- }
- }, 1000)
- return () => clearInterval(timer)
- }, [accountId])
+ }, [accountId]) // 当 accountId 变化时重新加载
const checkFeasibility = async () => {
setCheckingFeasibility(true)
@@ -883,7 +859,7 @@ const ConfigPanel = ({ currentUser, viewingUserId }) => {
type="button"
className="system-btn primary"
onClick={() => {
- setCurrentAccountId(globalStrategyAccountId)
+ dispatch(setAccountId(globalStrategyAccountId))
setAccountId(globalStrategyAccountId)
setMessage('已切换到全局策略账号（策略核心统一在这里维护）')
}}
diff --git a/frontend/src/components/GlobalConfig.jsx b/frontend/src/components/GlobalConfig.jsx
index 30c7b11..dcb24da 100644
--- a/frontend/src/components/GlobalConfig.jsx
+++ b/frontend/src/components/GlobalConfig.jsx
@@ -1,6 +1,8 @@
import React, { useState, useEffect, useRef } from 'react'
import { Link } from 'react-router-dom'
+import { useSelector } from 'react-redux'
import { api } from '../services/api'
+import { selectCurrentUser, selectIsAdmin } from '../store/appSlice'
import './GlobalConfig.css'
import './ConfigPanel.css' // 复用 ConfigPanel 的样式
@@ -145,7 +147,10 @@ const ConfigItem = ({ label, config, onUpdate, disabled }) => {
)
}
-const GlobalConfig = ({ currentUser }) => {
+const GlobalConfig = () => {
+ const currentUser = useSelector(selectCurrentUser)
+ const isAdmin = useSelector(selectIsAdmin)
+
const [users, setUsers] = useState([])
const [accounts, setAccounts] = useState([])
const [loading, setLoading] = useState(true)
@@ -178,8 +183,7 @@ const GlobalConfig = ({ currentUser }) => {
'ENTRY_MAX_DRIFT_PCT_RANGING',
])
- // 必须在所有使用之前定义 isAdmin
- const isAdmin = (currentUser?.role || '') === 'admin'
+ // isAdmin 已从 Redux 获取，无需重复定义
// 预设方案配置（必须在函数定义之前，常量定义）
const presets = {
diff --git a/frontend/src/components/Recommendations.jsx b/frontend/src/components/Recommendations.jsx
index d10993e..0563cd7 100644
--- a/frontend/src/components/Recommendations.jsx
+++ b/frontend/src/components/Recommendations.jsx
@@ -1,13 +1,16 @@
import React, { useState, useEffect } from 'react'
+import { useSelector } from 'react-redux'
import { api } from '../services/api'
import './Recommendations.css'
import CollapsibleUserGuide from './CollapsibleUserGuide'
import { TrendingDown, TrendingUp } from 'lucide-react'
+import { selectAccountId } from '../store/appSlice'
function Recommendations() {
+ const accountId = useSelector(selectAccountId) // 从 Redux 获取当前账号ID
const [recommendations, setRecommendations] = useState([])
const [loading, setLoading] = useState(true)
const [error, setError] = useState(null)
@@ -19,21 +22,9 @@ function Recommendations() {
const [bookmarking, setBookmarking] = useState({}) // 记录正在标记的推荐ID
const [ordering, setOrdering] = useState({}) // 记录正在下单的推荐ID
- // 获取当前账号ID
- const getCurrentAccountId = () => {
- try {
- const v = localStorage.getItem('ats_account_id');
- const n = parseInt(v || '1', 10);
- return Number.isFinite(n) && n > 0 ? n : 1;
- } catch (e) {
- return 1;
- }
- };
-
// 获取默认下单量（按账号存储）
const getDefaultOrderSize = () => {
try {
- const accountId = getCurrentAccountId();
const key = `ats_default_order_size_${accountId}`;
const value = localStorage.getItem(key);
if (value) {
@@ -51,7 +42,6 @@ function Recommendations() {
// 设置默认下单量（按账号存储）
const setDefaultOrderSize = (size) => {
try {
- const accountId = getCurrentAccountId();
const key = `ats_default_order_size_${accountId}`;
const sizeNum = parseFloat(String(size || '1'));
if (Number.isFinite(sizeNum) && sizeNum > 0) {
@@ -64,7 +54,12 @@ function Recommendations() {
return false;
};
- const [defaultOrderSize, setDefaultOrderSizeState] = useState(getDefaultOrderSize());
+ const [defaultOrderSize, setDefaultOrderSizeState] = useState(getDefaultOrderSize())
+
+ // 当 accountId 变化时，重新获取默认下单量
+ useEffect(() => {
+ setDefaultOrderSizeState(getDefaultOrderSize())
+ }, [accountId])
useEffect(() => {
loadRecommendations()
@@ -378,7 +373,7 @@ function Recommendations() {
notionalUsdt,
leverage
);
- alert(`下单成功！\n订单ID: ${result.order_id}\n交易ID: ${result.trade_id}`);
+ alert(`下单成功！\n订单ID: ${result.order_id}\n交易ID: ${result.trade_id || 'N/A'}`);
// 可以刷新推荐列表或更新状态
} catch (err) {
alert(`下单失败: ${err.message}`);
diff --git a/frontend/src/components/StatsDashboard.jsx b/frontend/src/components/StatsDashboard.jsx
index f19a979..dce2987 100644
--- a/frontend/src/components/StatsDashboard.jsx
+++ b/frontend/src/components/StatsDashboard.jsx
@@ -1,9 +1,12 @@
import React, { useState, useEffect } from 'react'
+import { useSelector } from 'react-redux'
import { api } from '../services/api'
import { LineChart, Line, XAxis, YAxis, CartesianGrid, Tooltip, Legend, ResponsiveContainer } from 'recharts'
+import { selectAccountId } from '../store/appSlice'
import './StatsDashboard.css'
const StatsDashboard = () => {
+ const accountId = useSelector(selectAccountId) // 从 Redux 获取当前账号ID
const [dashboardData, setDashboardData] = useState(null)
const [loading, setLoading] = useState(true)
const [closingSymbol, setClosingSymbol] = useState(null)
@@ -47,18 +50,10 @@ const StatsDashboard = () => {
loadTradingConfig() // 同时刷新配置
}, 30000) // 每30秒刷新
- // 监听账号切换事件，自动重新加载数据
- const handleAccountChange = () => {
- loadDashboard()
- loadTradingConfig()
- }
- window.addEventListener('ats:account:changed', handleAccountChange)
-
return () => {
clearInterval(interval)
- window.removeEventListener('ats:account:changed', handleAccountChange)
}
- }, [])
+ }, [accountId]) // 当 accountId 变化时重新加载
const loadTradingConfig = async () => {
try {
diff --git a/frontend/src/components/TradeList.jsx b/frontend/src/components/TradeList.jsx
index 4c229f0..e0d3d8d 100644
--- a/frontend/src/components/TradeList.jsx
+++ b/frontend/src/components/TradeList.jsx
@@ -1,8 +1,11 @@
import React, { useState, useEffect } from 'react'
+import { useSelector } from 'react-redux'
import { api } from '../services/api'
+import { selectAccountId } from '../store/appSlice'
import './TradeList.css'
const TradeList = () => {
+ const accountId = useSelector(selectAccountId) // 从 Redux 获取当前账号ID
const [trades, setTrades] = useState([])
const [stats, setStats] = useState(null)
const [loading, setLoading] = useState(true)
@@ -19,17 +22,7 @@ const TradeList = () => {
useEffect(() => {
loadData()
-
- // 监听账号切换事件，自动重新加载数据
- const handleAccountChange = () => {
- loadData()
- }
- window.addEventListener('ats:account:changed', handleAccountChange)
-
- return () => {
- window.removeEventListener('ats:account:changed', handleAccountChange)
- }
- }, [])
+ }, [accountId]) // 当 accountId 变化时重新加载
const loadData = async () => {
setLoading(true)
@@ -242,15 +235,10 @@ const TradeList = () => {
stats && (
整体统计
-
总交易数：{stats.total_trades}
胜率：{stats.win_rate.toFixed(2)}%
-
-
总盈亏：{stats.total_pnl.toFixed(2)} USDT
平均盈亏：{stats.avg_pnl.toFixed(2)} USDT
-
-
平均持仓时长（分钟）：{stats.avg_duration_minutes ? Number(stats.avg_duration_minutes).toFixed(0) : 0}
平仓原因（有意义交易）：
@@ -272,9 +260,6 @@ const TradeList = () => {
return parts.length ? parts.join(' / ') : '—'
})()}
-
-
-
平均盈利 / 平均亏损（期望 3:1）：{Number(stats.avg_win_loss_ratio || 0).toFixed(2)} : 1
总交易量（名义）：{Number(stats.total_notional_usdt || 0).toFixed(2)} USDT
diff --git a/frontend/src/main.jsx b/frontend/src/main.jsx
index 5cc5991..ba34b61 100644
--- a/frontend/src/main.jsx
+++ b/frontend/src/main.jsx
@@ -1,10 +1,14 @@
import React from 'react'
import ReactDOM from 'react-dom/client'
+import { Provider } from 'react-redux'
+import { store } from './store'
import App from './App'
import './index.css'
ReactDOM.createRoot(document.getElementById('root')).render(
-
+
+
+
,
)
diff --git a/frontend/src/store/appSlice.js b/frontend/src/store/appSlice.js
new file mode 100644
index 0000000..da14209
--- /dev/null
+++ b/frontend/src/store/appSlice.js
@@ -0,0 +1,147 @@
+import { createSlice } from '@reduxjs/toolkit'
+
+const VIEWING_USER_ID_KEY = 'ats_viewing_user_id'
+const ACCOUNT_ID_STORAGE_KEY = 'ats_account_id'
+
+// 从 localStorage 读取初始值
+const getInitialViewingUserId = () => {
+ try {
+ const stored = localStorage.getItem(VIEWING_USER_ID_KEY)
+ if (stored) {
+ const parsed = parseInt(stored, 10)
+ if (Number.isFinite(parsed) && parsed > 0) return parsed
+ }
+ } catch (e) {
+ // ignore
+ }
+ return null
+}
+
+const getInitialAccountId = () => {
+ try {
+ const v = localStorage.getItem(ACCOUNT_ID_STORAGE_KEY)
+ const n = parseInt(v || '1', 10)
+ return Number.isFinite(n) && n > 0 ? n : 1
+ } catch (e) {
+ return 1
+ }
+}
+
+const initialState = {
+ currentUser: null, // 当前登录用户
+ viewingUserId: getInitialViewingUserId(), // 管理员查看的用户ID
+ accountId: getInitialAccountId(), // 当前选中的账号ID
+ accounts: [], // 当前用户的账号列表
+ users: [], // 用户列表（管理员可见）
+}
+
+const appSlice = createSlice({
+ name: 'app',
+ initialState,
+ reducers: {
+ setCurrentUser: (state, action) => {
+ state.currentUser = action.payload
+ },
+ setViewingUserId: (state, action) => {
+ const userId = action.payload
+ state.viewingUserId = userId
+ if (userId) {
+ try {
+ localStorage.setItem(VIEWING_USER_ID_KEY, String(userId))
+ } catch (e) {
+ // ignore
+ }
+ } else {
+ try {
+ localStorage.removeItem(VIEWING_USER_ID_KEY)
+ } catch (e) {
+ // ignore
+ }
+ }
+ },
+ setAccountId: (state, action) => {
+ const accountId = action.payload
+ state.accountId = accountId
+ if (accountId) {
+ try {
+ localStorage.setItem(ACCOUNT_ID_STORAGE_KEY, String(accountId))
+ } catch (e) {
+ // ignore
+ }
+ // 触发自定义事件，保持向后兼容
+ try {
+ window.dispatchEvent(new CustomEvent('ats:account:changed', { detail: { accountId } }))
+ } catch (e) {
+ // ignore
+ }
+ }
+ },
+ setAccounts: (state, action) => {
+ state.accounts = action.payload
+ },
+ setUsers: (state, action) => {
+ state.users = action.payload
+ },
+ // 切换用户时，自动选择第一个active账号
+ switchUser: (state, action) => {
+ const userId = action.payload
+ state.viewingUserId = userId
+ if (userId) {
+ try {
+ localStorage.setItem(VIEWING_USER_ID_KEY, String(userId))
+ } catch (e) {
+ // ignore
+ }
+ }
+ // 账号列表会在组件中异步加载，这里不自动切换accountId
+ // 等待账号列表加载完成后再切换
+ },
+ // 切换用户后，账号列表加载完成，自动选择第一个active账号
+ selectFirstActiveAccount: (state) => {
+ const firstActive = state.accounts.find((a) => String(a?.status || 'active') === 'active') || state.accounts[0]
+ if (firstActive) {
+ const nextAccountId = parseInt(String(firstActive.id || ''), 10)
+ if (Number.isFinite(nextAccountId) && nextAccountId > 0) {
+ state.accountId = nextAccountId
+ try {
+ localStorage.setItem(ACCOUNT_ID_STORAGE_KEY, String(nextAccountId))
+ } catch (e) {
+ // ignore
+ }
+ // 触发自定义事件
+ try {
+ window.dispatchEvent(new CustomEvent('ats:account:changed', { detail: { accountId: nextAccountId } }))
+ } catch (e) {
+ // ignore
+ }
+ }
+ }
+ },
+ },
+})
+
+export const {
+ setCurrentUser,
+ setViewingUserId,
+ setAccountId,
+ setAccounts,
+ setUsers,
+ switchUser,
+ selectFirstActiveAccount,
+} = appSlice.actions
+
+// Selectors
+export const selectCurrentUser = (state) => state.app.currentUser
+export const selectViewingUserId = (state) => state.app.viewingUserId
+export const selectAccountId = (state) => state.app.accountId
+export const selectAccounts = (state) => state.app.accounts
+export const selectUsers = (state) => state.app.users
+export const selectIsAdmin = (state) => (state.app.currentUser?.role || '') === 'admin'
+export const selectEffectiveUserId = (state) => {
+ const isAdmin = (state.app.currentUser?.role || '') === 'admin'
+ return isAdmin && state.app.viewingUserId
+ ? state.app.viewingUserId
+ : parseInt(String(state.app.currentUser?.id || ''), 10)
+}
+
+export default appSlice.reducer
diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
new file mode 100644
index 0000000..58dcf5c
--- /dev/null
+++ b/frontend/src/store/index.js
@@ -0,0 +1,10 @@
+import { configureStore } from '@reduxjs/toolkit'
+import appSlice from './appSlice'
+
+export const store = configureStore({
+ reducer: {
+ app: appSlice,
+ },
+})
+
+export default store