fix: 修复接口重复调用 — StrictMode 清理 + useModelList 去重

AppProvider useEffect 增加 aborted 标志,防止 React StrictMode
挂载→卸载→重新挂载时 refreshToken/getUserInfo 各调两次。

useModelList 提升到 LeftPanel 单例调用,通过 props 分发给
ModelSelector 和 TaskHistory,消除 /api/v1/models 重复请求。

DevTools 中显示「已停止」的请求即 StrictMode 第一轮挂载被丢弃的请求。

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
2026-06-09 19:24:34 +08:00
parent d95d155ab5
commit 848fdeca3d
7 changed files with 58 additions and 11 deletions

View File

@@ -107,10 +107,17 @@ export function AppProvider({ children }: AppProviderProps) {
}, []);
// ---------- 启动时初始化 token 存储 + 自动登录 ----------
//
// 注意React StrictMode开发模式会挂载→卸载→重新挂载以暴露副作用问题。
// aborted 标志确保卸载后不再执行异步回调,避免 refreshToken / getUserInfo 重复请求。
useEffect(() => {
let aborted = false;
// 从加密存储恢复 token 到内存缓存
Promise.all([initTokenStore(), initRefreshTokenStore()]).then(() => {
if (aborted) return;
// 初始化 401 刷新回调token 缓存就绪后才注册)
initAuthRefresh();
@@ -122,12 +129,14 @@ export function AppProvider({ children }: AppProviderProps) {
AuthAPI.refreshToken({ refresh_token: refreshToken })
.then(async (res) => {
if (aborted) return;
await setToken(res.access_token);
await setStoredRefreshToken(res.refresh_token);
setIsLoggedIn(true);
logger.info('auth', 'Auto-login succeeded');
// 补全用户信息
AuthAPI.getUserInfo().then((info) => {
if (aborted) return;
const u: LoginResponseBody = {
access_token: res.access_token,
refresh_token: res.refresh_token,
@@ -152,12 +161,15 @@ export function AppProvider({ children }: AppProviderProps) {
});
})
.catch(() => {
if (aborted) return;
logger.warn('auth', 'Auto-login failed, refresh_token expired');
clearStoredRefreshToken();
// 仅清除自动登录标记,保留用户名供下次表单回填
clearAutoLoginFlag();
});
});
return () => { aborted = true; };
}, []);
// ---------- 监听主进程推送的平台/版本信息 ----------

View File

@@ -9,6 +9,7 @@ import { useState, useRef, useEffect, useCallback } from 'react';
import { theme as antTheme } from 'antd';
import { ModelSelector } from './ModelSelector';
import { TaskHistory } from './TaskHistory';
import { useModelList } from '@/hooks/use-api';
// ---------- 常量 ----------
@@ -29,6 +30,9 @@ export function LeftPanel() {
// 面板容器引用
const containerRef = useRef<HTMLDivElement>(null);
// ======== 模型数据(提升到父组件,避免两个子组件重复请求) ========
const { data: models, loading, error, groupedModels, refetch } = useModelList();
// 模型选择区高度(像素)
const [topHeight, setTopHeight] = useState<number | null>(null);
// 拖拽状态
@@ -132,7 +136,13 @@ export function LeftPanel() {
flexShrink: 0,
}}
>
<ModelSelector />
<ModelSelector
models={models}
loading={loading}
error={error}
groupedModels={groupedModels}
refetch={refetch}
/>
</div>
{/* 纵向拖拽分隔条 */}
@@ -172,7 +182,7 @@ export function LeftPanel() {
{/* 下方:任务记录(剩余高度) */}
<div style={{ flex: 1, overflow: 'hidden', display: 'flex', flexDirection: 'column', minHeight: 0 }}>
<TaskHistory />
<TaskHistory allModels={models} />
</div>
</div>
);

View File

@@ -1,13 +1,12 @@
// ============================================================
// ModelSelector — 模型选择器Tabs 标签页分组 + 平铺列表)
// 使用 useModelList() Hook 获取数据,组件仅负责渲染
// 模型数据由父组件 LeftPanel 通过 props 传入,避免多个兄弟组件各自请求
// ============================================================
import React, { useState, useMemo, useCallback } from 'react';
import { Tabs, Spin, Empty, Tag, Typography, Button, Result, message, theme as antTheme } from 'antd';
import { AppstoreOutlined } from '@ant-design/icons';
import { useModelList } from '@/hooks/use-api';
import { useHomeContext } from '@/pages/home/HomeContent';
import { resolveCategoryLabel, MODEL_CATEGORIES, type ModelsListResponseBody, type ModelCategoryStringEnum } from '@/services/modules/models';
@@ -97,10 +96,17 @@ function ModelItem({ model, isSelected, onSelect }: ModelItemProps) {
// ---------- 主组件 ----------
export function ModelSelector() {
interface ModelSelectorProps {
models: ModelsListResponseBody[] | null;
loading: boolean;
error: Error | null;
groupedModels: Map<string, ModelsListResponseBody[]>;
refetch: () => void;
}
export function ModelSelector({ models, loading, error, groupedModels, refetch }: ModelSelectorProps) {
const { token } = antTheme.useToken();
const { selectedModel, setSelectedModel } = useHomeContext();
const { data: models, loading, error, groupedModels, refetch } = useModelList();
const [activeTab, setActiveTab] = useState(ALL_TAB_KEY);
// 当前 Tab 对应的模型列表

View File

@@ -17,7 +17,8 @@ import type { ColumnsType, TableProps } from 'antd/es/table';
import type { FilterValue, SorterResult } from 'antd/es/table/interface';
import { HistoryOutlined, SearchOutlined, SettingOutlined } from '@ant-design/icons';
import { useTaskList, useModelList } from '@/hooks/use-api';
import { useTaskList } from '@/hooks/use-api';
import type { ModelsListResponseBody } from '@/services/modules/models';
import { useAppContext } from '@/components/AppProvider';
import { useHomeContext } from '@/pages/home/HomeContent';
import { useTheme } from '@/components/ThemeProvider';
@@ -135,7 +136,12 @@ function pickMany(filters: TableFilters, key: string): string[] | undefined {
// ---------- 组件 ----------
export function TaskHistory() {
interface TaskHistoryProps {
/** 模型全量数据,由父组件 LeftPanel 传入(避免兄弟组件各自请求) */
allModels: ModelsListResponseBody[] | null;
}
export function TaskHistory({ allModels }: TaskHistoryProps) {
const { token } = antTheme.useToken();
const { edition } = useAppContext();
const {
@@ -210,10 +216,8 @@ export function TaskHistory() {
}));
}, [taskPage, taskPageSize]);
// -------- 模型列表(用于模型列筛选选项 + 模型名→ID 映射)--------
// -------- 模型列表(用于模型列筛选选项 + 模型名→ID 映射,由父组件传入--------
const { data: allModels } = useModelList();
const modelFilters:{text:string, value:string}[] = useMemo(() => {
if (!allModels) return [];
return allModels.map((m) => ({ text: m.name, value: m.id }));