修复:查询局部刷新与智能分析会话交互,完善分析收尾和配置切换
This commit is contained in:
+91
-16
@@ -7,12 +7,12 @@ import {
|
||||
Button,
|
||||
Checkbox,
|
||||
Drawer,
|
||||
Dropdown,
|
||||
Empty,
|
||||
Form,
|
||||
Input,
|
||||
Modal,
|
||||
Pagination,
|
||||
Popconfirm,
|
||||
Progress,
|
||||
Select,
|
||||
Spin,
|
||||
@@ -22,7 +22,7 @@ import {
|
||||
} from 'antd';
|
||||
import type { ColumnsType } from 'antd/es/table';
|
||||
import { QualityTable as Table } from './QualityTable';
|
||||
import { DeleteOutlined, DownloadOutlined, ReloadOutlined, RobotOutlined } from '@ant-design/icons';
|
||||
import { DeleteOutlined, DownloadOutlined, EditOutlined, MoreOutlined, ReloadOutlined, RobotOutlined } from '@ant-design/icons';
|
||||
import { ApiError, api, collectionItems, decodeQueryValueList } from './api';
|
||||
import type { AuthUser, Collection, OptionsResponse, QueryParams, SourceItem, ViewKind } from './types';
|
||||
import type { DataWorkflowStatus } from './NoCodeDataTypes';
|
||||
@@ -33,6 +33,7 @@ import { TargetVersionAdmin } from './AnalyticsCompletion';
|
||||
import { AnalysisReportExport, NativeAnalysisReport } from './AnalysisReportExport';
|
||||
import { AiMarkdown } from './AiMarkdown';
|
||||
import { AnalysisApiSettings } from './AnalysisApiSettings';
|
||||
import { acceptAnalysisEvent, analysisScrollFollows, partialAnalysisNotice, partialAnswerIsOnlyProgress } from './analysisConversationState';
|
||||
import { AnalysisProcess } from './AnalysisProcess';
|
||||
import { activeAnalysisTurn, analysisIsRunning, beginAnalysisSelection, defaultAnalysisSession, rememberAnalysisSession, rememberPendingAnalysisSession, settledAnalysisTurn } from './analysisConversationState';
|
||||
import './analysis-chat.css';
|
||||
@@ -76,8 +77,9 @@ const ANALYSIS_FINAL_STATUSES = new Set(['COMPLETED', 'PARTIAL', 'FAILED', 'CANC
|
||||
function generateReportPrompt(turn: Record<string, unknown>): string {
|
||||
const result = isObjectRecord(turn.result) ? turn.result : turn;
|
||||
const question = (typeof turn.question === 'string' ? turn.question : '').trim().slice(0, 240);
|
||||
const answer = typeof result.answer === 'string' ? result.answer : typeof turn.answer === 'string' ? turn.answer : '';
|
||||
const prefix = `请将关于「${question || '本次质量分析'}」的这次分析生成报告,沿用该分析的期间与范围。\n\n本次分析结论供参考,请忠于已有数据,不要补造指标或数字:\n`;
|
||||
const answer = partialAnswerIsOnlyProgress(turn) ? '' : typeof result.answer === 'string' ? result.answer : typeof turn.answer === 'string' ? turn.answer : '';
|
||||
const partial = String(turn.status || result.status).toUpperCase() === 'PARTIAL';
|
||||
const prefix = `请将关于「${question || '本次质量分析'}」的这次分析生成报告,沿用该分析的期间与范围。${partial ? '本次分析部分完成,报告须保留这个状态和未完成范围,不得写成已全部核验。' : ''}\n\n本次分析结论供参考,请忠于已有数据,不要补造指标或数字:\n`;
|
||||
return `${prefix}${answer.slice(0, Math.max(0, 1600 - prefix.length))}`;
|
||||
}
|
||||
|
||||
@@ -945,7 +947,10 @@ function TaskTable({ items, importOnly, user, onUnauthorized, onRefresh }: { ite
|
||||
}
|
||||
|
||||
function AnalysisPage({ onUnauthorized, user }: { onUnauthorized: (error: unknown) => boolean; user: AuthUser }) {
|
||||
const { message } = App.useApp();
|
||||
const { message, modal } = App.useApp();
|
||||
const [renameTarget, setRenameTarget] = useState<Record<string, unknown> | null>(null);
|
||||
const [renameTitle, setRenameTitle] = useState('');
|
||||
const [renaming, setRenaming] = useState(false);
|
||||
const initialParams = new URLSearchParams(window.location.search);
|
||||
const initialSessionId = initialParams.get('sessionId') || '';
|
||||
const initialTurnId = initialParams.get('turnId') || '';
|
||||
@@ -971,8 +976,17 @@ function AnalysisPage({ onUnauthorized, user }: { onUnauthorized: (error: unknow
|
||||
const subscriptionGeneration = useRef(0);
|
||||
const [releaseId, setReleaseId] = useState<string>();
|
||||
const [sourceResultRef, setSourceResultRef] = useState<AnalysisResultRef>();
|
||||
const conversationEnd = useRef<HTMLDivElement>(null);
|
||||
useEffect(() => { conversationEnd.current?.scrollIntoView({ block: 'nearest' }); }, [lastTurn, busy]);
|
||||
const conversation = useRef<HTMLDivElement>(null);
|
||||
const followOutput = useRef(true);
|
||||
const previousScrollTop = useRef(0);
|
||||
useEffect(() => { followOutput.current = true; previousScrollTop.current = 0; }, [sessionId]);
|
||||
useEffect(() => {
|
||||
const element = conversation.current;
|
||||
if (element && followOutput.current) {
|
||||
element.scrollTop = element.scrollHeight;
|
||||
previousScrollTop.current = element.scrollTop;
|
||||
}
|
||||
}, [lastTurn, busy, turns, sessionId]);
|
||||
|
||||
const loadSessions = async () => {
|
||||
try { const items = collectionItems(await api.analysisSessions()); if (mounted.current) setSessions(items); }
|
||||
@@ -1141,6 +1155,16 @@ function AnalysisPage({ onUnauthorized, user }: { onUnauthorized: (error: unknow
|
||||
}
|
||||
};
|
||||
|
||||
const renameSession = async () => {
|
||||
if (!renameTarget || !renameTitle.trim() || renaming) return;
|
||||
setRenaming(true);
|
||||
try {
|
||||
await api.renameAnalysisSession(String(renameTarget.id), renameTitle.trim());
|
||||
setRenameTarget(null); await loadSessions(); message.success('会话已重命名');
|
||||
} catch (value) { if (!onUnauthorized(value)) message.error(apiMessage(value)); }
|
||||
finally { setRenaming(false); }
|
||||
};
|
||||
|
||||
const followTurn = async (id: string, question: string, sessionOverride?: string) => {
|
||||
if (!mounted.current) return;
|
||||
streamController.current?.abort();
|
||||
@@ -1165,6 +1189,7 @@ function AnalysisPage({ onUnauthorized, user }: { onUnauthorized: (error: unknow
|
||||
onEvent: event => {
|
||||
if (!current()) return;
|
||||
receivedEvents += 1;
|
||||
if (!acceptAnalysisEvent(event.id, eventCursors.current[id])) return;
|
||||
if (event.id) eventCursors.current[id] = event.id;
|
||||
const data = event.data && typeof event.data === 'object' ? event.data as Record<string, unknown> : {};
|
||||
const messageText = typeof data.message === 'string' ? data.message : event.event === 'answer' ? '正在整理分析结论…' : '正在分析…';
|
||||
@@ -1179,6 +1204,7 @@ function AnalysisPage({ onUnauthorized, user }: { onUnauthorized: (error: unknow
|
||||
}
|
||||
setLastTurn(previous => {
|
||||
const prior = previous || {};
|
||||
if (prior.id === id && ANALYSIS_FINAL_STATUSES.has(String(prior.status || '').toUpperCase()) && !ANALYSIS_FINAL_STATUSES.has(eventStatus)) return prior;
|
||||
const priorResult = isObjectRecord(prior.result) ? prior.result : {};
|
||||
const status = data.status || (['progress', 'message', 'heartbeat'].includes(event.event.toLowerCase()) ? prior.status || 'RUNNING' : event.event.toUpperCase());
|
||||
return {
|
||||
@@ -1192,6 +1218,7 @@ function AnalysisPage({ onUnauthorized, user }: { onUnauthorized: (error: unknow
|
||||
...(typeof data.startedAt === 'string' ? { startedAt: data.startedAt } : {}),
|
||||
...(typeof data.updatedAt === 'string' ? { updatedAt: data.updatedAt } : {}),
|
||||
progressMessage: messageText,
|
||||
...(Array.isArray(data.timeline) ? { timeline: data.timeline } : {}),
|
||||
plan: data.plan || prior.plan,
|
||||
...(eventResult ? { result: { ...priorResult, ...eventResult } } : {}),
|
||||
};
|
||||
@@ -1297,7 +1324,15 @@ function AnalysisPage({ onUnauthorized, user }: { onUnauthorized: (error: unknow
|
||||
if (!mounted.current || generation !== navigationGeneration.current) return;
|
||||
setStreamProgress('正在停止分析…');
|
||||
const detail = await api.analysisTurn(id);
|
||||
if (mounted.current && generation === navigationGeneration.current) setLastTurn(previous => ({ ...detail, id, question: previous?.question }));
|
||||
if (mounted.current && generation === navigationGeneration.current) {
|
||||
setLastTurn(previous => ({ ...detail, id, question: previous?.question }));
|
||||
if (ANALYSIS_FINAL_STATUSES.has(String(detail.status || '').toUpperCase())) {
|
||||
subscriptionGeneration.current += 1;
|
||||
streamController.current?.abort(); streamController.current = null;
|
||||
setBusy(false); setActiveTurnId(''); setStreamProgress('');
|
||||
await loadSessions();
|
||||
}
|
||||
}
|
||||
} catch (value) { if (!onUnauthorized(value)) setError(apiMessage(value)); }
|
||||
};
|
||||
|
||||
@@ -1344,6 +1379,7 @@ function AnalysisPage({ onUnauthorized, user }: { onUnauthorized: (error: unknow
|
||||
const submit = async (question = query) => {
|
||||
if (!question.trim()) return;
|
||||
if (busy || historyLoading) return;
|
||||
followOutput.current = true;
|
||||
const selection = beginAnalysisSelection(user.id);
|
||||
rememberAnalysisSession(user.id, '');
|
||||
const generation = navigationGeneration.current;
|
||||
@@ -1390,15 +1426,27 @@ function AnalysisPage({ onUnauthorized, user }: { onUnauthorized: (error: unknow
|
||||
<div className="analysis-workspace">
|
||||
<aside className="panel analysis-session-panel">
|
||||
<div className="analysis-session-heading"><strong>会话</strong><Button type="primary" size="small" onClick={newSession}>新会话</Button></div>
|
||||
{historyLoading ? <div className="loading-panel compact"><Spin />正在读取会话…</div> : sessions.length ? <div className="analysis-session-list">{sessions.map(item => <div key={String(item.id)} className={`analysis-session-row ${sessionId === item.id ? 'active' : ''}`}><button className="analysis-session-item" onClick={() => void openSession(String(item.id))}><strong>{toText(item.title || '未命名会话')}</strong><small>{String(item.updatedAt || item.createdAt || '').slice(0, 10)}{analysisIsRunning(item.activeTurnStatus) && <span className="analysis-session-state">{item.activeTurnStatus === 'QUEUED' ? '排队中' : '分析中'}</span>}</small></button><Popconfirm title="删除此会话及其分析记录?" description="删除后无法恢复" okText="删除" cancelText="取消" okButtonProps={{ danger: true }} onConfirm={() => void deleteSession(String(item.id))}><Button className="analysis-session-delete" type="text" danger icon={<DeleteOutlined />} aria-label={`删除会话 ${toText(item.title || '未命名会话')}`} disabled={analysisIsRunning(item.activeTurnStatus)} /></Popconfirm></div>)}</div> : <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} description="暂无历史会话" />}
|
||||
{historyLoading ? <div className="loading-panel compact"><Spin />正在读取会话…</div> : sessions.length ? <div className="analysis-session-list">{sessions.map(item => <div key={String(item.id)} className={`analysis-session-row ${sessionId === item.id ? 'active' : ''}`}><button className="analysis-session-item" onClick={() => void openSession(String(item.id))}><strong>{toText(item.title || '未命名会话')}</strong><small>{String(item.updatedAt || item.createdAt || '').slice(0, 10)}{analysisIsRunning(item.activeTurnStatus) && <span className="analysis-session-state">{item.activeTurnStatus === 'QUEUED' ? '排队中' : '分析中'}</span>}</small></button><Dropdown trigger={['click']} menu={{ items: [
|
||||
{ key: 'rename', icon: <EditOutlined />, label: '重命名' },
|
||||
{ key: 'delete', icon: <DeleteOutlined />, label: '删除', danger: true, disabled: analysisIsRunning(item.activeTurnStatus) },
|
||||
], onClick: ({ key }) => {
|
||||
if (key === 'rename') { setRenameTarget(item); setRenameTitle(String(item.title || '')); }
|
||||
else if (key === 'delete') modal.confirm({ title: '删除此会话及其分析记录?', content: '删除后无法恢复', okText: '删除', cancelText: '取消', okButtonProps: { danger: true }, onOk: () => deleteSession(String(item.id)) });
|
||||
} }}><Button className="analysis-session-menu" type="text" icon={<MoreOutlined />} aria-label={`会话操作 ${toText(item.title || '未命名会话')}`} /></Dropdown></div>)}</div> : <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} description="暂无历史会话" />}
|
||||
</aside>
|
||||
<section className="panel analysis-chat-panel">
|
||||
<div className="analysis-conversation" aria-live="polite">
|
||||
<div className="analysis-conversation" ref={conversation} aria-live="polite" onWheel={event => {
|
||||
if (event.deltaY < 0 && event.currentTarget.scrollTop > 0) followOutput.current = false;
|
||||
}} onScroll={event => {
|
||||
const element = event.currentTarget;
|
||||
followOutput.current = analysisScrollFollows(previousScrollTop.current, element.scrollTop,
|
||||
element.scrollHeight - element.clientHeight - element.scrollTop, followOutput.current);
|
||||
previousScrollTop.current = element.scrollTop;
|
||||
}}>
|
||||
{turns.map((turn, index) => <AnalysisTurn key={String(turn.id || index)} turn={turn} onRetry={(id) => void retryTurn(turns.find(item => String(item.id || '') === id) || turn)} onResume={id => { if (!historyLoading) void followTurn(id, String(turn.question || '')); }} onGenerateReport={() => void submit(generateReportPrompt(turn))} retryDisabled={busy || historyLoading} />)}
|
||||
{lastTurn && <AnalysisTurn turn={lastTurn} onRetry={() => void retryTurn(lastTurn)} onResume={id => { if (!historyLoading) void followTurn(id, String(lastTurn.question || '')); }} onGenerateReport={() => void submit(generateReportPrompt(lastTurn))} retryDisabled={busy || historyLoading} />}
|
||||
{busy && <div className="analysis-progress"><span>{streamProgress || '正在分析…'}</span><Button size="small" danger onClick={() => void cancelTurn()}>停止分析</Button></div>}
|
||||
{!turns.length && !lastTurn && !busy && <div className="analysis-empty"><RobotOutlined /><strong>想了解哪些质量情况?</strong><span>例如:9月汽车交通的合格率为什么下降?</span></div>}
|
||||
<div ref={conversationEnd} />
|
||||
</div>
|
||||
<div className="analysis-composer">
|
||||
<Input.TextArea id="analysis-query" disabled={historyLoading} value={query} onChange={event => setQuery(event.target.value)} autoSize={{ minRows: 2, maxRows: 5 }} maxLength={1600} aria-label="质量问题" placeholder="直接描述问题,或继续追问…" onPressEnter={event => { if (!event.shiftKey && !event.nativeEvent.isComposing) { event.preventDefault(); void submit(); } }} />
|
||||
@@ -1406,13 +1454,16 @@ function AnalysisPage({ onUnauthorized, user }: { onUnauthorized: (error: unknow
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
<Modal title="重命名会话" open={Boolean(renameTarget)} confirmLoading={renaming} okText="保存" cancelText="取消" okButtonProps={{ disabled: !renameTitle.trim() }} onCancel={() => { if (!renaming) setRenameTarget(null); }} onOk={() => void renameSession()}>
|
||||
<Input aria-label="会话名称" value={renameTitle} maxLength={160} disabled={renaming} onChange={event => setRenameTitle(event.target.value)} onPressEnter={() => void renameSession()} />
|
||||
</Modal>
|
||||
</div>;
|
||||
}
|
||||
|
||||
function AnalysisTurn({ turn, onResume, onRetry, onGenerateReport, retryDisabled = false }: { turn: Record<string, unknown>; onResume?: (turnId: string) => void; onRetry?: (turnId: string) => void; onGenerateReport?: () => void; retryDisabled?: boolean }) {
|
||||
const question = typeof turn.question === 'string' ? turn.question : '';
|
||||
const result = isObjectRecord(turn.result) ? turn.result : turn;
|
||||
const answer = typeof result.answer === 'string' ? result.answer : typeof turn.answer === 'string' ? turn.answer : '';
|
||||
const answer = partialAnswerIsOnlyProgress(turn) ? '' : typeof result.answer === 'string' ? result.answer : typeof turn.answer === 'string' ? turn.answer : '';
|
||||
const status = String(turn.status || result.status || '').toUpperCase();
|
||||
const engine = String(result.engine || turn.engine || '').toUpperCase();
|
||||
const reportMarkdown = typeof result.reportMarkdown === 'string' ? result.reportMarkdown : typeof turn.reportMarkdown === 'string' ? turn.reportMarkdown : '';
|
||||
@@ -1421,18 +1472,19 @@ function AnalysisTurn({ turn, onResume, onRetry, onGenerateReport, retryDisabled
|
||||
const errorValue = result.error || turn.error;
|
||||
const failure = typeof errorValue === 'string' ? errorValue : '分析暂时中断,可以重试或继续提问。';
|
||||
const emptyStatus = status === 'CANCELLED' ? '本次分析已取消,未返回回答内容。'
|
||||
: status === 'PARTIAL' ? '本次分析部分完成,但未返回可显示的回答内容。'
|
||||
: status === 'PARTIAL' ? '本轮已保存查询过程,尚未形成最终答复。'
|
||||
: status === 'COMPLETED' ? '分析任务已完成,但未返回回答内容。'
|
||||
: failure;
|
||||
return <article className="analysis-turn">
|
||||
{question && <div className="analysis-question"><p>{question}</p></div>}
|
||||
<AnalysisTurnMetadata turn={turn} status={status} />
|
||||
<AnalysisProcess turn={turn} />
|
||||
{(answer || !resumable || !retryDisabled) && <div className="analysis-answer">
|
||||
{(!resumable || !Array.isArray(turn.timeline || (isObjectRecord(turn.plan) ? turn.plan.timeline : undefined))) && (answer || !resumable || !retryDisabled) && <div className="analysis-answer">
|
||||
{answer ? <AiMarkdown content={answer} className="ai-answer" /> : <p className={resumable ? 'analysis-chat-notice' : undefined}>{resumable ? '分析任务仍在运行,尚未返回完整回答。' : emptyStatus}</p>}
|
||||
{status === 'PARTIAL' && <p className="analysis-chat-notice">部分分析尚未完成,可以重试或继续追问。</p>}
|
||||
{status === 'PARTIAL' && answer && <p className="analysis-chat-notice">{partialAnalysisNotice(result.stopReason || turn.stopReason || (isObjectRecord(turn.plan) ? turn.plan.stopReason : ''))}</p>}
|
||||
<div className="analysis-message-actions">
|
||||
{reportMarkdown.trim() && <NativeAnalysisReport turn={turn} reportMarkdown={reportMarkdown} reportHtml={reportHtml} />}
|
||||
{!reportMarkdown.trim() && engine === 'NAO' && status === 'COMPLETED' && answer && onGenerateReport && <Button type="text" size="small" icon={<DownloadOutlined />} disabled={retryDisabled} onClick={onGenerateReport}>生成报告</Button>}
|
||||
{!reportMarkdown.trim() && engine === 'NAO' && ['COMPLETED', 'PARTIAL'].includes(status) && answer && onGenerateReport && <Button type="text" size="small" icon={<DownloadOutlined />} disabled={retryDisabled} onClick={onGenerateReport}>生成报告</Button>}
|
||||
{!reportMarkdown.trim() && engine !== 'NAO' && answer && ['COMPLETED', 'PARTIAL'].includes(status) && <AnalysisReportExport turn={turn} />}
|
||||
{['FAILED', 'CANCELLED', 'PARTIAL'].includes(status) && typeof turn.id === 'string' && onRetry && <Button size="small" type="text" disabled={retryDisabled} onClick={() => onRetry(String(turn.id))}>重新分析</Button>}
|
||||
{resumable && !retryDisabled && typeof turn.id === 'string' && onResume && <Button size="small" type="text" onClick={() => onResume(String(turn.id))}>继续分析</Button>}
|
||||
@@ -1441,6 +1493,29 @@ function AnalysisTurn({ turn, onResume, onRetry, onGenerateReport, retryDisabled
|
||||
</article>;
|
||||
}
|
||||
|
||||
function AnalysisTurnMetadata({ turn, status }: { turn: Record<string, unknown>; status: string }) {
|
||||
const [now, setNow] = useState(Date.now());
|
||||
const running = analysisIsRunning(status);
|
||||
useEffect(() => { if (!running) return; setNow(Date.now()); const timer = window.setInterval(() => setNow(Date.now()), 1000); return () => window.clearInterval(timer); }, [running]);
|
||||
const plan = isObjectRecord(turn.plan) ? turn.plan : {};
|
||||
const date = (value: unknown) => typeof value === 'string' && Number.isFinite(Date.parse(value)) ? Date.parse(value) : undefined;
|
||||
const start = date(turn.startedAt) ?? date(plan.startedAt);
|
||||
const finish = date(turn.finishedAt);
|
||||
const duration = typeof turn.durationMs === 'number' ? turn.durationMs : start !== undefined && (running || finish !== undefined) ? Math.max(0, (running ? now : finish!) - start) : undefined;
|
||||
const seconds = duration === undefined ? undefined : Math.floor(duration / 1000);
|
||||
const durationText = seconds === undefined ? '' : seconds >= 3600 ? `${Math.floor(seconds / 3600)}小时${Math.floor(seconds % 3600 / 60)}分${seconds % 60}秒` : seconds >= 60 ? `${Math.floor(seconds / 60)}分${seconds % 60}秒` : `${seconds}秒`;
|
||||
const stamp = (value: number) => new Intl.DateTimeFormat('zh-CN', { timeZone: 'Asia/Shanghai', month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false }).format(value);
|
||||
const steps = Array.isArray(turn.steps) ? turn.steps : Array.isArray(plan.steps) ? plan.steps : [];
|
||||
const labels: Record<string, string> = { QUEUED: '排队中', RUNNING: '运行中', COMPLETED: '已完成', PARTIAL: '部分完成', FAILED: '未完成', CANCELLED: '已停止', NEEDS_CLARIFICATION: '待补充信息' };
|
||||
return <div className="analysis-turn-metadata" aria-label="分析运行信息">
|
||||
<span>{labels[status] || (running ? '运行中' : '分析记录')}</span>
|
||||
{durationText && <span>{running ? '已运行' : '运行时长'} {durationText}</span>}
|
||||
{start !== undefined && <span>开始 {stamp(start)}</span>}
|
||||
{!running && finish !== undefined && <span>{status === 'COMPLETED' ? '完成时间' : '结束时间'} {stamp(finish)}</span>}
|
||||
{steps.length > 0 && <span>工具调用 {steps.length} 次</span>}
|
||||
</div>;
|
||||
}
|
||||
|
||||
function isObjectRecord(value: unknown): value is Record<string, unknown> {
|
||||
return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user