证据面板的分析结论:结果表的格写列名,总数那一格的值按服务端的写法显示。①「这一处引用的是 结果表第 1 行『share』」原来写的是列 id,现在服务端在 cited 上另给 column_label(结果表记的 labels,如「占变化的比重」),目录条目也带上 labels,证据面板、读屏的出处、导出页、可验证报告都照列名写;② 输入里「总数那一格 … = 159175.18」和同一节的闭合核对「159,175.18」两个写法并排,现在服务端另给 value_rendered(render_cell,千分位、NULL 写「—」,和闭合核对同一个写法),三处界面照原样显示。结果表数的换算(比率、空格)不在这次改动里

This commit is contained in:
ThearchyHelios
2026-10-21 15:53:27 +00:00
parent b919890b7b
commit c54196326f
13 changed files with 171 additions and 44 deletions
+5 -2
View File
@@ -262,10 +262,13 @@ export function sourceOf(seg: EvidenceSegment, doc?: Pick<EvidenceDocData, 'cata
if (!cite) return ''
const entry = cite.alias ? doc?.catalog?.[cite.alias] : undefined
if (cite.kind === 'analysis' || entry?.kind === 'analysis') {
// 分析结论:判定语([[a:A1]])、具名的数([[a:A1.top_share]])、结果表的一格([[v:A1.r0.delta]],cite 的种类是 cell)
// 分析结论:判定语([[a:A1]])、具名的数([[a:A1.top_share]])、结果表的一格([[v:A1.r0.delta]],cite 的种类是 cell)。
// 结果表的格写结果表记的列名(目录条目上的 labels),不把列 id 当叫法
const E = ANALYSIS_TEXT.evidence
const loc = cite.locator ?? {}
const what = cite.kind === 'cell' ? E.citedCell(Number(loc.row) || 0, String(loc.column ?? ''))
const column = String(loc.column ?? '')
const labels = entry && typeof entry.labels === 'object' && entry.labels ? entry.labels as Record<string, string> : {}
const what = cite.kind === 'cell' ? E.citedCell(Number(loc.row) || 0, labels[column] || column)
: loc.key ? E.citedValue(loc.key) : E.citedPhrase
return [`${E.title} ${cite.alias ?? ''}`.trim(), what].join(' · ')
}
+5 -2
View File
@@ -97,7 +97,8 @@ function JudgedPart({ step, recompute, seal, overall }: {
const verdict = step.verdict && typeof step.verdict === 'object' ? step.verdict : null
const cited = step.cited ?? {}
const citedText = cited.what === 'value' ? E.citedValue(String(cited.key ?? ''))
: cited.what === 'cell' ? E.citedCell(Number(cited.row) || 0, String(cited.column ?? '')) : E.citedPhrase
// 结果表的格写列名(服务端照结果表记的 labels 给),不把列 id 当叫法;老接口没给列名的照旧写 id
: cited.what === 'cell' ? E.citedCell(Number(cited.row) || 0, String(cited.column_label || cited.column || '')) : E.citedPhrase
const refused = step.status === 'refused'
const trusted = !!overall?.sealed && overall.ok !== false
const problems = [
@@ -267,7 +268,9 @@ function InputPart({ step, onQuery, trusted }: { step: EvidenceAnalysisStep; onQ
rows ? [E.rowsUsed, rows] : null,
'value' in step && !parent ? [ratio ? E.headlineRatio : E.headline, (
<span key="v" className="tnum">
{step.column != null && typeof step.row === 'number' ? `${E.cellAt(step.row, step.column)} = ` : ''}{valueText(step.value)}
{step.column != null && typeof step.row === 'number' ? `${E.cellAt(step.row, step.column)} = ` : ''}
{/* 那一格的值服务端渲染好了(千分位、NULL 写「—」,和闭合核对同一个写法),照原样显示;老接口没给的按值本身写 */}
{step.value_rendered ?? valueText(step.value)}
</span>
)] : null,
closure && closed ? [E.closure, (
@@ -423,7 +423,16 @@
"op": "decompose",
"rows": 4,
"status": "ok",
"verdict": "driver"
"verdict": "driver",
"labels": {
"base": "基期",
"delta": "变化",
"flag": "说明",
"pct": "变化率",
"region": "地区",
"share": "占变化的比重",
"target": "本期"
}
},
"A2": {
"alias": "A2",
@@ -460,7 +469,14 @@
"op": "comparable",
"rows": 5,
"status": "ok",
"verdict": "comparable"
"verdict": "comparable",
"labels": {
"base": "基期",
"check": "检查项",
"note": "说明",
"status": "结果",
"target": "本期"
}
},
"Q1": {
"alias": "Q1",
@@ -898,7 +914,8 @@
"total": "2,700",
"headline": "2,700",
"closed": true
}
},
"value_rendered": "2,700"
},
{
"step": "analysis_input",
@@ -919,7 +936,8 @@
"total": "2,360",
"headline": "2,360",
"closed": true
}
},
"value_rendered": "2,360"
},
{
"step": "analysis_input",
@@ -1301,7 +1319,8 @@
"what": "cell",
"row": 0,
"column": "delta",
"raw": "-300"
"raw": "-300",
"column_label": "变化"
},
"rendered": "-300",
"render_ok": true,
@@ -1557,7 +1576,8 @@
"total": "2,700",
"headline": "2,700",
"closed": true
}
},
"value_rendered": "2,700"
},
{
"step": "analysis_input",
@@ -1578,7 +1598,8 @@
"total": "2,360",
"headline": "2,360",
"closed": true
}
},
"value_rendered": "2,360"
},
{
"step": "analysis_input",
@@ -2212,7 +2233,8 @@
"total": "2,700",
"headline": "2,700",
"closed": true
}
},
"value_rendered": "2,700"
},
{
"step": "analysis_input",
@@ -2233,7 +2255,8 @@
"total": "2,360",
"headline": "2,360",
"closed": true
}
},
"value_rendered": "2,360"
},
{
"step": "analysis_input",
@@ -3508,7 +3531,8 @@
"total": "2,700",
"headline": "2,700",
"closed": true
}
},
"value_rendered": "2,700"
},
{
"step": "analysis_input",
@@ -3529,7 +3553,8 @@
"total": "2,360",
"headline": "2,360",
"closed": true
}
},
"value_rendered": "2,360"
},
{
"step": "analysis_input",
@@ -5034,7 +5059,16 @@
"op": "decompose",
"rows": 4,
"status": "ok",
"verdict": "driver"
"verdict": "driver",
"labels": {
"base": "基期",
"delta": "变化",
"flag": "说明",
"pct": "变化率",
"region": "地区",
"share": "占变化的比重",
"target": "本期"
}
},
"Q1": {
"alias": "Q1",
@@ -5420,7 +5454,8 @@
"total": "2,700",
"headline": "2,700",
"closed": true
}
},
"value_rendered": "2,700"
},
{
"step": "analysis_input",
@@ -5441,7 +5476,8 @@
"total": "2,360",
"headline": "2,360",
"closed": true
}
},
"value_rendered": "2,360"
},
{
"step": "analysis_input",
@@ -6063,7 +6099,8 @@
"what": "cell",
"row": 0,
"column": "delta",
"raw": "-300"
"raw": "-300",
"column_label": "变化"
},
"rendered": "-300",
"render_ok": true,
@@ -6319,7 +6356,8 @@
"total": "2,700",
"headline": "2,700",
"closed": true
}
},
"value_rendered": "2,700"
},
{
"step": "analysis_input",
@@ -6340,7 +6378,8 @@
"total": "2,360",
"headline": "2,360",
"closed": true
}
},
"value_rendered": "2,360"
},
{
"step": "analysis_input",
@@ -6722,7 +6761,8 @@
"what": "cell",
"row": 0,
"column": "delta",
"raw": "-300"
"raw": "-300",
"column_label": "变化"
},
"rendered": "-300",
"render_ok": true,
@@ -6978,7 +7018,8 @@
"total": "2,700",
"headline": "2,700",
"closed": true
}
},
"value_rendered": "2,700"
},
{
"step": "analysis_input",
@@ -6999,7 +7040,8 @@
"total": "2,360",
"headline": "2,360",
"closed": true
}
},
"value_rendered": "2,360"
},
{
"step": "analysis_input",
@@ -8158,7 +8200,8 @@
"total": "2,700",
"headline": "2,700",
"closed": true
}
},
"value_rendered": "2,700"
},
{
"step": "analysis_input",
@@ -8179,7 +8222,8 @@
"total": "2,360",
"headline": "2,360",
"closed": true
}
},
"value_rendered": "2,360"
},
{
"step": "analysis_input",
+12 -2
View File
@@ -2435,8 +2435,16 @@ export interface EvidenceAnalysisStep {
artifact?: string | null
eid?: string
eid_ok?: boolean
/** 这一处引用的是结论的哪一项:判定语、具名的数(key)、结果表的一格(row、column) */
cited?: { what?: 'phrase' | 'value' | 'cell' | string; key?: string; row?: number; column?: string; raw?: unknown; conv?: string }
/** 这一处引用的是结论的哪一项:判定语、具名的数(key)、结果表的一格(row、column;column_label 是结果表的列名,给人看的) */
cited?: {
what?: 'phrase' | 'value' | 'cell' | string
key?: string
row?: number
column?: string
column_label?: string | null
raw?: unknown
conv?: string
}
rendered?: string
render_ok?: boolean
hash_ok?: boolean | null
@@ -2481,6 +2489,8 @@ export interface EvidenceAnalysisStep {
row?: number
column?: string
value?: string | null
/** 那一格的值按服务端的规则渲染出来的字(render_cell:千分位、NULL 写「—」),和闭合核对里的写法一致 */
value_rendered?: string
/** 输入落到报告目录的哪个 Q */
query?: string | null
sealed?: boolean