TreeGrid 树模板渲染:运行时构树端点 + 左树右表联动(QA 剩余成规模代码缺口)

106 个 tree 模板此前转换成占位 input-tree + 不存在的 /api/template/{id}/tree|list 端点
(404/400),左树右表全不可用。本次打通:

后端 TemplateTreeController(新)— GET /api/template/{treetemplateRef}/tree:
- 解析树模板 XML(<node>+<nextnodes><levelnode entityid parentid>),按"全层级行装进单一
  id→节点映射、按各级 parentid 列值链父"的算法构嵌套树——支持自嵌套(PARENTID)与跨实体
  (如分类→事件 MEMORABILIASORTID)。display 取 isentitydisplay 列、value=原始主键(供右表过滤)、
  节点封顶 5000、标识符 IDENT 守卫。返 amis input-tree options。

转换器 convertTreeGrid:
- 左树 source=/api/template/{ref}/tree(运行时构树),onEvent.change→reload 右表。
- 右表改用合成搜索流 /api/flow/{gridTable}_SEARCH?{rcol}=${tree}(复用既有、按选中树节点过滤;
  原 /api/template/{id}/list 是不存在端点)。右表列取自 gridtemplate 引用模板的 <display>
  (loadRefDisplayColumns 跨模板只读 1 次,仅列定义)。
- 布局修正:flex/items 误用 → grid/columns({md,body} 是 grid 栅格格式,flex 会「找不到渲染器」)。

验证:converter 60 测过;运行时 /api/template/{大事记分类树}/tree 返 4 分类×事件子节点正确层级;
浏览器(查看大事记管理)左树渲染分类层级 + 右表列出,点叶子节点 onEvent 触发右表
reload 携 EVENTID=节点 UUID。重转后分级 SUCCESS 283→328(tree 模板升级)。已重导入 sys_page_schema。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-06-13 20:29:39 +08:00
parent d3986031d2
commit 433772015a
4 changed files with 371 additions and 59 deletions

View File

