diff --git a/backend/src/main/kotlin/com/wrbug/polymarketbot/service/backtest/BacktestExecutionService.kt b/backend/src/main/kotlin/com/wrbug/polymarketbot/service/backtest/BacktestExecutionService.kt index 9bca058..81db5b9 100644 --- a/backend/src/main/kotlin/com/wrbug/polymarketbot/service/backtest/BacktestExecutionService.kt +++ b/backend/src/main/kotlin/com/wrbug/polymarketbot/service/backtest/BacktestExecutionService.kt @@ -554,11 +554,12 @@ class BacktestExecutionService( balance += settlementValue + val marketTitle = marketService.getMarket(position.marketId)?.title ?: "" val settlementTrade = BacktestTrade( backtestTaskId = task.id!!, tradeTime = currentTime, marketId = position.marketId, - marketTitle = "", + marketTitle = marketTitle, side = "SETTLEMENT", outcome = when { settlementPrice == BigDecimal.ONE -> "WIN" @@ -611,11 +612,12 @@ class BacktestExecutionService( balance += settlementValue + val marketTitle = marketService.getMarket(position.marketId)?.title ?: "" val closedTrade = BacktestTrade( backtestTaskId = task.id!!, tradeTime = currentTime, marketId = position.marketId, - marketTitle = "", + marketTitle = marketTitle, side = "SETTLEMENT", outcome = "CLOSED", outcomeIndex = position.outcomeIndex, diff --git a/frontend/src/pages/BacktestList.tsx b/frontend/src/pages/BacktestList.tsx index a9ed723..302765f 100644 --- a/frontend/src/pages/BacktestList.tsx +++ b/frontend/src/pages/BacktestList.tsx @@ -53,9 +53,9 @@ const BacktestList: React.FC = () => { const [detailTradesPage, setDetailTradesPage] = useState(1) const [detailTradesSize] = useState(20) - // 获取回测任务列表 - const fetchTasks = async () => { - setLoading(true) + // 获取回测任务列表(silent 为 true 时不显示 loading,用于轮询刷新) + const fetchTasks = async (silent = false) => { + if (!silent) setLoading(true) try { const request: BacktestListRequest = { leaderId: leaderIdFilter, @@ -69,14 +69,14 @@ const BacktestList: React.FC = () => { if (response.data.code === 0 && response.data.data) { setTasks(response.data.data.list) setTotal(response.data.data.total) - } else { + } else if (!silent) { message.error(response.data.msg || t('backtest.fetchTasksFailed')) } } catch (error) { console.error('Failed to fetch backtest tasks:', error) - message.error(t('backtest.fetchTasksFailed')) + if (!silent) message.error(t('backtest.fetchTasksFailed')) } finally { - setLoading(false) + if (!silent) setLoading(false) } } @@ -84,6 +84,16 @@ const BacktestList: React.FC = () => { fetchTasks() }, [page, statusFilter, leaderIdFilter, sortBy, sortOrder]) + // 存在非终态任务(PENDING/RUNNING)时每 3s 轮询刷新进度 + const hasNonTerminalTask = tasks.some( + (task) => task.status === 'PENDING' || task.status === 'RUNNING' + ) + useEffect(() => { + if (!hasNonTerminalTask) return + const timer = setInterval(() => fetchTasks(true), 3000) + return () => clearInterval(timer) + }, [hasNonTerminalTask, page, statusFilter, leaderIdFilter, sortBy, sortOrder]) + // 刷新 const handleRefresh = () => { fetchTasks()