Align dynamic comparison tables

app.py

@@ -715,6 +715,42 @@ def render_value(value: Any, *, depth: int = 0) -> str:
     return f"<p>{esc(value)}</p>"
 
 
+def normalize_comparison(content: dict[str, Any]) -> tuple[str, list[str], list[tuple[str, list[Any]]]]:
+    columns = [str(column) for column in content.get("columns", [])]
+    raw_rows = content.get("rows", [])
+    row_keys = ("name", "dimension", "criterion", "metric", "title", "method")
+    row_label = "对比维度"
+
+    max_values = max(
+        (len(row.get("values", [])) for row in raw_rows if isinstance(row, dict) and isinstance(row.get("values"), list)),
+        default=0,
+    )
+    first_is_label = bool(columns) and (
+        any(word in columns[0].lower() for word in ("维度", "指标", "dimension", "criterion", "metric"))
+        or (max_values and len(columns) == max_values + 1)
+    )
+    if first_is_label:
+        row_label, columns = columns[0], columns[1:]
+
+    normalized_rows: list[tuple[str, list[Any]]] = []
+    for row in raw_rows:
+        if not isinstance(row, dict):
+            continue
+        label = next((str(row[key]) for key in row_keys if row.get(key) not in (None, "")), "")
+        values = row.get("values")
+        if isinstance(values, dict):
+            cells = [values.get(column, "") for column in columns]
+        elif isinstance(values, list):
+            cells = list(values)
+            if len(cells) == len(columns) + 1 and str(cells[0]) == label:
+                cells = cells[1:]
+        else:
+            cells = [row.get(column, "") for column in columns]
+        cells = (cells + [""] * len(columns))[:len(columns)]
+        normalized_rows.append((label, cells))
+    return row_label, columns, normalized_rows
+
+
 def render_section_content(section: dict[str, Any]) -> str:
     content, layout = section.get("content", {}), section.get("layout", "text")
     if layout == "timeline":
@@ -725,22 +761,13 @@ def render_section_content(section: dict[str, Any]) -> str:
             for n in content.get("nodes", [])
         ) + "</div>"
     if layout == "comparison":
-        columns, rows = content.get("columns", []), content.get("rows", [])
+        row_label, columns, rows = normalize_comparison(content)
         head = "".join(f"<th>{esc(x)}</th>" for x in columns)
-        def cells(row: dict[str, Any]) -> list[Any]:
-            values = row.get("values")
-            if isinstance(values, dict):
-                return [values.get(column, "") for column in columns]
-            if isinstance(values, list):
-                return values
-            reserved = {"name", "method", "title"}
-            return [row.get(column, "") for column in columns] or [v for k, v in row.items() if k not in reserved]
         body = "".join(
-            f'<tr><th>{esc(row.get("name") or row.get("method") or row.get("title"))}</th>'
-            f'{"".join(f"<td>{render_value(v)}</td>" for v in cells(row))}</tr>'
-            for row in rows
+            f'<tr><th scope="row">{esc(label)}</th>{"".join(f"<td>{render_value(value)}</td>" for value in values)}</tr>'
+            for label, values in rows
         )
-        return f'<div class="table-wrap"><table><thead><tr><th>方法</th>{head}</tr></thead><tbody>{body}</tbody></table></div>'
+        return f'<div class="table-wrap"><table class="comparison-table"><thead><tr><th>{esc(row_label)}</th>{head}</tr></thead><tbody>{body}</tbody></table></div>'
     if layout == "process":
         return '<div class="process">' + "".join(
             f'<article class="process-step"><span>{i}</span>{render_value(step)}</article>'

static/dynamic-content.css

@@ -59,3 +59,17 @@
   border-radius: 8px;
   background: #231c12;
 }
+.comparison-table {
+  min-width: 760px;
+  table-layout: fixed;
+}
+.comparison-table th:first-child {
+  width: 18%;
+}
+.comparison-table td,
+.comparison-table th {
+  overflow-wrap: anywhere;
+}
+.comparison-table td > p {
+  margin: 0;
+}

tests/test_app.py

@@ -2,7 +2,7 @@ import unittest
 
 from pydantic import ValidationError
 
-from app import ResearchReport, deduplicate, prepare_evidence_inputs, render_presentation, render_section_content, render_value, safe_slug
+from app import ResearchReport, deduplicate, normalize_comparison, prepare_evidence_inputs, render_presentation, render_section_content, render_value, safe_slug
 
 
 def base_report(section):
@@ -79,6 +79,22 @@ class AppTests(unittest.TestCase):
         self.assertIn("Memory", output)
         self.assertNotIn("{'", output)
 
+    def test_comparison_does_not_duplicate_dimension_column(self):
+        content = {
+            "columns": ["方法维度", "Debevec & Malik (1997) - HDR重建", "Mertens et al. (2007) - 多曝光融合"],
+            "rows": [
+                {"name": "核心目标", "values": ["恢复场景物理辐射度图", "直接生成视觉质量高的显示图像"]},
+                {"dimension": "是否需要CRF标定", "values": ["是", "否"]},
+            ],
+        }
+        row_label, columns, rows = normalize_comparison(content)
+        self.assertEqual(row_label, "方法维度")
+        self.assertEqual(len(columns), 2)
+        self.assertTrue(all(len(values) == 2 for _, values in rows))
+        output = render_section_content({"layout": "comparison", "content": content})
+        self.assertEqual(output.count("<th>方法维度</th>"), 1)
+        self.assertIn("恢复场景物理辐射度图", output)
+
 
 if __name__ == "__main__":
     unittest.main()