diff --git a/frontend/src/dev/fixtures/evidence_ask.tsx b/frontend/src/dev/fixtures/evidence_ask.tsx new file mode 100644 index 00000000..08523d05 --- /dev/null +++ b/frontend/src/dev/fixtures/evidence_ask.tsx @@ -0,0 +1,27 @@ +import type { JSX } from 'react' +import { EvidenceDoc } from '../../run/EvidenceDoc' +import type { EvidenceDocData } from '../../types' +import judge from '../../run/__tests__/evidence-judge.json' + +/** + * 报告正文句末「质询」图标(审批质询)平时的样子,scripts/check-evidence.mjs 按它量平时状态的对比度: + * - ?syn=evidence-ask:同一份没开裁判的周报(run/__tests__/evidence-judge.json 的 plain,后端 compose_doc 真跑出来的, + * 内容虚构)摆两份,都给了质询入口:一份在页面底色上(同审批卡里展开的报告),一份在面板底色上(同运行详情的证据页) + * + * 证据图、片段接口由检查脚本伪造;不点「质询」,提问框不挂 + */ +const DOC = judge.plain.doc as unknown as EvidenceDocData +const ACCESS = { approvalId: 'ap-evidence-ask', host: 'evidence-ask' } + +export const cases: Record JSX.Element> = { + 'evidence-ask': () => ( +
+
+ +
+
+ +
+
+ ), +} diff --git a/frontend/src/pages/runs/EvidencePane.tsx b/frontend/src/pages/runs/EvidencePane.tsx index ac3dffee..812d814b 100644 --- a/frontend/src/pages/runs/EvidencePane.tsx +++ b/frontend/src/pages/runs/EvidencePane.tsx @@ -49,9 +49,17 @@ export function EvidencePane({ run, output, labelOf, refreshKey }: { const reloadGraph = useEvidence((s) => s.reloadGraph) const first = useRef(true) useEffect(() => { - if (first.current) { first.current = false; void loadGraph(run.id); return } + if (first.current) { + first.current = false + // 报告正文(成果区、审批卡里展开的那份)有运行就先取过证据图,取的时候运行可能还停在审批上、刚收尾还没封存: + // 运行已经结束、手里那份却说没封存时重取一次,不然这一页顶上一直写着尚未封存(之后没有新事件,refreshKey 不再变) + const held = useEvidence.getState().graphs[run.id] + if (held?.status === 'ok' && SETTLED.has(run.status) && !held.data?.seal?.sealed) void reloadGraph(run.id) + else void loadGraph(run.id) + return + } void reloadGraph(run.id) - }, [run.id, refreshKey, loadGraph, reloadGraph]) + }, [run.id, run.status, refreshKey, loadGraph, reloadGraph]) const audit = useAudit(run.id, refreshKey) const graph = graphSlot?.data diff --git a/frontend/src/run/EvidenceDoc.tsx b/frontend/src/run/EvidenceDoc.tsx index e086f702..7f8bd26f 100644 --- a/frontend/src/run/EvidenceDoc.tsx +++ b/frontend/src/run/EvidenceDoc.tsx @@ -4,7 +4,9 @@ import { type KeyboardEvent as ReactKeyboardEvent, type MouseEvent as ReactMouseEvent, type RefObject, } from 'react' import { createPortal } from 'react-dom' -import { ListChecks, MessageCircleQuestion } from 'lucide-react' +import { + ListChecks, MessageCircleQuestion, ShieldAlert, ShieldCheck, ShieldMinus, ShieldQuestion, ShieldX, type LucideIcon, +} from 'lucide-react' import clsx from 'clsx' import { rovingTarget } from '../components/ui' import { @@ -13,9 +15,12 @@ import { type EvidenceStateCode, type EvidenceTally as Tally, } from '../lib/evidence' import { formatNumber } from '../lib/format' -import { EVIDENCE_STATE_LABEL, EVIDENCE_TEXT, INQUIRY_TEXT, JUDGE_TEXT, claimTally, evidenceTally, type ClaimTallyCounts } from '../lib/terms' +import { + CHALLENGE_TEXT, EVIDENCE_STATE_LABEL, EVIDENCE_TEXT, INQUIRY_TEXT, JUDGE_TEXT, claimTally, evidenceTally, + type ClaimTallyCounts, +} from '../lib/terms' import { useEvidence, useVerdicts } from '../store/evidence' -import type { EvidenceBlock, EvidenceDocData, EvidenceSegment, EvidenceUnit, EvidenceVerdict } from '../types' +import type { ChallengeVerdict, EvidenceBlock, EvidenceDocData, EvidenceSegment, EvidenceUnit, EvidenceVerdict } from '../types' import { EvidencePanel, type PanelMode, type PanelView } from './EvidencePanel' import { askAbout, type InquiryAccess } from './Inquiry' import { BlockView, Markdown, StyledSlice, inlineStyles, numericColumns, type InlineStyles } from './Markdown' @@ -30,6 +35,8 @@ import { BlockView, Markdown, StyledSlice, inlineStyles, numericColumns, type In * * 结论句的判定(四期)只在句末挂一枚小徽标(◆ ◇ ! ○ ?),整句不画线;证据相矛盾(和旧的证据不支持)的整句 * 铺一层浅底。徽标也是按钮:点开是这一句的「模型的解释」。判定是模型给的,颜色一律不用确定性的绿。 + * 被反方审过的句子(期 4,证据图的 reports[].challenge_verdicts)同样在句末挂标记:被推翻、被削弱带字、醒目,经受住、 + * 无法判断只有淡色图标;有判定的句子并在同一枚徽标里。点开都是整句面板,没有可点片段的句子也打得开。 * * 键盘:整份报告只占一个 Tab 位(roving tabindex)。←/→ 在有状态的片段、句末徽标间走,↑/↓ 按 * 句子走(表格里按列走到上一行 / 下一行,出了表格接着按句子走),n / N 跳到下一处 / @@ -69,7 +76,15 @@ const unitOfAsk = (key: string) => (key.startsWith('ask:') ? key.slice(4) : null const askable = (unit: EvidenceUnit, block: EvidenceBlock) => (unit.kind ? unit.kind === 'claim' : !!unitText(unit).trim()) && !['heading', 'code', 'hr', 'table'].includes(block.type) -interface Badge { unit: EvidenceUnit; block: number; verdict: EvidenceVerdict; state: EvidenceStateCode } +/** + * 句末徽标:结论句裁判的判定(verdict、state),和 / 或反方审稿的判断(challenge)。两样都有的并在一个徽标里,不挂两个; + * 只被反方审过的句子(没开裁判的报告、裁判没送的句子)只有 challenge + */ +interface Badge { + unit: EvidenceUnit; block: number + verdict?: EvidenceVerdict; state?: EvidenceStateCode + challenge?: string +} interface Model { /** 可点的片段和句末徽标,按正文顺序 */ @@ -98,7 +113,8 @@ interface Model { grid: Map } -function buildModel(blocks: EvidenceBlock[], overlay?: Record, ask = false): Model { +function buildModel(blocks: EvidenceBlock[], overlay?: Record, ask = false, + marks?: Record): Model { const order: string[] = [] const index = new Map() const seg = new Map() @@ -132,12 +148,15 @@ function buildModel(blocks: EvidenceBlock[], overlay?: Record | undefined { + const graph = useEvidence((s) => (runId ? s.graphs[runId]?.data : undefined)) + return useMemo(() => { + const hit = (graph?.reports ?? []).find((r) => (!report || !r?.node_id || r.node_id === report) + && (!artifact || r?.doc_artifact === artifact)) + const raw: unknown = hit?.challenge_verdicts + if (!raw || typeof raw !== 'object') return undefined + const marks = Object.fromEntries(Object.entries(raw as Record) + .filter((e): e is [string, string] => !!e[0] && typeof e[1] === 'string' && !!e[1])) + return Object.keys(marks).length ? marks : undefined + }, [graph, report, artifact]) +} + +/** 句末标记读屏念的那一句:截到 40 字(同 lib/evidence 的 claimLabel) */ +const markSentence = (unit: EvidenceUnit) => { + const text = unitText(unit).trim() + return text.length > 40 ? `${text.slice(0, 39)}…` : text +} + +/** 反方审稿判断的叫法:认不出的照写原值(同审批卡) */ +const challengeLabel = (v: string) => (Object.hasOwn(CHALLENGE_TEXT.verdict, v) + ? CHALLENGE_TEXT.verdict[v as keyof typeof CHALLENGE_TEXT.verdict] : CHALLENGE_TEXT.verdictUnknown(v)) + +/** + * 句末徽标的读屏名:有判定的照裁判的说法(claimLabel),被反方审过的接着说反方审稿的判断;只被反方审过的 + * 说「结论句「…」,反方审稿:被推翻」 + */ +function badgeLabel(badge: Badge): string { + const said = badge.challenge ? CHALLENGE_TEXT.markLabel(challengeLabel(badge.challenge)) : '' + if (!badge.verdict) return JUDGE_TEXT.badgeLabel(markSentence(badge.unit), said, false) + const judged = claimLabel(badge.unit, badge.verdict) + return said ? `${judged},${said}` : judged +} + /** 片段的外观:线型走 data 属性(CSS 里只管线型),颜色写成变量交给 index.css(引文前的引号用 --ev-glyph) */ function segStyle(state: EvidenceStateCode): CSSProperties { const meta = EVIDENCE_STATE[state] @@ -257,14 +316,16 @@ export const EvidenceDoc = forwardRef buildModel(blocks, overlay, ask), [blocks, overlay, ask]) + // 被反方审过的句子:句末挂标记(和裁判的判定并在一个徽标里),点开是整句面板 + const marks = useChallengeMarks(runId, report, artifact) + const model = useMemo(() => buildModel(blocks, overlay, ask, marks), [blocks, overlay, ask, marks]) const counts = useMemo(() => docTally(doc), [doc]) const claims = useMemo(() => claimCounts(doc, overlay), [doc, overlay]) - // 探索运行的报告(开了裁判的按需文档,或调用方说了是探索运行):证据图带着这次运行里之前按需判过的句子 - // (reports[].post_seal_verdicts),取一次,重新打开页面时徽标还在。别的报告不多发这个请求 + // 有运行就取一次这次运行的证据图(同一次运行只取一次,不逐句请求):它带着被反方审过的句子(reports[].challenge_verdicts, + // 正式、探索运行都可能有,反方审稿在报告写完之后才审,文档里没有这份记录),探索运行的报告还带着之前按需判过的句子 + // (reports[].post_seal_verdicts),重新打开页面时标记、徽标都还在 const loadGraph = useEvidence((s) => s.loadGraph) - const lateOnes = doc.judge?.mode === 'on_demand' || (runClass === 'exploratory' && doc.judge?.mode !== 'inline') - useEffect(() => { if (lateOnes && runId) void loadGraph(runId) }, [lateOnes, runId, loadGraph]) + useEffect(() => { if (runId) void loadGraph(runId) }, [runId, loadGraph]) const rootRef = useRef(null) const instance = useId() const panelId = `${instance}-panel` @@ -341,7 +402,7 @@ export const EvidenceDoc = forwardRef = { + refuted: { icon: ShieldX, color: 'var(--st-failed)', soft: 'var(--st-failed-soft)', loud: true }, + weakened: { icon: ShieldMinus, color: 'var(--st-waiting)', soft: 'var(--st-waiting-soft)', loud: true }, + stands: { icon: ShieldCheck, color: 'var(--text-faint)', soft: 'var(--st-idle-soft)', loud: false }, + inconclusive: { icon: ShieldQuestion, color: 'var(--text-faint)', soft: 'var(--st-idle-soft)', loud: false }, +} +const markLook = (verdict: string): MarkLook => (Object.hasOwn(MARK_LOOK, verdict) ? MARK_LOOK[verdict as ChallengeVerdict] + : { icon: ShieldAlert, color: 'var(--text-faint)', soft: 'var(--st-idle-soft)', loud: false }) + +/** + * 句末徽标里反方审稿的那一截。和裁判的字形并在一个徽标里时跟在字形后面(after)。醒目的那两种连字一起写:字号定成 + * 10px(同句末的「无证据」小标签),窄栏里 0.72em 的上标只有 8px,汉字认不清 + */ +function ChallengeMark({ verdict, look, after }: { verdict: string; look: MarkLook; after: boolean }) { + const Icon = look.icon + return ( + + ) +} + /** * 一句话:文字按行内 Markdown 渲染(整句算一次样式,跨片段的 `code`、**粗体** 不会 * 被切坏),有状态的片段包成按钮。含无证据片段的句子末尾挂「? 无证据」;有判定的结论句末尾挂 - * 一枚徽标(也是按钮),证据相矛盾(和旧的证据不支持)的整句铺浅底——字本身不画线 + * 一枚徽标(也是按钮),证据相矛盾(和旧的证据不支持)的整句铺浅底——字本身不画线。被反方审过的 + * 句子同样挂徽标(和判定并在一起),点开都是整句面板 */ function UnitView({ unit, doc, current, active, panelId, code, tag, badge, ask }: { unit: EvidenceUnit; doc: EvidenceDocData; current: string | null; active: string | null; panelId: string @@ -911,8 +1004,18 @@ function UnitView({ unit, doc, current, active, panelId, code, tag, badge, ask } ) }) const key = badge ? badgeKey(unit.id) : '' - const meta = badge ? EVIDENCE_STATE[badge.state] : null + const meta = badge?.state ? EVIDENCE_STATE[badge.state] : null const open = !!badge && active === key + const verdict = badge?.verdict + // 模型判过的写明谁判的、非确定(证据不足的接着写缺什么);模型没判过的(按需还没点、到上限、没跑成)只说 + // 这是什么状态——到上限没判的也记着裁判模型,但不能写成「(模型 · 非确定)」,像是它判过一样 + const judgedTitle = !verdict || !meta ? '' + : isJudged(verdict) + ? `${meta.label}${verdict.post_seal ? ` · ${JUDGE_TEXT.postSeal}` : ''}(${verdict.judge || JUDGE_TEXT.judgeModel} · 非确定)${ + verdictMissing(verdict) ? `。${JUDGE_TEXT.missing(verdictMissing(verdict))}` : ''}` + : limitOf(verdict) ? `${meta.label}:${JUDGE_TEXT.limitNotJudged}` : `${meta.label}:${meta.hint}` + const challengeTitle = badge?.challenge ? CHALLENGE_TEXT.markTitle(challengeLabel(badge.challenge)) : '' + const look = badge?.challenge ? markLook(badge.challenge) : null const body = ( <> {conflicting(badge?.state) @@ -924,32 +1027,33 @@ function UnitView({ unit, doc, current, active, panelId, code, tag, badge, ask } {EVIDENCE_STATE[state].glyph}{TAG_TEXT[state]} ))} - {badge && meta && ( + {badge && (meta || look) && ( )} ) if (!ask) return body // 「质询」跟在句末,是一个固定宽度的小图标:平时淡淡的,悬停这一句、焦点落在这一句上时显出来(强调色、描边)。 + // 平时也得看得清它是个可点的东西(WCAG 1.4.11 要求界面组件对背景 ≥ 3:1):最淡的字色再压到 60% 不透明,深色约 2.75、 + // 浅色约 2.33,看不出来。改用次一级的暗字色压到 70%:深浅两套、报告摆在页面底色或面板底色上都在 3.3 以上,仍比正文 + // 淡得多;不透明度留在 0.75 以下,和悬停、聚焦时显出来(不透明、强调色)分得开。 // 显没显出来只换颜色,宽度一直是那么宽——悬停时撑开的话,后面的字整体右移,鼠标底下的数字跟着挪走,点不到。 // 触屏没有悬停,一直显出来,并写上「质询」两个字。 // 跟随的那种只在焦点在这一句上时进 Tab 顺序,整份报告不因此多出一串 Tab 位 @@ -961,7 +1065,7 @@ function UnitView({ unit, doc, current, active, panelId, code, tag, badge, ask }