修复:DSH 自主查询、图片直显与报告稳定性
允许 Agent 在循环中查目录、修正查询和提问,保留实时权限检查及模型原始回答。 统一相同查询证据与图表资源;排名补齐阶段指标,修正 OR 重量筛选,并限制模型明细输入。 增加运行恢复、图表自适应坐标轴与两位小数,修复报告主图选择、重复图及边缘标签。 验证:独立副本通过 162 项 Python、73 项前端及 21 项后端测试,前端构建通过。 线上已用原 8 题复测,并追加两轮双期对比;TOP100 与组合筛选分别核对 100 行和 20 行。
This commit is contained in:
+27
-4
@@ -3,11 +3,27 @@ import { tableTextAlignment } from './tableTextAlignment';
|
||||
import { sanitizeAnalysisDisplayText } from './analysisDisplayText';
|
||||
import { analysisEvidenceParts } from './analysisEvidenceRefs';
|
||||
|
||||
function inlineMarkdown(value: string, keyPrefix = 'inline', evidenceLabels?: Record<string, string>, evidencePrefix = ''): ReactNode[] {
|
||||
function inlineMarkdown(value: string, keyPrefix = 'inline', evidenceLabels?: Record<string, string>, evidencePrefix = '', imageTargets?: Record<string, string>, renderImage?: (alt: string, source: string, key: string) => ReactNode): ReactNode[] {
|
||||
const references = (part: string, key: string): ReactNode => !evidenceLabels ? part : analysisEvidenceParts(part).map(({ text, ref }, index) => {
|
||||
return ref && Object.hasOwn(evidenceLabels, ref) ? <a className="analysis-evidence-ref" key={`${key}-${index}`} href={`#${evidencePrefix}${ref}`} title={ref}>{evidenceLabels[ref]}</a> : text;
|
||||
});
|
||||
return value.split(/(\*\*.+?\*\*|`[^`]+`)/g).map((part, index) => {
|
||||
return value.split(/(`[^`]+`|!\[[^\]\n]*\]\([^\n]*?\)|\*\*.+?\*\*)/g).map((part, index) => {
|
||||
const image = part.match(/^!\[([^\]\n]*)\]\(([^\n]*)\)$/);
|
||||
if (image) {
|
||||
const rendered = renderImage?.(image[1], image[2].trim(), `${keyPrefix}-${index}`);
|
||||
if (rendered != null) return rendered;
|
||||
const target = imageTargets?.[image[2].trim()];
|
||||
if (target) return <a key={`${keyPrefix}-${index}`} href={`#${encodeURIComponent(target)}`} onClick={event => {
|
||||
event.preventDefault();
|
||||
const article = event.currentTarget.closest('.agent-turn');
|
||||
const chart = Array.from(article?.querySelectorAll<HTMLElement>('[data-analysis-visual-id]') || []).find(node => node.dataset.analysisVisualId === target);
|
||||
const transcript = article?.closest('.agent-transcript');
|
||||
if (chart && transcript) transcript.scrollTop += chart.getBoundingClientRect().top - transcript.getBoundingClientRect().top - 12;
|
||||
}}>{image[1] || '图表'}</a>;
|
||||
// 图片语法是展示指令,不是业务正文。资源由平台图表组件提供,
|
||||
// 未绑定资源只显示原始标题;不加载模型编造的 URL,也不改写原文。
|
||||
return <span className="ai-markdown-image-caption" role="img" aria-label={image[1] || '图表'} key={`${keyPrefix}-${index}`}>{image[1] || '图表'}</span>;
|
||||
}
|
||||
if (part.startsWith('**') && part.endsWith('**') && part.length >= 4) {
|
||||
return <strong key={`${keyPrefix}-${index}`}>{references(part.slice(2, -2), `${keyPrefix}-${index}`)}</strong>;
|
||||
}
|
||||
@@ -37,6 +53,7 @@ function isBlockStart(lines: string[], index: number): boolean {
|
||||
const line = lines[index];
|
||||
return /^\s*#{1,6}\s+/.test(line)
|
||||
|| /^\s*```/.test(line)
|
||||
|| /^\s*!\[[^\]\n]*\]\([^\n]*?\)\s*$/.test(line)
|
||||
|| isRule(line) || /^\s{0,3}>/.test(line)
|
||||
|| /^\s*(?:[-*+]\s+|\d+[.)]\s+)/.test(line)
|
||||
|| isTableStart(lines, index);
|
||||
@@ -62,8 +79,8 @@ function readingSentences(value: string, boundaries = '。!?;'): string[]
|
||||
}
|
||||
|
||||
/** Renders the small Markdown subset used by analysis answers with React text nodes only. */
|
||||
export function AiMarkdown({ content, className, evidenceLabels, evidencePrefix, layout, preserveSource = false }: { content: string; className?: string; evidenceLabels?: Record<string, string>; evidencePrefix?: string; layout?: 'conclusions' | 'sections'; preserveSource?: boolean }) {
|
||||
const inline = (value: string, key: string) => inlineMarkdown(value, key, evidenceLabels, evidencePrefix);
|
||||
export function AiMarkdown({ content, className, evidenceLabels, evidencePrefix, imageTargets, renderImage, layout, preserveSource = false }: { content: string; className?: string; evidenceLabels?: Record<string, string>; evidencePrefix?: string; imageTargets?: Record<string, string>; renderImage?: (alt: string, source: string, key: string) => ReactNode; layout?: 'conclusions' | 'sections'; preserveSource?: boolean }) {
|
||||
const inline = (value: string, key: string) => inlineMarkdown(value, key, evidenceLabels, evidencePrefix, imageTargets, renderImage);
|
||||
const lines = (preserveSource ? content : sanitizeAnalysisDisplayText(content)).replaceAll('\r\n', '\n').replaceAll('\r', '\n').split('\n');
|
||||
const blocks: ReactNode[] = [];
|
||||
let index = 0;
|
||||
@@ -132,6 +149,12 @@ export function AiMarkdown({ content, className, evidenceLabels, evidencePrefix,
|
||||
continue;
|
||||
}
|
||||
|
||||
if (/^\s*!\[[^\]\n]*\]\([^\n]*?\)\s*$/.test(line)) {
|
||||
blocks.push(<div className="ai-markdown-image-block" key={`image-${blocks.length}`}>{inline(line.trim(), `image-${blocks.length}`)}</div>);
|
||||
index += 1;
|
||||
continue;
|
||||
}
|
||||
|
||||
const heading = line.match(/^\s*(#{1,6})\s+(.+?)\s*#*\s*$/);
|
||||
if (heading) {
|
||||
const level = heading[1].length;
|
||||
|
||||
@@ -9,6 +9,7 @@ import {
|
||||
loadAnalysisVisualECharts,
|
||||
parseAnalysisVisuals,
|
||||
combineStageDefectVisuals,
|
||||
distinctAnalysisVisuals,
|
||||
renderVisualPng,
|
||||
visualCategoryLabel,
|
||||
visualPeriodSummary,
|
||||
@@ -28,6 +29,7 @@ export interface AnalysisVisualsProps {
|
||||
hideEvidence?: boolean;
|
||||
combineStages?: boolean;
|
||||
quiet?: boolean;
|
||||
excludeIds?: string[];
|
||||
}
|
||||
|
||||
interface VisualTableRow {
|
||||
@@ -301,7 +303,7 @@ export function AnalysisVisualCard({ visual, beforeExport, loadRuntime = loadAna
|
||||
<Button size="small" loading={retrying} onClick={() => void retryChart()}>重试图表</Button>
|
||||
</article>;
|
||||
|
||||
return <article className={`analysis-visual-card analysis-visual-type-${visual.type}`} ref={cardRef} aria-label={visual.title}>
|
||||
return <article className={`analysis-visual-card analysis-visual-type-${visual.type}`} data-analysis-visual-id={visual.id} ref={cardRef} aria-label={visual.title}>
|
||||
<header className="analysis-visual-heading">
|
||||
<div className="analysis-visual-heading-copy">
|
||||
<h3>{visual.title}</h3>
|
||||
@@ -380,7 +382,7 @@ export function AnalysisVisualCard({ visual, beforeExport, loadRuntime = loadAna
|
||||
}
|
||||
|
||||
/** A bad or old visual payload is confined to this module; it never interrupts the answer text. */
|
||||
export function AnalysisVisuals({ visuals, visualState, beforeExport, embedded = false, hideEvidence = false, combineStages = true, quiet = false }: AnalysisVisualsProps) {
|
||||
export function AnalysisVisuals({ visuals, visualState, beforeExport, embedded = false, hideEvidence = false, combineStages = true, quiet = false, excludeIds = [] }: AnalysisVisualsProps) {
|
||||
const parsed = useMemo(() => {
|
||||
const result = parseAnalysisVisuals(visuals);
|
||||
return { ...result, visuals: combineStages ? combineStageDefectVisuals(result.visuals) : result.visuals };
|
||||
@@ -393,7 +395,7 @@ export function AnalysisVisuals({ visuals, visualState, beforeExport, embedded =
|
||||
return null;
|
||||
}
|
||||
return <section className={`analysis-visuals${embedded ? ' is-embedded' : ''}`} aria-label="分析图表">
|
||||
{parsed.visuals.map(visual => <AnalysisVisualCard key={visual.id} visual={visual} beforeExport={beforeExport} hideEvidence={hideEvidence} quiet={quiet} />)}
|
||||
{distinctAnalysisVisuals(parsed.visuals).filter(visual => !excludeIds.includes(visual.id)).map(visual => <AnalysisVisualCard key={visual.id} visual={visual} beforeExport={beforeExport} hideEvidence={hideEvidence} quiet={quiet} />)}
|
||||
</section>;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { memo, useEffect, useMemo, useState } from 'react';
|
||||
import { memo, useCallback, useEffect, useMemo, useState } from 'react';
|
||||
import { Button } from 'antd';
|
||||
import { ApartmentOutlined, CheckOutlined, ClockCircleOutlined, CloseOutlined, FileTextOutlined, LoadingOutlined, RightOutlined } from '@ant-design/icons';
|
||||
import { AnalysisClarification } from '../AnalysisClarification';
|
||||
@@ -6,6 +6,9 @@ import { AnalysisMemberListPanel } from '../AnalysisMemberList';
|
||||
import { AnalysisVisuals } from '../AnalysisVisuals';
|
||||
import { AnalysisRecordListPanel } from '../AnalysisRecordList';
|
||||
import { AiMarkdown } from '../AiMarkdown';
|
||||
import { analysisChartReferences } from '../analysisChartReferences';
|
||||
import { parseAnalysisVisuals } from '../analysisVisualsModel';
|
||||
import { AgentInlineImage } from './AgentInlineImage';
|
||||
import { AnalysisThinkingBlock } from '../ModelThinkingPanel';
|
||||
import { analysisIsRunning, compactAnalysisTimeline } from '../analysisConversationState';
|
||||
import { orderedAnalysisProcess, type ModelThinking } from '../analysisModelThinking';
|
||||
@@ -130,6 +133,16 @@ export const AgentConversationTurn = memo(function AgentConversationTurn({ turn:
|
||||
const draft = running ? string(turn.dshDraft) : '';
|
||||
const events = useMemo(() => executionEvents(turn), [turn]);
|
||||
const artifact = !running ? authoredReport(turn) : null;
|
||||
const imageTargets = useMemo(() => analysisChartReferences(result.visuals, id), [result.visuals, id]);
|
||||
const inlineVisuals = useMemo(() => parseAnalysisVisuals(result.visuals).visuals, [result.visuals]);
|
||||
const [inlineReady, setInlineReady] = useState<string[]>([]);
|
||||
const onInlineReady = useCallback((visualId: string, ready: boolean) => setInlineReady(previous => ready
|
||||
? previous.includes(visualId) ? previous : [...previous, visualId]
|
||||
: previous.includes(visualId) ? previous.filter(value => value !== visualId) : previous), []);
|
||||
const renderImage = (alt: string, source: string, key: string) => {
|
||||
const visual = inlineVisuals.find(value => value.id === imageTargets[source]);
|
||||
return visual ? <AgentInlineImage key={key} turn={turn} visual={visual} alt={alt} onReady={onInlineReady} /> : undefined;
|
||||
};
|
||||
const [open, setOpen] = useState(running);
|
||||
useEffect(() => { setOpen(running); }, [running, id]);
|
||||
const notice = !answer && !running ? sanitizeAnalysisDisplayText(string(result.message ?? turn.message)
|
||||
@@ -149,10 +162,10 @@ export const AgentConversationTurn = memo(function AgentConversationTurn({ turn:
|
||||
{running && draft && <div className="agent-draft" aria-label="生成中的草稿"><small>草稿 · 正在生成</small><AiMarkdown content={draft} preserveSource /></div>}
|
||||
{!running && status === 'NEEDS_CLARIFICATION' && latest && <AnalysisClarification turn={turn} disabled={!canAct} onContinue={onPrompt} />}
|
||||
{!running && status !== 'NEEDS_CLARIFICATION' && (artifact
|
||||
? <AiMarkdown content={answer} className="agent-model-answer" preserveSource />
|
||||
: answer ? <><AiMarkdown content={answer} className="agent-model-answer" preserveSource />
|
||||
? <AiMarkdown content={answer} className="agent-model-answer" renderImage={renderImage} preserveSource />
|
||||
: answer ? <><AiMarkdown content={answer} className="agent-model-answer" renderImage={renderImage} preserveSource />
|
||||
{result.visualSchemaVersion === 1 && <AnalysisVisuals visuals={result.visuals} visualState={result.visualState}
|
||||
beforeExport={() => authorizeAnalysisSnapshot(turn)} embedded quiet />}</>
|
||||
beforeExport={() => authorizeAnalysisSnapshot(turn)} excludeIds={inlineReady} embedded quiet />}</>
|
||||
: notice ? <p className="agent-turn-notice" role="status">{notice}</p> : null)}
|
||||
{artifact && <button type="button" className="agent-report-open" onClick={() => onReport(id)}><FileTextOutlined />{artifact.title}.html<RightOutlined /></button>}
|
||||
{canRetry && <div className="agent-turn-actions">
|
||||
|
||||
@@ -12,7 +12,7 @@ import { analysisSnapshotResult, reportSnapshotIdentity } from '../analysisSnaps
|
||||
import { analysisScopeText } from '../analysisScope';
|
||||
import documentCss from './agent-document.css?inline';
|
||||
import './agent-document.css';
|
||||
import { buildAgentReportLayout, agentReportPrimary, agentReportSupplementary } from './agentReportLayout';
|
||||
import { buildAgentReportLayout, partitionAgentReportVisuals } from './agentReportLayout';
|
||||
|
||||
type Row = Record<string, unknown>;
|
||||
|
||||
@@ -59,12 +59,9 @@ export function AgentDeliverable({ turn, onClose }: { turn: Row; onClose: () =>
|
||||
const chartSections = layout.sections.map(section => ({ ...section,
|
||||
figures: section.charts.figures.filter(visual => reportVisualImageSource(imageFor(visual.id))),
|
||||
})).filter(section => section.figures.length);
|
||||
const primary = agentReportPrimary(chartSections.flatMap(section => section.figures), String(turn.question || ''));
|
||||
const { primary, secondary, supplemental } = partitionAgentReportVisuals(chartSections.flatMap(section => section.figures), String(turn.question || ''));
|
||||
const primarySection = chartSections.find(section => section.figures.some(visual => visual.id === primary?.id));
|
||||
const wide = (visual: typeof visuals[number]) => ['bar', 'heatmap', 'pareto'].includes(visual.type);
|
||||
const available = chartSections.flatMap(section => section.figures);
|
||||
const secondary = available.filter(visual => visual.id !== primary?.id && !agentReportSupplementary(visual, available, String(turn.question || '')));
|
||||
const supplemental = available.filter(visual => agentReportSupplementary(visual, available, String(turn.question || '')));
|
||||
const chart = (visual: typeof visuals[number]) => <div key={visual.id} className={wide(visual) ? 'is-wide' : undefined}><ReportVisualFigure visual={visual} image={imageFor(visual.id)} hideEvidence quiet /></div>;
|
||||
const scope = analysisScopeText(turn);
|
||||
const focus = /前后(?:月份|月)|相邻(?:月份|月)/.test(String(turn.question || ''))
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { authorizeAnalysisSnapshot, reportSnapshotIdentity } from '../analysisSnapshot';
|
||||
import { renderVisualSvg, type AnalysisVisual } from '../analysisVisualsModel';
|
||||
|
||||
/** 仅用当前授权快照在本机生成 SVG;不请求模型提供的 URL。 */
|
||||
export function AgentInlineImage({ turn, visual, alt, onReady }: {
|
||||
turn: Record<string, unknown>; visual: AnalysisVisual; alt: string;
|
||||
onReady: (id: string, ready: boolean) => void;
|
||||
}) {
|
||||
const signature = `${reportSnapshotIdentity(turn)}:${visual.id}`;
|
||||
const [image, setImage] = useState({ signature: '', source: '' });
|
||||
const [failed, setFailed] = useState('');
|
||||
useEffect(() => {
|
||||
const controller = new AbortController();
|
||||
onReady(visual.id, false);
|
||||
void (async () => {
|
||||
try {
|
||||
await authorizeAnalysisSnapshot(turn);
|
||||
if (controller.signal.aborted) return;
|
||||
const source = await renderVisualSvg(visual, controller.signal, 'report');
|
||||
if (!controller.signal.aborted) setImage({ signature, source });
|
||||
} catch {
|
||||
if (!controller.signal.aborted) setFailed(signature);
|
||||
}
|
||||
})();
|
||||
return () => controller.abort();
|
||||
}, [signature, onReady]);
|
||||
const source = image.signature === signature && failed !== signature ? image.source : '';
|
||||
return <span className="agent-inline-image" data-inline-visual-id={visual.id} style={{ display: 'block', margin: '16px 0' }}>
|
||||
{source ? <img src={source} alt={alt || visual.title} style={{ display: 'block', width: '100%', height: 'auto' }}
|
||||
onLoad={() => onReady(visual.id, true)}
|
||||
onError={() => { setFailed(signature); onReady(visual.id, false); }} />
|
||||
: <span>{alt || visual.title}</span>}
|
||||
</span>;
|
||||
}
|
||||
@@ -185,6 +185,7 @@ export function agentReportChartWidth(visual: AnalysisVisual, visuals: AnalysisV
|
||||
|
||||
/** Complementary rates and volume traces remain available, without crowding the requested story. */
|
||||
export function agentReportSupplementary(visual: AnalysisVisual, visuals: AnalysisVisual[], question: string): boolean {
|
||||
if (visual.id === agentReportPrimary(visuals, question)?.id) return false;
|
||||
if (/具体缺陷|缺陷\s*(?:top|前)/i.test(question) && !/规格|产品/.test(question) && visual.dimension === 'product') return true;
|
||||
if (/(?:产业部|部门).*top/i.test(question) && !/业务分组/.test(question) && visual.dimension === 'group') return true;
|
||||
if (/报废/.test(question) && !/投入|生产|产量/.test(question) && /total_weight/.test(visual.metric)) return true;
|
||||
@@ -249,3 +250,14 @@ export function buildAgentReportLayout(markdown: string, visuals: AnalysisVisual
|
||||
const aggregate = aggregateMetrics(clean);
|
||||
return { lead, sections, metrics: aggregate.length ? aggregate : comparisonMetrics(visuals) };
|
||||
}
|
||||
|
||||
/** A figure belongs to exactly one report position. */
|
||||
export function partitionAgentReportVisuals(visuals: AnalysisVisual[], question = '') {
|
||||
const unique = [...new Map(visuals.map(visual => [visual.id, visual])).values()];
|
||||
const primary = agentReportPrimary(unique, question);
|
||||
const rest = unique.filter(visual => visual.id !== primary?.id);
|
||||
return { primary,
|
||||
secondary: rest.filter(visual => !agentReportSupplementary(visual, unique, question)),
|
||||
supplemental: rest.filter(visual => agentReportSupplementary(visual, unique, question)),
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
import { parseAnalysisVisuals, distinctAnalysisVisuals } from './analysisVisualsModel.ts';
|
||||
|
||||
/** 只绑定本轮已授权快照中的图表;历史别名仅在唯一趋势图时兼容。 */
|
||||
export function analysisChartReferences(value: unknown, turnId: string): Record<string, string> {
|
||||
const visuals = parseAnalysisVisuals(value).visuals.filter(visual => visual.chartable && visual.originTurnId === turnId);
|
||||
const distinct = distinctAnalysisVisuals(visuals);
|
||||
const targets = Object.fromEntries(visuals.map(visual => [`chart:${visual.id}`,
|
||||
distinct.find(candidate => distinctAnalysisVisuals([candidate, visual]).length === 1)!.id]));
|
||||
const trends = distinct.filter(visual => visual.sectionKey === 'trend' && ['line', 'area'].includes(visual.type));
|
||||
if (trends.length === 1) targets[`chart:quality-trend-${turnId}`] = trends[0].id;
|
||||
return targets;
|
||||
}
|
||||
@@ -2,7 +2,8 @@ import * as echarts from 'echarts/core';
|
||||
import { BarChart, LineChart, PieChart, HeatmapChart } from 'echarts/charts';
|
||||
import { GridComponent, LegendComponent, TooltipComponent, AriaComponent, TitleComponent, GraphicComponent, VisualMapComponent } from 'echarts/components';
|
||||
import { SVGRenderer } from 'echarts/renderers';
|
||||
import { LabelLayout } from 'echarts/features';
|
||||
|
||||
// A single lazy module keeps unused chart families out of the analysis download.
|
||||
echarts.use([BarChart, LineChart, PieChart, HeatmapChart, GridComponent, LegendComponent, TooltipComponent, AriaComponent, TitleComponent, GraphicComponent, VisualMapComponent, SVGRenderer]);
|
||||
echarts.use([BarChart, LineChart, PieChart, HeatmapChart, GridComponent, LegendComponent, TooltipComponent, AriaComponent, TitleComponent, GraphicComponent, VisualMapComponent, SVGRenderer, LabelLayout]);
|
||||
export { echarts };
|
||||
|
||||
@@ -113,6 +113,27 @@ function ratioAxisMax(visual: AnalysisVisual): number | undefined {
|
||||
return Math.ceil((highestPercent + Math.max(10, highestPercent * 0.08)) / 10) * 10;
|
||||
}
|
||||
|
||||
/** 趋势图按所有有效序列统一取范围;柱状/占比图继续保留零基线。 */
|
||||
function trendAxisRange(visual: AnalysisVisual) {
|
||||
if (!['line', 'area'].includes(visual.type)) return {};
|
||||
const values = visual.series.flatMap(series => series.values.flatMap(value => value === null || !Number.isFinite(value) ? [] : [visual.unit === 'ratio' ? value * 100 : value]));
|
||||
if (!values.length) return {};
|
||||
const low = Math.min(...values), high = Math.max(...values);
|
||||
const minimumStep = visual.unit === 'count' ? 1 : 0.01;
|
||||
const span = Math.max(high - low, Math.abs(high) * (high === low ? 0.01 : 0), minimumStep * 4);
|
||||
const rawStep = span / 4;
|
||||
const magnitude = 10 ** Math.floor(Math.log10(rawStep));
|
||||
const interval = Math.max(minimumStep, ([1, 2, 5, 10].find(factor => factor * magnitude >= rawStep) || 10) * magnitude);
|
||||
const round = (value: number) => Number(value.toFixed(8));
|
||||
const min = round(Math.floor((low - interval / 3) / interval) * interval);
|
||||
const max = round(Math.ceil((high + interval / 3) / interval) * interval);
|
||||
return {
|
||||
min: visual.unit === 'ratio' && low >= 0 ? Math.max(0, min) : min,
|
||||
max: visual.unit === 'ratio' && high <= 100 ? Math.min(100, max) : max,
|
||||
interval: round(interval), scale: false,
|
||||
};
|
||||
}
|
||||
|
||||
function isRecord(value: unknown): value is Record<string, unknown> {
|
||||
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
||||
}
|
||||
@@ -570,7 +591,7 @@ export function combineStageDefectVisuals(visuals: AnalysisVisual[]): AnalysisVi
|
||||
export function formatVisualValue(value: number | null, unit: AnalysisVisualUnit): string {
|
||||
if (value === null) return '—';
|
||||
if (!Number.isFinite(value)) return '无效值';
|
||||
const numberText = new Intl.NumberFormat('en-US', { useGrouping: false, maximumSignificantDigits: 15 }).format(unit === 'ratio' ? value * 100 : value);
|
||||
const numberText = new Intl.NumberFormat('en-US', { useGrouping: false, minimumFractionDigits: 2, maximumFractionDigits: 2 }).format(unit === 'ratio' ? value * 100 : value);
|
||||
if (unit === 'ratio') return `${numberText}%`;
|
||||
const signedNumber = `${value > 0 && unit === 'pp' ? '+' : ''}${numberText}`;
|
||||
if (unit === 'kg') return `${signedNumber} kg`;
|
||||
@@ -578,6 +599,18 @@ export function formatVisualValue(value: number | null, unit: AnalysisVisualUnit
|
||||
return signedNumber;
|
||||
}
|
||||
|
||||
/** 相同查询的不同证据 ID 不应产生重复图形;不合并不同来源轮次或范围。 */
|
||||
export function distinctAnalysisVisuals(visuals: AnalysisVisual[]): AnalysisVisual[] {
|
||||
const seen = new Set<string>();
|
||||
return visuals.filter(visual => {
|
||||
const { id: _id, evidenceRefs: _refs, ...presentation } = visual;
|
||||
const key = JSON.stringify(presentation);
|
||||
if (seen.has(key)) return false;
|
||||
seen.add(key);
|
||||
return true;
|
||||
});
|
||||
}
|
||||
|
||||
function chartNumber(value: number): number {
|
||||
return Number(value.toPrecision(10));
|
||||
}
|
||||
@@ -586,9 +619,7 @@ function formatChartValue(value: number | null, unit: AnalysisVisualUnit, showPo
|
||||
if (value === null) return '—';
|
||||
if (!Number.isFinite(value)) return '无效值';
|
||||
const plotted = unit === 'ratio' ? value * 100 : value;
|
||||
const numberText = unit === 'kg' || unit === 'pp' || unit === 'ratio'
|
||||
? new Intl.NumberFormat('zh-CN', { useGrouping: false, maximumFractionDigits: 2 }).format(plotted)
|
||||
: new Intl.NumberFormat('zh-CN', { useGrouping: false, maximumSignificantDigits: 10 }).format(plotted);
|
||||
const numberText = new Intl.NumberFormat('zh-CN', { useGrouping: false, minimumFractionDigits: 2, maximumFractionDigits: 2 }).format(plotted);
|
||||
if (unit === 'ratio') return `${numberText}%`;
|
||||
const signed = unit === 'pp' && showPositiveSign && value > 0 ? `+${numberText}` : numberText;
|
||||
return unit === 'kg' ? `${signed} kg` : unit === 'pp' ? `${signed} pp` : signed;
|
||||
@@ -650,7 +681,7 @@ export function visualParetoPoints(visual: AnalysisVisual): AnalysisVisualPareto
|
||||
}
|
||||
|
||||
export function visualDonutShareText(share: number): string {
|
||||
return `${(share * 100).toLocaleString('zh-CN', { maximumFractionDigits: 2 })}%`;
|
||||
return `${(share * 100).toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}%`;
|
||||
}
|
||||
|
||||
function plainRichText(value: string): string {
|
||||
@@ -669,7 +700,7 @@ export function buildAnalysisVisualOption(visual: AnalysisVisual, theme: VisualC
|
||||
const categories = visual.categories.map((_item, index) => visualCategoryLabel(visual, index));
|
||||
const categoryAxisLabel = { color: ink, fontSize: 11, hideOverlap: true, overflow: 'truncate' as const, width: 160 };
|
||||
const numberAxisLabel = (value: number) => visual.unit === 'ratio'
|
||||
? `${chartNumber(value)}%`
|
||||
? `${value.toFixed(2)}%`
|
||||
: formatChartValue(value, visual.unit, false);
|
||||
const formatter = (raw: unknown): string => {
|
||||
const params = Array.isArray(raw) ? raw : [raw];
|
||||
@@ -871,7 +902,7 @@ export function buildAnalysisVisualOption(visual: AnalysisVisual, theme: VisualC
|
||||
xAxis: { type: 'category', data: categories, axisLabel: { color: ink, fontSize: 10, interval: 0, rotate: allScopeWeight ? 0 : categories.length > 3 ? 34 : 0, width: allScopeWeight ? 80 : 160, overflow: 'break', hideOverlap: false, lineHeight: 13, ...(allScopeWeight ? { formatter: (name: string) => wrapAxisLabel(name, 80, 10, 5).join('\n') } : {}) }, axisLine: { lineStyle: { color: line } }, axisTick: { show: false } },
|
||||
yAxis: [
|
||||
{ type: 'value', min: 0, name: '重量(kg)', nameTextStyle: { color: mutedInk, fontSize: 10 }, axisLabel: { color: mutedInk, formatter: (value: number) => formatChartValue(value, 'kg') }, axisLine: { show: false }, splitLine: { lineStyle: { color: line, type: 'dashed' } } },
|
||||
{ type: 'value', min: 0, max: 100, position: 'right', name: allScopeWeight ? cumulativeName : '累计占比', nameTextStyle: { color: mutedInk, fontSize: 10 }, axisLabel: { color: mutedInk, formatter: (value: number) => `${chartNumber(value)}%` }, axisLine: { show: false }, splitLine: { show: false } },
|
||||
{ type: 'value', min: 0, max: 100, position: 'right', name: allScopeWeight ? cumulativeName : '累计占比', nameTextStyle: { color: mutedInk, fontSize: 10 }, axisLabel: { color: mutedInk, formatter: (value: number) => `${value.toFixed(2)}%` }, axisLine: { show: false }, splitLine: { show: false } },
|
||||
],
|
||||
series: [
|
||||
{ name: plainRichText(visual.series[0].label), type: 'bar', yAxisIndex: 0, data: visual.series[0].values, barMaxWidth: 48, itemStyle: { color: colors[0] }, label: { show: true, position: 'top', color: ink, fontSize: 10, formatter: (params: { dataIndex: number }) => paretoWeightLabel(points[params.dataIndex]?.valueKg ?? null, allScopeWeight) }, ...(allScopeWeight ? { labelLayout: { hideOverlap: true } } : {}), emphasis: { disabled: true } },
|
||||
@@ -946,7 +977,7 @@ export function buildAnalysisVisualOption(visual: AnalysisVisual, theme: VisualC
|
||||
return {
|
||||
...shared,
|
||||
xAxis: { type: 'category', data: categories, boundaryGap: false, axisLabel: { ...categoryAxisLabel, rotate: categories.length > 10 ? 25 : 0, width: 120 }, axisLine: { lineStyle: { color: line } }, axisTick: { show: false } },
|
||||
yAxis: valueAxis,
|
||||
yAxis: { ...valueAxis, ...trendAxisRange(visual) },
|
||||
series,
|
||||
};
|
||||
}
|
||||
@@ -1022,12 +1053,11 @@ export function buildAnalysisVisualExportOption(visual: AnalysisVisual, width =
|
||||
const reportMode = context !== 'standalone';
|
||||
const editorial = context === 'agent-document';
|
||||
const rateTrend = editorial && visual.unit === 'ratio' && ['line', 'area'].includes(visual.type);
|
||||
const values = rateTrend ? visual.series.flatMap(series => series.values.flatMap(value => value == null ? [] : [value * 100])) : [];
|
||||
const low = values.length ? Math.min(...values) : 0;
|
||||
const high = values.length ? Math.max(...values) : 100;
|
||||
const step = [0.1, 0.25, 0.5, 1, 2, 5, 10, 20, 50, 100].find(candidate => candidate * 5 >= high - low) || 100;
|
||||
const trendMin = Math.max(0, Math.floor((low - step / 3) / step) * step);
|
||||
const trendMax = Math.ceil((high + step / 3) / step) * step;
|
||||
const autoTrend = ['line', 'area'].includes(visual.type);
|
||||
const trendRange = trendAxisRange(visual);
|
||||
const trendMin = trendRange.min;
|
||||
const trendMax = trendRange.max;
|
||||
const step = trendRange.interval;
|
||||
const titleLines = reportMode ? [] : wrapLines(visual.title, 34, 3);
|
||||
const headerParts = reportMode ? [] : [
|
||||
visual.subtitle,
|
||||
@@ -1089,7 +1119,7 @@ export function buildAnalysisVisualExportOption(visual: AnalysisVisual, width =
|
||||
const categories = wrappedCategories.map(lines => lines.join('\n'));
|
||||
const donutShares = visual.type === 'donut' ? visualDonutShares(visual) : [];
|
||||
const valueAxisLabel = (value: number) => visual.unit === 'ratio'
|
||||
? `${chartNumber(value)}%`
|
||||
? `${value.toFixed(2)}%`
|
||||
: formatChartValue(value, visual.unit, false);
|
||||
const allSeriesSelected = Object.fromEntries(visual.series.map(series => [plainRichText(series.label), true]));
|
||||
const legendOption = visual.type === 'donut'
|
||||
@@ -1212,7 +1242,7 @@ export function buildAnalysisVisualExportOption(visual: AnalysisVisual, width =
|
||||
},
|
||||
yAxis: [
|
||||
{ type: 'value', min: 0, name: '重量(kg)', nameTextStyle: { color: '#65748b', fontSize: 10 }, axisLabel: { color: '#65748b', formatter: (value: number) => formatChartValue(value, 'kg') }, axisLine: { show: false }, splitLine: { lineStyle: { color: '#dfe5ef', type: 'dashed' } } },
|
||||
{ type: 'value', min: 0, max: 100, position: 'right', name: allScopeWeight ? '累计占全部重量' : '累计占比(本图已列类别)', nameTextStyle: { color: '#65748b', fontSize: 10 }, axisLabel: { color: '#65748b', formatter: (value: number) => `${chartNumber(value)}%` }, axisLine: { show: false }, splitLine: { show: false } },
|
||||
{ type: 'value', min: 0, max: 100, position: 'right', name: allScopeWeight ? '累计占全部重量' : '累计占比(本图已列类别)', nameTextStyle: { color: '#65748b', fontSize: 10 }, axisLabel: { color: '#65748b', formatter: (value: number) => `${value.toFixed(2)}%` }, axisLine: { show: false }, splitLine: { show: false } },
|
||||
],
|
||||
series: [
|
||||
{ name: plainRichText(visual.series[0].label), type: 'bar', yAxisIndex: 0, data: visual.series[0].values, barMaxWidth: 48, itemStyle: { color: '#607ae1' }, label: { show: true, position: 'top', color: '#263c5a', fontSize: 10, formatter: (params: { dataIndex: number }) => paretoWeightLabel(visualParetoPoints(visual)[params.dataIndex]?.valueKg ?? null, allScopeWeight) }, ...(allScopeWeight ? { labelLayout: { hideOverlap: true } } : {}) },
|
||||
@@ -1240,9 +1270,9 @@ export function buildAnalysisVisualExportOption(visual: AnalysisVisual, width =
|
||||
? {
|
||||
xAxis: {
|
||||
type: 'value',
|
||||
min: rateTrend ? trendMin : visual.unit === 'ratio' ? 0 : undefined,
|
||||
max: rateTrend ? trendMax : ratioAxisMax(visual),
|
||||
interval: rateTrend ? step : undefined,
|
||||
min: autoTrend ? trendMin : visual.unit === 'ratio' ? 0 : undefined,
|
||||
max: autoTrend ? trendMax : ratioAxisMax(visual),
|
||||
interval: autoTrend ? step : undefined,
|
||||
scale: visual.unit !== 'ratio' ? false : undefined,
|
||||
splitNumber: 3,
|
||||
axisLabel: { color: '#65748b', formatter: valueAxisLabel, hideOverlap: true },
|
||||
@@ -1270,9 +1300,9 @@ export function buildAnalysisVisualExportOption(visual: AnalysisVisual, width =
|
||||
},
|
||||
yAxis: {
|
||||
type: 'value',
|
||||
min: rateTrend ? trendMin : visual.unit === 'ratio' ? 0 : undefined,
|
||||
max: rateTrend ? trendMax : ratioAxisMax(visual),
|
||||
interval: rateTrend ? step : undefined,
|
||||
min: autoTrend ? trendMin : visual.unit === 'ratio' ? 0 : undefined,
|
||||
max: autoTrend ? trendMax : ratioAxisMax(visual),
|
||||
interval: autoTrend ? step : undefined,
|
||||
scale: visual.unit !== 'ratio' ? false : undefined,
|
||||
axisLabel: { color: '#65748b', formatter: valueAxisLabel },
|
||||
axisLine: { show: false },
|
||||
@@ -1287,6 +1317,11 @@ export function buildAnalysisVisualExportOption(visual: AnalysisVisual, width =
|
||||
};
|
||||
if (rateTrend && visual.series.length === 1) {
|
||||
option.series = ((option.series || []) as any[]).map(series => ({ ...series,
|
||||
labelLayout: ({ dataIndex, rect }: { dataIndex: number; rect: { x: number; width: number } }) => ({
|
||||
hideOverlap: true,
|
||||
...(dataIndex === 0 ? { x: rect.x + rect.width + 3, align: 'left' }
|
||||
: dataIndex === visual.categories.length - 1 ? { x: rect.x - 3, align: 'right' } : {}),
|
||||
}),
|
||||
label: { show: true, position: 'top', color: '#344155', fontSize: 12,
|
||||
formatter: ({ dataIndex }: { dataIndex: number }) => {
|
||||
const value = visual.series[0].values[dataIndex];
|
||||
|
||||
Reference in New Issue
Block a user