同步:完善质量分析工作台并更新主题字体
同步已上线的智能分析执行协议、来源查询、图表报告与管理页面配套代码。 补齐数据库迁移、运行依赖和回归测试,保留原有指标计算口径。 统一午夜黑及其他主题的控件细节、中文和业务数字字体。 排除本地业务数据、凭据、预览、发布与验收产物。 验证:生产构建通过,320项前端回归通过;本轮仅同步Git,不再次部署。
This commit is contained in:
+77
-19
@@ -13,6 +13,7 @@ import {
|
||||
visualCategoryLabel,
|
||||
visualPeriodSummary,
|
||||
visualScopeSummary,
|
||||
visualUnitLabel,
|
||||
} from './analysisVisualsModel';
|
||||
import type { AnalysisVisual } from './analysisVisualsModel';
|
||||
import { analysisVisualCumulativeShares, analysisVisualShares, analysisVisualTypeLabel } from './analysisVisualPresentation';
|
||||
@@ -23,6 +24,8 @@ export interface AnalysisVisualsProps {
|
||||
visualState?: unknown;
|
||||
beforeExport?: () => Promise<void>;
|
||||
embedded?: boolean;
|
||||
hideEvidence?: boolean;
|
||||
combineStages?: boolean;
|
||||
}
|
||||
|
||||
interface VisualTableRow {
|
||||
@@ -83,9 +86,9 @@ function ChartDataTable({ visual, compact = false }: { visual: AnalysisVisual; c
|
||||
: <span className="analysis-visual-table-value">{formatVisualValue(value, visual.unit)}</span>;
|
||||
},
|
||||
})),
|
||||
...(shares ? [{ title: '占已列类别合计', key: 'compositionShare', align: 'center' as const, width: 160,
|
||||
...(shares ? [{ title: visual.coverage.shareBasis === 'all_scope_weight' ? '占全部重量' : '占已列类别合计', key: 'compositionShare', align: 'center' as const, width: 160,
|
||||
render: (_value: unknown, row: VisualTableRow) => `${(shares[row.index - 1] * 100).toFixed(2)}%` }] : []),
|
||||
...(cumulativeShares ? [{ title: '累计占已列类别合计', key: 'cumulativeShare', align: 'center' as const, width: 170,
|
||||
...(cumulativeShares ? [{ title: visual.coverage.shareBasis === 'all_scope_weight' ? '累计占全部重量' : '累计占已列类别合计', key: 'cumulativeShare', align: 'center' as const, width: 170,
|
||||
render: (_value: unknown, row: VisualTableRow) => `${(cumulativeShares[row.index - 1] * 100).toFixed(2)}%` }] : []),
|
||||
];
|
||||
return <div className={compact ? 'analysis-visual-table is-compact' : 'analysis-visual-table'}>
|
||||
@@ -110,7 +113,12 @@ function chartSummary(visual: AnalysisVisual): string {
|
||||
return `${visual.title}。${visual.subtitle}。期间:${visualPeriodSummary(visual)}。${visual.categories.length} 个对象,${visual.series.map(item => item.label).join('、')}。${visualScopeSummary(visual.scope)}`;
|
||||
}
|
||||
|
||||
function AnalysisVisualCard({ visual, beforeExport }: { visual: AnalysisVisual; beforeExport?: () => Promise<void> }) {
|
||||
export function AnalysisVisualCard({ visual, beforeExport, loadRuntime = loadAnalysisVisualECharts, hideEvidence = false }: {
|
||||
visual: AnalysisVisual;
|
||||
beforeExport?: () => Promise<void>;
|
||||
loadRuntime?: typeof loadAnalysisVisualECharts;
|
||||
hideEvidence?: boolean;
|
||||
}) {
|
||||
const cardRef = useRef<HTMLElement>(null);
|
||||
const chartNodeRef = useRef<HTMLDivElement>(null);
|
||||
const chartRef = useRef<Awaited<ReturnType<typeof loadAnalysisVisualECharts>> extends never ? never : import('echarts/core').ECharts | null>(null);
|
||||
@@ -123,6 +131,44 @@ function AnalysisVisualCard({ visual, beforeExport }: { visual: AnalysisVisual;
|
||||
const [exporting, setExporting] = useState(false);
|
||||
const [exportError, setExportError] = useState('');
|
||||
const [themeRevision, setThemeRevision] = useState(0);
|
||||
const [renderAttempt, setRenderAttempt] = useState(0);
|
||||
const [retrying, setRetrying] = useState(false);
|
||||
const [accessBlocked, setAccessBlocked] = useState(false);
|
||||
const retryGeneration = useRef(0);
|
||||
const retryPending = useRef(false);
|
||||
const visualIdentity = JSON.stringify(visual);
|
||||
const currentIdentity = useRef(visualIdentity);
|
||||
currentIdentity.current = visualIdentity;
|
||||
|
||||
useEffect(() => {
|
||||
setAccessBlocked(false); setRetrying(false); retryPending.current = false;
|
||||
setExportError(''); setChartError(''); setDataOpen(false);
|
||||
exportControllerRef.current?.abort(); exportControllerRef.current = null; setExporting(false);
|
||||
retryGeneration.current += 1;
|
||||
return () => { retryGeneration.current += 1; retryPending.current = false; };
|
||||
}, [visualIdentity]);
|
||||
|
||||
const retryChart = useCallback(async () => {
|
||||
if (retryPending.current) return;
|
||||
const generation = ++retryGeneration.current;
|
||||
const identity = visualIdentity;
|
||||
const current = () => generation === retryGeneration.current && identity === currentIdentity.current;
|
||||
retryPending.current = true; setRetrying(true);
|
||||
try {
|
||||
if (!beforeExport) throw new Error('请重新打开这条分析后再重试图表。');
|
||||
await beforeExport();
|
||||
if (!current()) return;
|
||||
setAccessBlocked(false); setExportError(''); setChartReady(false);
|
||||
setRenderAttempt(value => value + 1);
|
||||
} catch (error) {
|
||||
if (current()) {
|
||||
setAccessBlocked(true); setChartReady(false); setDataOpen(false);
|
||||
setExportError(error instanceof Error ? error.message : '无法验证此图表的访问权限,请重新打开分析。');
|
||||
}
|
||||
} finally {
|
||||
if (current()) { retryPending.current = false; setRetrying(false); }
|
||||
}
|
||||
}, [beforeExport, visualIdentity]);
|
||||
|
||||
useEffect(() => {
|
||||
const node = cardRef.current;
|
||||
@@ -137,16 +183,17 @@ function AnalysisVisualCard({ visual, beforeExport }: { visual: AnalysisVisual;
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
if (!nearViewport || !visual.chartable) return;
|
||||
if (!nearViewport || !visual.chartable || accessBlocked) return;
|
||||
let cancelled = false;
|
||||
let resizeObserver: ResizeObserver | null = null;
|
||||
let instance: Awaited<ReturnType<typeof loadAnalysisVisualECharts>>['init'] extends (...args: never[]) => infer T ? T : never;
|
||||
let instance: (Awaited<ReturnType<typeof loadAnalysisVisualECharts>>['init'] extends (...args: never[]) => infer T ? T : never) | undefined;
|
||||
const mount = async () => {
|
||||
const node = chartNodeRef.current;
|
||||
if (!node || documentIsHidden() || cancelled) return;
|
||||
setChartLoading(true);
|
||||
setChartReady(false);
|
||||
try {
|
||||
const echarts = await loadAnalysisVisualECharts();
|
||||
const echarts = await loadRuntime();
|
||||
if (cancelled || !chartNodeRef.current || documentIsHidden()) return;
|
||||
instance = echarts.init(chartNodeRef.current, undefined, { renderer: 'svg' });
|
||||
chartRef.current = instance;
|
||||
@@ -157,14 +204,16 @@ function AnalysisVisualCard({ visual, beforeExport }: { visual: AnalysisVisual;
|
||||
const chartNode = chartNodeRef.current;
|
||||
if (cancelled || documentIsHidden() || !chartNode) return;
|
||||
const bounds = chartNode.getBoundingClientRect();
|
||||
if (bounds.width > 0 && bounds.height > 0) instance.resize();
|
||||
if (bounds.width > 0 && bounds.height > 0) instance?.resize();
|
||||
};
|
||||
resizeObserver = new ResizeObserver(resize);
|
||||
resizeObserver.observe(chartNodeRef.current);
|
||||
setChartError('');
|
||||
setChartReady(true);
|
||||
} catch {
|
||||
if (!cancelled) setChartError('图表渲染暂不可用,可以继续查看完整数据表。');
|
||||
instance?.dispose();
|
||||
if (chartRef.current === instance) chartRef.current = null;
|
||||
if (!cancelled) { setChartReady(false); setChartError('图表渲染暂不可用,可以继续查看完整数据表。'); }
|
||||
} finally {
|
||||
if (!cancelled) setChartLoading(false);
|
||||
}
|
||||
@@ -184,7 +233,7 @@ function AnalysisVisualCard({ visual, beforeExport }: { visual: AnalysisVisual;
|
||||
instance?.dispose();
|
||||
if (chartRef.current === instance) chartRef.current = null;
|
||||
};
|
||||
}, [nearViewport, visual.chartable, visual.id]);
|
||||
}, [nearViewport, visual.chartable, visual.id, visualIdentity, renderAttempt, accessBlocked, loadRuntime]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!nearViewport || !visual.chartable) return;
|
||||
@@ -241,6 +290,11 @@ function AnalysisVisualCard({ visual, beforeExport }: { visual: AnalysisVisual;
|
||||
? `本图展示 ${visual.coverage.returnedRows} / 共 ${visual.coverage.totalRows} 项`
|
||||
: `共 ${visual.coverage.totalRows} 项`;
|
||||
|
||||
if (accessBlocked) return <article className="analysis-visual-card" ref={cardRef}>
|
||||
<p role="alert">{exportError || '无法验证此图表的访问权限,已隐藏原数据。'}</p>
|
||||
<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}>
|
||||
<header className="analysis-visual-heading">
|
||||
<div className="analysis-visual-heading-copy">
|
||||
@@ -268,13 +322,14 @@ function AnalysisVisualCard({ visual, beforeExport }: { visual: AnalysisVisual;
|
||||
{visual.chartable ? <>
|
||||
<div
|
||||
className="analysis-visual-chart-wrap"
|
||||
role="button"
|
||||
tabIndex={0}
|
||||
role={chartError ? 'group' : 'button'}
|
||||
tabIndex={chartError ? -1 : 0}
|
||||
aria-label={`${chartSummary(visual)}。按 Enter 或空格查看数据。`}
|
||||
aria-busy={chartLoading}
|
||||
style={visual.sectionKey === 'defect_combined' ? { height: Math.max(320, visual.categories.length * 38 + 48) } : undefined}
|
||||
onClick={openData}
|
||||
onClick={chartError ? undefined : openData}
|
||||
onKeyDown={event => {
|
||||
if (chartError) return;
|
||||
if (event.key === 'Enter' || event.key === ' ') { event.preventDefault(); openData(); }
|
||||
}}
|
||||
>
|
||||
@@ -283,7 +338,10 @@ function AnalysisVisualCard({ visual, beforeExport }: { visual: AnalysisVisual;
|
||||
: visual.type === 'pareto' ? { minWidth: Math.max(600, visual.categories.length * 90 + 180) } : undefined} />
|
||||
{!nearViewport && <div className="analysis-visual-placeholder">图表将在进入视口时加载</div>}
|
||||
{nearViewport && chartLoading && <div className="analysis-visual-placeholder" role="status">正在加载图表…</div>}
|
||||
{chartError && <div className="analysis-visual-chart-error" role="status">{chartError}</div>}
|
||||
{chartError && <div className="analysis-visual-chart-error" role="status">{chartError}
|
||||
<Button size="small" loading={retrying || chartLoading} onKeyDown={event => event.stopPropagation()}
|
||||
onClick={event => { event.stopPropagation(); void retryChart(); }}>重试图表</Button>
|
||||
</div>}
|
||||
{!chartLoading && !chartError && !chartReady && nearViewport && <div className="analysis-visual-placeholder">图表准备中…</div>}
|
||||
</div>
|
||||
{visual.type === 'heatmap' && <p className="analysis-visual-scroll-hint">可横向滑动查看各期,或查看完整数据。</p>}
|
||||
@@ -306,21 +364,21 @@ function AnalysisVisualCard({ visual, beforeExport }: { visual: AnalysisVisual;
|
||||
>
|
||||
<div className="analysis-visual-modal-context">
|
||||
<span>{visual.subtitle}</span><span>期间:{period}</span>{scope && <span>范围:{scope}</span>}
|
||||
<span>单位:{visual.unit === 'ratio' ? '合格率' : visual.unit === 'kg' ? 'kg' : visual.unit === 'pp' ? '百分点' : '数量'}</span>
|
||||
<span>单位:{visualUnitLabel(visual)}</span>
|
||||
</div>
|
||||
<ChartDataTable visual={visual} />
|
||||
{visual.note && <p className="analysis-visual-modal-note">{visual.note}</p>}
|
||||
{visual.evidenceRefs.length > 0 && <div className="analysis-visual-evidence"><strong>证据引用</strong><ul>{visual.evidenceRefs.map(ref => <li key={ref}>{ref}</li>)}</ul></div>}
|
||||
{!hideEvidence && visual.evidenceRefs.length > 0 && <div className="analysis-visual-evidence"><strong>证据引用</strong><ul>{visual.evidenceRefs.map(ref => <li key={ref}>{ref}</li>)}</ul></div>}
|
||||
</Modal>
|
||||
</article>;
|
||||
}
|
||||
|
||||
/** 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 }: AnalysisVisualsProps) {
|
||||
export function AnalysisVisuals({ visuals, visualState, beforeExport, embedded = false, hideEvidence = false, combineStages = true }: AnalysisVisualsProps) {
|
||||
const parsed = useMemo(() => {
|
||||
const result = parseAnalysisVisuals(visuals);
|
||||
return { ...result, visuals: combineStageDefectVisuals(result.visuals) };
|
||||
}, [visuals]);
|
||||
return { ...result, visuals: combineStages ? combineStageDefectVisuals(result.visuals) : result.visuals };
|
||||
}, [visuals, combineStages]);
|
||||
if (!parsed.visuals.length) {
|
||||
const state = visualStateName(visualState);
|
||||
if (state === 'building') return <div className="analysis-visual-state" role="status">图表整理中</div>;
|
||||
@@ -328,7 +386,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} />)}
|
||||
{parsed.visuals.map(visual => <AnalysisVisualCard key={visual.id} visual={visual} beforeExport={beforeExport} hideEvidence={hideEvidence} />)}
|
||||
</section>;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user