@@ -913,35 +913,91 @@ public class TemplateToAmisConverter {
private Map<String, Object> convertTreeGrid(Element tree, Element treeTemplate, Element gridTemplate,
ConversionResult result, String templateName) {
final String gridCrudId = "treegrid_crud";
Map<String, Object> treeSchema = new LinkedHashMap<>();
treeSchema.put("type", "input-tree");
treeSchema.put("name", "tree");
treeSchema.put("showOutline", true);
treeSchema.put("initiallyOpen", true);
if (treeTemplate != null) {
String ref = treeTemplate.attributeValue("ref", "");
treeSchema.put("source", "/api/template/" + ref + "/tree");
result.degrade("tree+grid: treetemplate ref=" + ref + " → 跨模板引用,树数据源 /api/template 待联动");
if (!ref.isBlank()) {
treeSchema.put("source", "/api/template/" + ref + "/tree");
// 选中树节点 → 重载右表(${tree} 进右表 api 过滤);TemplateTreeController 运行时构树
treeSchema.put("onEvent", new LinkedHashMap<>(Map.of(
"change", Map.of("actions", List.of(
new LinkedHashMap<>(Map.of("actionType", "reload", "componentId", gridCrudId)))))));
result.note("tree+grid: treetemplate ref=" + ref
+ " → input-tree source /api/template/" + ref + "/tree(运行时构树)+ 选中重载右表");
}
}
Map<String, Object> gridSchema = new LinkedHashMap<>();
gridSchema.put("type", "crud");
gridSchema.put("id", gridCrudId);
gridSchema.put("syncLocation", false);
List<Map<String, Object>> gridCols = new ArrayList<>();
if (gridTemplate != null) {
String ref = gridTemplate.attributeValue("ref", "");
String rcol = gridTemplate.attributeValue("rcolumnname", "");
gridSchema.put("api", "/api/template/" + ref + "/list?" + rcol + "=${tree}");
result.degrade("tree+grid: gridtemplate ref=" + ref + "(rcolumn=" + rcol
+ ") → 跨模板引用,右侧列表数据源待联动");
String gridEntityId = gridTemplate.attributeValue("entityid", "");
String gridTable = resolveTableName(gridEntityId, result);
if (gridTable != null && !gridTable.isBlank() && !rcol.isBlank()) {
// 右表复用合成搜索流(已存在、可用),按选中树节点值过滤;原 /api/template/{id}/list 是不存在端点(404)
gridSchema.put("api", "/api/flow/" + gridTable.toUpperCase() + "_SEARCH?"
+ rcol + "=${tree}&page=${page}&perPage=${perPage}");
result.note("tree+grid: gridtemplate 实体=" + gridTable + " rcolumn=" + rcol
+ " → 右表 /api/flow/" + gridTable.toUpperCase() + "_SEARCH?" + rcol + "=${tree}(合成搜索流按树节点过滤)");
} else {
result.degrade("tree+grid: gridtemplate 实体/rcolumn 解析失败(entityid=" + gridEntityId
+ ",rcol=" + rcol + ") → 右表数据源缺");
}
// 右表列取自 gridtemplate 引用模板的 <display>(跨模板读 1 次,仅为列定义)
List<Map<String, Object>> refCols = loadRefDisplayColumns(ref, gridEntityId, result);
if (refCols != null && !refCols.isEmpty()) {
gridCols = refCols;
}
}
gridSchema.put("columns", new ArrayList<>());
gridSchema.put("columns", gridCols);
// amis grid(12 栅格):左树 3 列、右表 9 列。{md,body} 是 grid.columns 格式
// (非 flex.items——flex 的 items 必须是渲染器本身,误用会「找不到对应的渲染器」)。
Map<String, Object> hbox = new LinkedHashMap<>();
hbox.put("type", "flex");
hbox.put("items", List.of(
Map.of("md", 3, "body", treeSchema),
Map.of("md", 9, "body", gridSchema)));
hbox.put("type", "grid");
hbox.put("columns", List.of(
new LinkedHashMap<>(Map.of("md", 3, "body", treeSchema)),
new LinkedHashMap<>(Map.of("md", 9, "body", gridSchema))));
// F2-13:title 优先取 view_template.name
String treeGridTitle = templateName != null ? templateName : "树+列表";
return page(treeGridTitle, hbox);
}
/**
* 取 gridtemplate 引用模板(另一 view_template)的 {@code <display>} 列定义(TreeGrid 右表列)。
* 跨模板只读 1 次 XML、仅为列定义(列数据仍走 _SEARCH 运行时),不深化 XML 耦合。失败返 null。
*/
private List<Map<String, Object>> loadRefDisplayColumns(String ref, String entityId, ConversionResult result) {
if (ref == null || ref.isBlank()) {
return null;
}
try {
List<String> xmls = jdbcTemplate.queryForList(
"SELECT xml::text FROM VIEW_TEMPLATE WHERE VIEW_TEMPLATE_ID=? AND xml IS NOT NULL",
String.class, ref);
if (xmls.isEmpty() || xmls.get(0) == null || xmls.get(0).isBlank()) {
return null;
}
Document doc = DocumentHelper.parseText(xmls.get(0).trim());
Element display = doc.getRootElement().element("display");
if (display == null) {
return null;
}
return buildColumns(display, entityId, result);
} catch (Exception e) {
result.note("tree+grid: 取右表列失败 ref=" + ref + ": " + safeMsg(e));
return null;
}
}
// ──────────────────────────────────────────────────────────────────────
// report(A 类表格式报表)—— 报表迁移方案口径
// ──────────────────────────────────────────────────────────────────────

View File

@@ -401,14 +401,28 @@ class TemplateToAmisConverterTest {
}
@Test
void tree_treeGrid引用式() {
@SuppressWarnings("unchecked")
void tree_treeGrid引用式() throws Exception {
// TreeGrid:左 input-tree 走 /api/template/{ref}/tree(运行时构树),右 crud 走合成 _SEARCH
// 按 rcolumn 过滤,选中树节点 onEvent 重载右表。converterWithMeta 使 resolveTableName→PM_DEMO。
TemplateToAmisConverter c = converterWithMeta(new String[0][], new String[0][]);
String xml = "<tree>"
+ "<treetemplate ref='t1' entityid='e1'/>"
+ "<gridtemplate ref='g1' entityid='e2' rcolumnname='EVENTID'/></tree>";
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage);
Map<String, Object> root = body(r.getSchema());
assertEquals("flex", root.get("type"));
assertEquals(ConversionGrade.PARTIAL, r.getGrade()); // 跨模板引用 → 降级
assertEquals("grid", root.get("type")); // amis grid 栅格(非 flex)
List<Map<String, Object>> cols = (List<Map<String, Object>>) root.get("columns");
Map<String, Object> treeItem = (Map<String, Object>) cols.get(0).get("body");
Map<String, Object> gridItem = (Map<String, Object>) cols.get(1).get("body");
assertEquals("input-tree", treeItem.get("type"));
assertEquals("/api/template/t1/tree", treeItem.get("source"));
assertNotNull(treeItem.get("onEvent"), "选中树节点应触发右表重载");
assertEquals("crud", gridItem.get("type"));
String api = (String) gridItem.get("api");
assertTrue(api.startsWith("/api/flow/PM_DEMO_SEARCH?EVENTID=${tree}"),
"右表应走合成搜索流按 rcol 过滤,实际: " + api);
assertFalse(api.contains("/api/template/"), "不应再用不存在的 /api/template/list 端点");
}
// ── report (A 类) ────────────────────────────────────────────────────