统一:DSH 智能分析、Top100 与图表静默恢复

接入 DSH 专用运行时和对话界面,保留模型原始回答,支持会话分页、连续追问与显式报告。
补齐组合筛选、各维度 Top100、分组查询到排名图的转换,图表故障静默省略并基于保存数据自动恢复。
优化报告风格、图表顺序和表格换行,更新接入说明及构建输入。

验证:独立目录前后端构建通过;118 项 Java、102 项前端、102 项图表、14 项 DSH 应用和 13 项组合筛选检查通过。
仅提交相关源码、锁定依赖与测试;不包含凭据、会话、业务数据或本地产物。
This commit is contained in:
2026-11-12 11:57:41 +08:00
parent cc8832c8e5
commit f1a2fbd494
166 changed files with 26281 additions and 2248 deletions
+24 -114
View File
@@ -6,6 +6,7 @@ import React from 'react';
import { renderToStaticMarkup } from 'react-dom/server';
import { analysisScopeText, analysisComposerState, restoredAnalysisDraft, analysisFollowRequestReady } from '../src/analysisScope.ts';
import { analysisIsRunning, analysisScrollFollows, compactAnalysisTimeline, duplicatesFinalAnalysisAnswer } from '../src/analysisConversationState.ts';
import { scrollTopFromVisualOffset, transcriptFollowState } from '../src/agent/transcriptScroll.ts';
import { sanitizeAnalysisDisplayText } from '../src/analysisDisplayText.ts';
import { modelThinkingEntries, thinkingStatus, orderedAnalysisProcess, groupAdjacentThinking } from '../src/analysisModelThinking.ts';
@@ -180,126 +181,35 @@ test('manual downward movement near the bottom resumes follow, while layout scro
assert.equal(analysisScrollFollows(0,true,'up'),false);
});
// Exercise the component's scrolling and update effect, including the browser's
// scroll-range clamp. Rectangles are zoomed, while scrollTop stays in layout units.
const pageSource=fs.readFileSync(new URL('../src/ManagementPages.tsx',import.meta.url),'utf8');
const scrollSource=pageSource.slice(pageSource.indexOf(' const scrollToLatest ='),pageSource.indexOf('\n useEffect(() => {\n if (!busy)'));
const updateStart=pageSource.indexOf(' useEffect(() => {\n if (analysisFollowRequestReady');
const updateSource=pageSource.slice(updateStart,pageSource.indexOf('\n\n const loadSessions',updateStart));
function scrollFixture({scale=.8,turnOffset=1200,maxScroll=2000,following=true}={}){
const body=`
let lastTurn=null,busy=true,active=true,turns=[],sessionId='session-a',hasNewContent=false;
const followOutput={current:following},explicitlyFollowing={current:false},followRequest={current:null},seenConclusion={current:null};
const previousScrollTop={current:0},readingPosition={current:0};
const ANALYSIS_FINAL_STATUSES=new Set(['COMPLETED','PARTIAL','FAILED','CANCELLED','NEEDS_CLARIFICATION']);
const setHasNewContent=value=>{hasNewContent=value;};
let position=0,updateEffect;
const latest={dataset:{},getBoundingClientRect:()=>({top:56.5+(turnOffset-position)*scale})};
const element={
offsetHeight:600,clientTop:0,scrollHeight:maxScroll+600,
get scrollTop(){return position;},set scrollTop(value){position=Math.max(0,Math.min(value,maxScroll));},
getBoundingClientRect:()=>({top:56.5,height:600*scale}),querySelector:()=>latest,
};
const conversation={current:element},useEffect=callback=>{updateEffect=callback;};
${scrollSource}
${updateSource}
return {
update(turn,running=true){lastTurn=turn;busy=running;latest.dataset={analysisStatus:turn.status,analysisTurnId:turn.id};updateEffect();},
scroll(top,intent='up'){
element.scrollTop=top;
const distance=maxScroll-position;
followOutput.current=analysisScrollFollows(distance,followOutput.current,intent);
if(intent==='up') explicitlyFollowing.current=false;
else if(intent==='down'&&followOutput.current) explicitlyFollowing.current=true;
if(followOutput.current) hasNewContent=false;
previousScrollTop.current=position;readingPosition.current=position;
},
programmaticScroll(top){
element.scrollTop=top;previousScrollTop.current=position;readingPosition.current=position;
followOutput.current=analysisScrollFollows(maxScroll-position,followOutput.current,null);
},
returnToLatest(){
followOutput.current=true;explicitlyFollowing.current=true;hasNewContent=false;
element.scrollTop=element.scrollHeight;previousScrollTop.current=position;readingPosition.current=position;
},
submit(key){followRequest.current=key;},
get:()=>({position,hasNewContent,following:followOutput.current,seen:seenConclusion.current}),
};
`;
return new Function('analysisFollowRequestReady','analysisScrollFollows','scale','turnOffset','maxScroll','following',
ts.transpileModule(body,{compilerOptions:{target:ts.ScriptTarget.ES2022}}).outputText
)(analysisFollowRequestReady,analysisScrollFollows,scale,turnOffset,maxScroll,following);
}
const viewport = (scrollTop, zoom = 1, scrollHeight = 2600) => ({
scrollTop, scrollHeight, clientHeight: 600, offsetHeight: 600,
getBoundingClientRect: () => ({ height: 600 * zoom }),
});
test('completion anchors the same layout position at workspace zoom levels',()=>{
for(const scale of [.8,1,1.25]){
const ui=scrollFixture({scale});
ui.update({id:'turn-a',status:'COMPLETED'});
assert.equal(ui.get().position,1200);
assert.equal(ui.get().seen,'turn-a');
test('focusing and prepending history convert visual positions to layout pixels at each zoom', () => {
for (const zoom of [.8, 1, 1.25]) {
assert.equal(scrollTopFromVisualOffset(viewport(500, zoom), 316 * zoom, 16), 800);
assert.equal(scrollTopFromVisualOffset(viewport(500, zoom), 240 * zoom), 740);
}
});
test('short conclusions safely clamp at the end of the conversation',()=>{
const ui=scrollFixture({maxScroll:1150});
ui.update({id:'turn-a',status:'COMPLETED'});
assert.equal(ui.get().position,1150);
assert.equal(ui.get().hasNewContent,false);
test('follow remains active through new output when the reader stayed at the bottom', () => {
assert.deepEqual(transcriptFollowState(viewport(2000, 1, 2600), true, null), { follows: true, showLatest: false });
assert.deepEqual(transcriptFollowState(viewport(2000, 1, 3200), true, null), { follows: true, showLatest: false });
});
test('terminal detail and history refreshes cannot resurrect the unread indicator',()=>{
const ui=scrollFixture();
ui.update({id:'turn-a',status:'RUNNING'});
ui.update({id:'turn-a',status:'COMPLETED'}); // Terminal SSE, busy remains true.
assert.equal(ui.get().following,false);
ui.update({id:'turn-a',status:'COMPLETED',answer:'saved answer'}); // Durable detail.
ui.update({id:'turn-a',status:'COMPLETED',answer:'saved answer'}); // History refresh.
ui.update({id:'turn-a',status:'COMPLETED',answer:'saved answer'},false);
assert.equal(ui.get().hasNewContent,false);
assert.equal(ui.get().position,1200);
test('scrolling up keeps the reader in history as live output arrives', () => {
assert.deepEqual(transcriptFollowState(viewport(1000), true, 'up'), { follows: false, showLatest: true });
assert.deepEqual(transcriptFollowState(viewport(1000, 1, 3200), false, null), { follows: false, showLatest: true });
});
test('completion still signals unread output when the reader stayed on an older turn',()=>{
const ui=scrollFixture({following:false});
ui.update({id:'turn-a',status:'RUNNING'});
ui.update({id:'turn-a',status:'COMPLETED'});
ui.update({id:'turn-a',status:'COMPLETED'},false);
assert.equal(ui.get().hasNewContent,true);
assert.equal(ui.get().position,0);
test('layout clamp cannot restore follow after the reader moved up', () => {
assert.deepEqual(transcriptFollowState(viewport(500, 1, 1100), false, null), { follows: false, showLatest: false });
});
test('scrolling up pauses, returning near the bottom resumes, and completed output stays followed after an explicit return',()=>{
const ui=scrollFixture();
ui.update({id:'turn-a',status:'RUNNING'});
ui.scroll(1500,'up');
ui.update({id:'turn-a',status:'RUNNING',answer:'streaming update'});
assert.equal(ui.get().position,1500);
assert.equal(ui.get().following,false);
ui.scroll(1990,'down');
assert.equal(ui.get().following,true);
assert.equal(ui.get().hasNewContent,false);
ui.update({id:'turn-a',status:'COMPLETED'});
assert.equal(ui.get().position,2000);
assert.equal(ui.get().following,true);
ui.returnToLatest();
ui.update({id:'turn-a',status:'COMPLETED',answer:'final durable answer'});
assert.equal(ui.get().following,true);
assert.equal(ui.get().position,2000);
});
test('layout-driven movement to the bottom does not rearm a reader who moved up',()=>{
const ui=scrollFixture({following:false});
ui.programmaticScroll(2000);
assert.equal(ui.get().position,2000);
assert.equal(ui.get().following,false);
});
test('a fresh request resets the seen conclusion and follows its own output',()=>{
const ui=scrollFixture();
ui.update({id:'old-turn',status:'COMPLETED'},false);
ui.submit('new-request');
ui.update({id:'new-turn',status:'RUNNING',_uiFollowKey:'new-request'});
assert.equal(ui.get().following,true);
assert.equal(ui.get().seen,null);
assert.equal(ui.get().position,2000);
ui.scroll(300);
ui.update({id:'new-turn',status:'COMPLETED'});
assert.equal(ui.get().hasNewContent,true);
assert.equal(ui.get().position,300);
test('returning downward near the end re-arms follow and clears the latest button', () => {
assert.deepEqual(transcriptFollowState(viewport(1960), false, 'down'), { follows: false, showLatest: true });
assert.deepEqual(transcriptFollowState(viewport(1980), false, 'down'), { follows: true, showLatest: false });
});
test('provider thinking is complete, escaped and separate from conclusions',()=>{