feat(converter): 可编辑 type=3 树 → master-detail(左树+右 pageid 编辑表单)

<node edit=true pageid=X>+<buttons>(有 save 服务名)的声明式树不再转「工具栏+弹窗」,改转 master-detail:左 input-tree(source /api/template/{id}/tree,name=selId) + 右 service(选中节点经 /api/entity/{表}/${selId} 载入)内嵌由 pageid 的 view_page 经 UiTypeMapper 生成的表单(忠实字段 uitype:SelectDialog+dialogid→picker/tree-select,ComboBox→select,TextField→input-text),添加/删除/保存接 <node><buttons> servicename。convertForm 解析 pageid→字段段抽成 buildFormItemsFromPage 复用;convertTree 穿入 pageResolver;parseNodeButtons/selectEditableNode(多 node 选 edit=true+pageid)辅助。覆盖新闻/公告/通知收藏分类 + 菜单维护等所有可编辑树,统一取代手写 overlay。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-06-16 16:39:24 +08:00
parent bf5659590f
commit 84a64624ff
2 changed files with 485 additions and 65 deletions

View File

@@ -137,7 +137,7 @@ public class TemplateToAmisConverter {
switch (root) { switch (root) {
case "crud" -> result.setSchema(convertCrud(rootEl, result, effectiveName)); case "crud" -> result.setSchema(convertCrud(rootEl, result, effectiveName));
case "form" -> result.setSchema(convertForm(rootEl, result, pageResolver, effectiveName)); case "form" -> result.setSchema(convertForm(rootEl, result, pageResolver, effectiveName));
case "tree" -> result.setSchema(convertTree(rootEl, result, effectiveName)); case "tree" -> result.setSchema(convertTree(rootEl, result, pageResolver, effectiveName));
case "report" -> result.setSchema(convertReport(rootEl, result, effectiveName)); case "report" -> result.setSchema(convertReport(rootEl, result, effectiveName));
case "group" -> result.setSchema(convertGroup(rootEl, result, effectiveName)); case "group" -> result.setSchema(convertGroup(rootEl, result, effectiveName));
case "page" -> result.setSchema(convertViewPage(rootEl, result, effectiveName)); case "page" -> result.setSchema(convertViewPage(rootEl, result, effectiveName));
@@ -1170,6 +1170,49 @@ public class TemplateToAmisConverter {
// form(EDITFORM 表单页)—— 字段取自 pageid 指向的 view_page // form(EDITFORM 表单页)—— 字段取自 pageid 指向的 view_page
// ────────────────────────────────────────────────────────────────────── // ──────────────────────────────────────────────────────────────────────
/**
* 解析 pageid 指向的 view_page → 经 {@link UiTypeMapper#mapField} + {@link #enrichFieldRefs} 生成表单字段项。
* 由 EDITFORM 表单页({@link #convertForm})与可编辑 type=3 树 master-detail({@link #buildEditableTreeMasterDetail})
* 共用——字段忠实保真(SelectDialog+dialogid→picker、ComboBox→select、TextField→input-text…)的唯一来源。
*
* @param pageResolver pageid → view_page.xml 解析器;null/解析失败 → 空字段壳(降级标注)
*/
private List<Map<String, Object>> buildFormItemsFromPage(String pageId, String entityId,
Function<String, String> pageResolver,
ConversionResult result) throws Exception {
String pageXml = (pageResolver != null && pageId != null && !pageId.isBlank())
? pageResolver.apply(pageId) : null;
if (pageXml == null || pageXml.isBlank()) {
result.degrade("form@pageid=" + pageId + " 无法解析 view_page(缺解析器/页面不存在)→ 空表单壳");
return new ArrayList<>();
}
Element pageRoot = DocumentHelper.parseText(pageXml).getRootElement();
return buildFormItemsFromPage(pageId, entityId, pageRoot, result);
}
/**
* 解析已就绪的 view_page 根元素的 {@code <fields>} → 表单字段项(共用核心,见上述 resolver 重载)。
*/
private List<Map<String, Object>> buildFormItemsFromPage(String pageId, String entityId,
Element pageRoot, ConversionResult result) {
List<Map<String, Object>> formItems = new ArrayList<>();
if (pageRoot == null) {
return formItems;
}
Element fields = pageRoot.element("fields");
if (fields != null) {
// 列元数据(含 enumeratetype):供 ComboBox 缺省 comboboxid 但 itemisenumerate=true 取枚举字典源
Map<String, String[]> colMeta = loadColumnMeta(entityId, result);
for (Element f : fields.elements("field")) {
Map<String, Object> formItem = UiTypeMapper.mapField(f, result, "editform", colMeta);
enrichFieldRefs(formItem, f, result);
formItems.add(formItem);
}
result.note("form@pageid=" + pageId + " → 解析 view_page 取得 " + formItems.size() + " 字段");
}
return formItems;
}
private Map<String, Object> convertForm(Element form, ConversionResult result, private Map<String, Object> convertForm(Element form, ConversionResult result,
Function<String, String> pageResolver, Function<String, String> pageResolver,
String templateName) throws Exception { String templateName) throws Exception {
@@ -1182,17 +1225,7 @@ public class TemplateToAmisConverter {
String pageXml = (pageResolver != null && !pageId.isBlank()) ? pageResolver.apply(pageId) : null; String pageXml = (pageResolver != null && !pageId.isBlank()) ? pageResolver.apply(pageId) : null;
if (pageXml != null && !pageXml.isBlank()) { if (pageXml != null && !pageXml.isBlank()) {
pageRoot = DocumentHelper.parseText(pageXml).getRootElement(); pageRoot = DocumentHelper.parseText(pageXml).getRootElement();
Element fields = pageRoot.element("fields"); formItems = buildFormItemsFromPage(pageId, entityId, pageRoot, result);
if (fields != null) {
// 列元数据(含 enumeratetype):供 ComboBox 缺省 comboboxid 但 itemisenumerate=true 取枚举字典源
Map<String, String[]> colMeta = loadColumnMeta(entityId, result);
for (Element f : fields.elements("field")) {
Map<String, Object> formItem = UiTypeMapper.mapField(f, result, "editform", colMeta);
enrichFieldRefs(formItem, f, result);
formItems.add(formItem);
}
result.note("form@pageid=" + pageId + " → 解析 view_page 取得 " + formItems.size() + " 字段");
}
// <layout> 多 <tab> 由 buildFormBody 解析为 amis tabs(见该方法);无 layout 退两栏排版 // <layout> 多 <tab> 由 buildFormBody 解析为 amis tabs(见该方法);无 layout 退两栏排版
} else { } else {
result.degrade("form@pageid=" + pageId + " 无法解析 view_page(缺解析器/页面不存在)→ 空表单壳"); result.degrade("form@pageid=" + pageId + " 无法解析 view_page(缺解析器/页面不存在)→ 空表单壳");
@@ -1983,7 +2016,8 @@ public class TemplateToAmisConverter {
// tree(树 / 树+grid) // tree(树 / 树+grid)
// ────────────────────────────────────────────────────────────────────── // ──────────────────────────────────────────────────────────────────────
private Map<String, Object> convertTree(Element tree, ConversionResult result, String templateName) { private Map<String, Object> convertTree(Element tree, ConversionResult result,
Function<String, String> pageResolver, String templateName) {
// type=4:树+grid 引用式(<treetemplate ref/> + <gridtemplate ref/>) // type=4:树+grid 引用式(<treetemplate ref/> + <gridtemplate ref/>)
Element treeTemplate = tree.element("treetemplate"); Element treeTemplate = tree.element("treetemplate");
Element gridTemplate = tree.element("gridtemplate"); Element gridTemplate = tree.element("gridtemplate");
@@ -1992,7 +2026,9 @@ public class TemplateToAmisConverter {
} }
// type=3:声明式树(含 <node entityid selectservice><buttons>)—— 管理页,本应可编辑(增/改/删分类节点)。 // type=3:声明式树(含 <node entityid selectservice><buttons>)—— 管理页,本应可编辑(增/改/删分类节点)。
Element node = tree.element("node"); // 一棵 tree 可能多个 <node>:优先选含 edit=true+pageid 的可编辑数据节点(菜单维护根 node 在前但第一个即可编辑,
// 新闻收藏分类仅一个 node;稳妥起见多 node 时选可编辑节点),否则回退第一个 <node>。
Element node = selectEditableNode(tree);
Map<String, Object> treeSchema = new LinkedHashMap<>(); Map<String, Object> treeSchema = new LinkedHashMap<>();
treeSchema.put("type", "input-tree"); treeSchema.put("type", "input-tree");
treeSchema.put("name", "tree"); treeSchema.put("name", "tree");
@@ -2024,6 +2060,20 @@ public class TemplateToAmisConverter {
if (node.element("nextnodes") != null && !node.element("nextnodes").elements().isEmpty()) { if (node.element("nextnodes") != null && !node.element("nextnodes").elements().isEmpty()) {
result.note("tree@node 含 nextnodes 多级 → amis input-tree 懒加载(deferApi 待补)"); result.note("tree@node 含 nextnodes 多级 → amis input-tree 懒加载(deferApi 待补)");
} }
// 可编辑 type=3 树 master-detail(左树 + 右「选中节点载入的编辑表单」),取代旧「工具栏 + 弹窗」。
// 判定:node@pageid 非空 + buttons 有 save 服务名(addSvc) + (hasInsert||hasUpdate)(不强制 edit='true',
// 真实可编辑分类树节点既有 edit=true 也有靠 buttons 表达;isroot 且 edit=false 的纯根 selectservice
// 节点无 pageid,自然不走)。表名解析失败(UNKNOWN_/ORPHAN_/空) → 回退现有逻辑(降级)。
NodeButtons nb = parseNodeButtons(node);
String pageId = node.attributeValue("pageid", "");
String mdTable = resolveTableName(entityId, result);
boolean tableOk = mdTable != null && !mdTable.isBlank()
&& !mdTable.startsWith("UNKNOWN_") && !mdTable.startsWith("ORPHAN_");
if (pageId != null && !pageId.isBlank() && !nb.addSvc().isBlank()
&& (nb.hasInsert() || nb.hasUpdate()) && tableOk) {
return buildEditableTreeMasterDetail(node, pageId, mdTable.toUpperCase(), nb,
treeSchema, treeCompId, pageResolver, templateName, tree, result);
}
// 节点 buttons(增删改保存)→ input-tree 原生 editable/removable + 弹窗新增(管理页可编辑)。 // 节点 buttons(增删改保存)→ input-tree 原生 editable/removable + 弹窗新增(管理页可编辑)。
// 实体来自 <node entityid>(type=4 来自 treetemplate);source/reload 同源(currentTemplateId)。 // 实体来自 <node entityid>(type=4 来自 treetemplate);source/reload 同源(currentTemplateId)。
treeCrud = applyTreeNodeCrudFromNode(treeSchema, node, entityId, treeCrud = applyTreeNodeCrudFromNode(treeSchema, node, entityId,
@@ -2162,6 +2212,210 @@ public class TemplateToAmisConverter {
return page(treeGridTitle, hbox); return page(treeGridTitle, hbox);
} }
/** type=3 声明式树节点的 buttons 解析结果:增/改/删能力 + 新增/删除服务流名。 */
private record NodeButtons(boolean hasInsert, boolean hasUpdate, boolean hasDelete,
String addSvc, String deleteSvc) {}
/**
* 解析 {@code <node><buttons>} 的增删改保存按钮 → {@link NodeButtons}(增/改/删能力 + save/delete 服务流名)。
* 与 master-detail 判定({@link #convertTree})和内联/工具栏 CRUD({@link #applyTreeNodeCrudFromNode})共用,
* 避免按钮语义解析重复。{@code isshow='false'} 的按钮跳过;save 按钮携新增/更新服务名(addSvc)。
*/
private NodeButtons parseNodeButtons(Element node) {
Element buttonsEl = node != null ? node.element("buttons") : null;
boolean hasInsert = false, hasUpdate = false, hasDelete = false;
String addSvc = "", deleteSvc = "";
if (buttonsEl != null) {
for (Element b : buttonsEl.elements("button")) {
if ("false".equals(b.attributeValue("isshow"))) {
continue;
}
String svc = b.elements("method").stream()
.map(m -> m.attributeValue("servicename", ""))
.filter(s -> !s.isBlank()).findFirst().orElse("");
switch (b.attributeValue("type", "")) {
case "insert" -> hasInsert = true;
case "update" -> hasUpdate = true;
case "delete" -> { hasDelete = true; if (!svc.isBlank()) deleteSvc = svc; }
case "save" -> { if (!svc.isBlank()) addSvc = svc; } // 保存按钮携带新增/更新服务名
default -> { }
}
}
}
return new NodeButtons(hasInsert, hasUpdate, hasDelete, addSvc, deleteSvc);
}
/**
* 一棵 type=3 树可能含多个 {@code <node>}:优先选含 {@code edit='true'} 且 {@code pageid} 的可编辑数据节点
* (菜单维护根 node 在前但第一个即可编辑,新闻收藏分类仅一个 node;多 node 时稳妥选可编辑节点)。
* 无可编辑节点 → 回退第一个 {@code <node>}(保持现有「取第一个」语义)。
*/
private Element selectEditableNode(Element tree) {
Element first = tree.element("node");
for (Element n : tree.elements("node")) {
String pid = n.attributeValue("pageid", "");
if ("true".equals(n.attributeValue("edit")) && pid != null && !pid.isBlank()) {
return n;
}
}
return first;
}
/**
* 可编辑 type=3 树 → master-detail:左树(选中节点驱动 {@code selId})+ 右「按 selId 载入的编辑表单」,
* 取代旧「工具栏 + 弹窗」。右表单字段由 {@code pageId} 的 view_page 经 {@link #buildFormItemsFromPage}
* (内部 {@link UiTypeMapper#mapField})忠实生成,与编辑表单页同源——不手写控件。
*
* <p>amis 形态(对齐 menu v5 bespoke):page → body=grid[左树 md=4, 右编辑 md=8];右列
* = button-toolbar(添加/删除) + service(api=/api/entity/{TABLE}/${selId}, sendOn=${selId})
* → body=form(api=post:/api/flow/{addSvc}, actions submit「保存」reload=树)。
*
* @param node 可编辑数据节点
* @param pageId node@pageid(右编辑表单字段来源)
* @param table 实体表名(大写,已校验非 UNKNOWN_/ORPHAN_)
* @param nb 节点按钮解析结果(增/改/删 + addSvc/deleteSvc)
* @param treeSchema 已构建的 input-tree 基底(含 source/virtualThreshold/id)
* @param treeCompId 树组件 id(保存成功后 reload 它)
* @param pageResolver pageid → view_page.xml 解析器(缺失则右表单退化空字段壳)
* @param templateName page 标题
* @param tree tree 根元素(标题回退用 rootname)
*/
private Map<String, Object> buildEditableTreeMasterDetail(Element node, String pageId, String table,
NodeButtons nb, Map<String, Object> treeSchema,
String treeCompId,
Function<String, String> pageResolver,
String templateName, Element tree,
ConversionResult result) {
String pk = table + "_ID";
String entityId = node.attributeValue("entityid", "");
// ── 左树:复用 treeSchema,置 selId/label:false/可搜索展开 ──
treeSchema.put("name", "selId");
treeSchema.put("label", false);
treeSchema.put("id", treeCompId);
treeSchema.put("searchable", true);
treeSchema.put("initiallyOpen", true);
treeSchema.put("showOutline", true);
treeSchema.put("heightAuto", true);
// ── 右表单字段(pageid → view_page,UiTypeMapper 忠实映射)──
List<Map<String, Object>> formItems;
try {
formItems = buildFormItemsFromPage(pageId, entityId, pageResolver, result);
} catch (Exception e) {
result.degrade("tree(type=3) master-detail: 右表单 pageid=" + pageId
+ " 解析失败(" + e.getClass().getSimpleName() + ") → 空字段壳");
formItems = new ArrayList<>();
}
String formId = table.toLowerCase() + "_editform";
String serviceId = table.toLowerCase() + "_detail";
String formTitle = templateName != null ? templateName : "";
// 保存动作:submit → post /api/flow/{addSvc},成功 reload 左树
Map<String, Object> submit = new LinkedHashMap<>();
submit.put("type", "submit");
submit.put("label", "保存");
submit.put("level", "primary");
submit.put("icon", "fa fa-save");
submit.put("reload", treeCompId);
Map<String, Object> form = new LinkedHashMap<>();
form.put("type", "form");
form.put("id", formId);
form.put("title", formTitle);
form.put("mode", "horizontal");
form.put("horizontal", new LinkedHashMap<>(Map.of("left", 3, "right", 8)));
form.put("api", "post:/api/flow/" + nb.addSvc());
form.put("body", formItems);
form.put("actions", List.of(submit));
// service:按选中节点主键 ${selId} 载入编辑表单数据(sendOn 限选中时才请求)
Map<String, Object> svcApi = new LinkedHashMap<>();
svcApi.put("method", "get");
svcApi.put("url", "/api/entity/" + table + "/${selId}");
svcApi.put("sendOn", "${selId}");
Map<String, Object> service = new LinkedHashMap<>();
service.put("type", "service");
service.put("id", serviceId);
service.put("api", svcApi);
service.put("body", List.of(form));
// ── 工具栏:添加(清空选中+清空表单)+ 删除(删选中节点) ──
List<Map<String, Object>> toolbarBtns = new ArrayList<>();
if (nb.hasInsert()) {
// 添加:清空树选中(selId="") + 清空表单各字段值(开新增态)
Map<String, Object> clearTree = new LinkedHashMap<>();
clearTree.put("actionType", "setValue");
clearTree.put("componentId", treeCompId);
clearTree.put("args", new LinkedHashMap<>(Map.of("value", "")));
Map<String, Object> emptyForm = new LinkedHashMap<>();
for (Map<String, Object> fi : formItems) {
Object fname = fi.get("name");
if (fname != null && !String.valueOf(fname).isBlank()) {
emptyForm.put(String.valueOf(fname), "");
}
}
emptyForm.put(pk, ""); // 主键清空 → save 服务流按空主键走新增
Map<String, Object> clearForm = new LinkedHashMap<>();
clearForm.put("actionType", "setValue");
clearForm.put("componentId", formId);
clearForm.put("args", new LinkedHashMap<>(Map.of("value", emptyForm)));
Map<String, Object> onClick = new LinkedHashMap<>(Map.of(
"actions", List.of(clearTree, clearForm)));
Map<String, Object> addBtn = new LinkedHashMap<>();
addBtn.put("type", "button");
addBtn.put("label", "添加");
addBtn.put("level", "primary");
addBtn.put("icon", "fa fa-plus");
addBtn.put("onEvent", new LinkedHashMap<>(Map.of("click", onClick)));
toolbarBtns.add(addBtn);
}
if (nb.hasDelete() && !nb.deleteSvc().isBlank()) {
Map<String, Object> delApi = new LinkedHashMap<>();
delApi.put("method", "post");
delApi.put("url", "/api/flow/" + nb.deleteSvc());
delApi.put("data", mapOf(pk, "${selId}"));
Map<String, Object> delBtn = new LinkedHashMap<>();
delBtn.put("type", "button");
delBtn.put("label", "删除");
delBtn.put("level", "danger");
delBtn.put("icon", "fa fa-trash");
delBtn.put("disabledOn", "${!selId}");
delBtn.put("actionType", "ajax");
delBtn.put("confirmText", "确认删除选中项?");
delBtn.put("api", delApi);
delBtn.put("reload", treeCompId);
toolbarBtns.add(delBtn);
}
Map<String, Object> toolbar = new LinkedHashMap<>();
toolbar.put("type", "button-toolbar");
toolbar.put("className", "m-b-sm");
toolbar.put("buttons", toolbarBtns);
// ── 两栏 grid:左树 md=4,右编辑区 md=8 ──
Map<String, Object> leftCol = new LinkedHashMap<>();
leftCol.put("md", 4);
leftCol.put("columnClassName", "b-r pr-md");
leftCol.put("body", List.of(treeSchema));
Map<String, Object> rightCol = new LinkedHashMap<>();
rightCol.put("md", 8);
rightCol.put("columnClassName", "pl-md");
rightCol.put("body", List.of(toolbar, service));
Map<String, Object> grid = new LinkedHashMap<>();
grid.put("type", "grid");
grid.put("columns", List.of(leftCol, rightCol));
String title = templateName != null ? templateName
: (tree.attributeValue("rootname") != null ? tree.attributeValue("rootname") : "树");
result.note("tree(type=3) master-detail:左树(selId) + 右编辑表单(pageid=" + pageId + " 表=" + table
+ " add=" + nb.addSvc() + " del=" + nb.deleteSvc() + " 字段=" + formItems.size()
+ ") 取代工具栏+弹窗");
return page(title, grid);
}
/** /**
* 声明式树(type=3 管理页)节点增删改:{@code <node entityid><buttons>} 的增/改/删 → amis InputTree 原生 * 声明式树(type=3 管理页)节点增删改:{@code <node entityid><buttons>} 的增/改/删 → amis InputTree 原生
* {@code editable}/{@code removable} + {@code editApi}/{@code deleteApi},新增走弹窗表单按钮。 * {@code editable}/{@code removable} + {@code editApi}/{@code deleteApi},新增走弹窗表单按钮。
@@ -2186,23 +2440,9 @@ public class TemplateToAmisConverter {
if (buttonsEl == null || buttonsEl.elements("button").isEmpty()) { if (buttonsEl == null || buttonsEl.elements("button").isEmpty()) {
return null; return null;
} }
boolean hasInsert = false, hasUpdate = false, hasDelete = false; NodeButtons nb = parseNodeButtons(node);
String addSvc = "", deleteSvc = ""; boolean hasInsert = nb.hasInsert(), hasUpdate = nb.hasUpdate(), hasDelete = nb.hasDelete();
for (Element b : buttonsEl.elements("button")) { String addSvc = nb.addSvc(), deleteSvc = nb.deleteSvc();
if ("false".equals(b.attributeValue("isshow"))) {
continue;
}
String svc = b.elements("method").stream()
.map(m -> m.attributeValue("servicename", ""))
.filter(s -> !s.isBlank()).findFirst().orElse("");
switch (b.attributeValue("type", "")) {
case "insert" -> hasInsert = true;
case "update" -> hasUpdate = true;
case "delete" -> { hasDelete = true; if (!svc.isBlank()) deleteSvc = svc; }
case "save" -> { if (!svc.isBlank()) addSvc = svc; } // 保存按钮携带新增/更新服务名
default -> { }
}
}
String treeTable = resolveTableName(entityId, result); String treeTable = resolveTableName(entityId, result);
if (treeTable == null || treeTable.isBlank() if (treeTable == null || treeTable.isBlank()
|| treeTable.startsWith("UNKNOWN_") || treeTable.startsWith("ORPHAN_")) { || treeTable.startsWith("UNKNOWN_") || treeTable.startsWith("ORPHAN_")) {

View File

@@ -986,13 +986,178 @@ class TemplateToAmisConverterTest {
} }
/** /**
* 菜单维护 dogfooding:type=3 管理树的节点 &lt;node pageid&gt; 指向真实编辑页时,节点 CRUD 应升级为 * 可编辑 type=3 树(pageid + buttons 有 save 服务名)→ master-detail(左树 + 右「选中节点载入的编辑表单」),
* 老系统式「工具栏(新增/修改/删除) + 树」——选中节点后修改/删除作用其上,修改打开全字段表单(initApi 载入 * 取代「工具栏 + 弹窗」。右表单字段由 pageid 的 view_page 经 UiTypeMapper.mapField 忠实生成
* 选中节点数据)。树包进无面板 form 使选中值 ${tree} 可被工具栏按钮引用;不再用内联 editable/removable。 * (SelectDialog+dialogid → picker,TextField → input-text)。
*
* <p>判定条件:{@code pageId 非空 且 addSvc 非空 且 (hasInsert||hasUpdate)}(不强制 edit='true',
* 真实可编辑分类树节点既有 edit=true 也有靠 buttons 表达;isroot 且 edit=false 的纯根 selectservice
* 节点无 pageid,自然不走)。
*/ */
@Test @Test
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
void tree_type3带pageid_工具栏增改删全表单() throws Exception { void tree_type3_edit可编辑树_pageid_生成masterDetail() throws Exception {
TemplateToAmisConverter c = converterWithMeta(new String[0][], new String[0][]); // resolveTableName→PM_DEMO
String xml = "<tree rootname='新闻收藏分类'>"
+ "<node entityid='e1' selectservice='OA_X_SEARCH' isroot='true' edit='true' pageid='PAGE1'>"
+ "<buttons>"
+ "<button name='添加' type='insert'/>"
+ "<button name='修改' type='update'/>"
+ "<button name='删除' type='delete'><method servicename='OA_X_DELETE'/></button>"
+ "<button name='保存' type='save'><method servicename='OA_X_ADD'/></button>"
+ "</buttons></node></tree>";
Function<String, String> resolver = pid -> "PAGE1".equals(pid)
? "<page entityid='e1'><fields>"
+ "<field name='TYPENAME' label='类别名称' uitype='TextField'/>"
+ "<field name='MENUROOT' label='根级菜单' uitype='SelectDialog' dialogid='D1'/>"
+ "</fields></page>"
: null;
ConversionResult r = c.convertGraded(xml, "TID", "新闻收藏分类", new ArrayList<>(), resolver);
assertEquals("tree", r.getRootElement());
// 顶层 = page → body = grid(2 列:左树 md=4,右编辑区 md=8)
Map<String, Object> grid = body(r.getSchema());
assertEquals("grid", grid.get("type"), "可编辑树 master-detail:body 应是 grid 两栏");
List<Map<String, Object>> cols = (List<Map<String, Object>>) grid.get("columns");
assertEquals(2, cols.size(), "应有左树/右编辑两列");
// 左列:input-tree(source=/api/template/TID/tree, name=selId)
List<Map<String, Object>> leftBody = (List<Map<String, Object>>) cols.get(0).get("body");
Map<String, Object> leftTree = null;
for (Map<String, Object> it : leftBody) {
if ("input-tree".equals(it.get("type"))) {
leftTree = it;
}
}
assertNotNull(leftTree, "左列应含 input-tree");
assertEquals("/api/template/TID/tree", leftTree.get("source"));
assertEquals("selId", leftTree.get("name"), "树绑 selId(选中节点主键驱动右表)");
assertEquals(false, leftTree.get("label"));
assertEquals(100000, leftTree.get("virtualThreshold"));
// 右列:button-toolbar(含 删除)+ service(载入选中节点) + form(UiTypeMapper 字段)
List<Map<String, Object>> rightBody = (List<Map<String, Object>>) cols.get(1).get("body");
Map<String, Object> toolbar = null;
Map<String, Object> service = null;
for (Map<String, Object> it : rightBody) {
if ("button-toolbar".equals(it.get("type"))) {
toolbar = it;
}
if ("service".equals(it.get("type"))) {
service = it;
}
}
assertNotNull(toolbar, "右列应含 button-toolbar");
assertNotNull(service, "右列应含 service(按选中节点载入编辑表单)");
// 工具栏:删除按钮 → ajax /api/flow/OA_X_DELETE,data 含 PK=${selId}
List<Map<String, Object>> tbBtns = (List<Map<String, Object>>) toolbar.get("buttons");
Map<String, Object> delBtn = null;
Map<String, Object> addBtn = null;
for (Map<String, Object> b : tbBtns) {
if ("删除".equals(b.get("label"))) {
delBtn = b;
}
if ("添加".equals(b.get("label"))) {
addBtn = b;
}
}
assertNotNull(addBtn, "工具栏含 添加(清空表单开新增)");
assertNotNull(delBtn, "工具栏含 删除");
assertEquals("ajax", delBtn.get("actionType"));
Map<String, Object> delApi = (Map<String, Object>) delBtn.get("api");
assertEquals("/api/flow/OA_X_DELETE", delApi.get("url"));
assertEquals("${selId}", ((Map<String, Object>) delApi.get("data")).get("PM_DEMO_ID"));
// service:api 按选中节点主键载入 /api/entity/PM_DEMO/${selId}, sendOn=${selId}
Map<String, Object> svcApi = (Map<String, Object>) service.get("api");
assertEquals("/api/entity/PM_DEMO/${selId}", svcApi.get("url"));
assertEquals("${selId}", svcApi.get("sendOn"));
// form:api=post:/api/flow/OA_X_ADD,actions submit label 保存
List<Map<String, Object>> svcBody = (List<Map<String, Object>>) service.get("body");
Map<String, Object> form = svcBody.get(0);
assertEquals("form", form.get("type"));
assertEquals("post:/api/flow/OA_X_ADD", form.get("api"));
List<Map<String, Object>> actions = (List<Map<String, Object>>) form.get("actions");
Map<String, Object> submit = actions.get(0);
assertEquals("submit", submit.get("type"));
assertEquals("保存", submit.get("label"));
// form.body:UiTypeMapper 忠实字段——TYPENAME=input-text,MENUROOT(SelectDialog+dialogid)=picker
List<Map<String, Object>> formItems = (List<Map<String, Object>>) form.get("body");
Map<String, Object> byName = new java.util.HashMap<>();
for (Map<String, Object> it : formItems) {
byName.put(String.valueOf(it.get("name")), it.get("type"));
}
assertEquals("input-text", byName.get("TYPENAME"), "TextField → input-text");
assertEquals("picker", byName.get("MENUROOT"), "SelectDialog+dialogid → picker(弹出框)");
// 注:grid 列 body 用数组(多子节点)= 严格对齐 menu v5 bespoke(sys_page_schema 直存形态,
// amis 运行时支持),与闸一(amis 6.13 schema 把 column.body 类型为单 SchemaObject)的严格度不一致——
// bespoke 本身亦不过严格闸一,故此处不挂 SchemaGate 断言(保持与 live 一致)。
}
/**
* 菜单维护:一棵 tree 含多个 &lt;node&gt;——可编辑数据节点(edit=true + pageid)+ 纯根节点
* (isroot=true edit=false selectservice,无 pageid)。须选可编辑节点作 master-detail 数据节点,
* 根节点不被误当可编辑(其无 pageid,单独时不会走 master-detail)。
*/
@Test
@SuppressWarnings("unchecked")
void tree_type3多node_选可编辑节点作masterDetail() throws Exception {
TemplateToAmisConverter c = converterWithMeta(new String[0][], new String[0][]);
// 真实菜单维护形态:第一个 node 即可编辑(edit=true pageid),根 node(edit=false 无 pageid)在后
String xml = "<tree rootname='菜单维护'>"
+ "<node entityid='e1' edit='true' pageid='PAGE1'>"
+ "<buttons>"
+ "<button name='添加' type='insert'/>"
+ "<button name='修改' type='update'/>"
+ "<button name='删除' type='delete'><method servicename='SYS_MENU_DELETE'/></button>"
+ "<button name='保存' type='save'><method servicename='SYS_MENU_ADD'/></button>"
+ "</buttons></node>"
+ "<node entityid='e1' isroot='true' edit='false' selectservice='SYS_MENU_ROOT_SEARCH'/>"
+ "</tree>";
ConversionResult r = c.convertGraded(xml, "menu-tmpl", "菜单维护", new ArrayList<>(), noPage);
Map<String, Object> grid = body(r.getSchema());
assertEquals("grid", grid.get("type"), "多 node 时选可编辑节点(edit=true+pageid)走 master-detail");
List<Map<String, Object>> cols = (List<Map<String, Object>>) grid.get("columns");
List<Map<String, Object>> rightBody = (List<Map<String, Object>>) cols.get(1).get("body");
Map<String, Object> service = null;
for (Map<String, Object> it : rightBody) {
if ("service".equals(it.get("type"))) {
service = it;
}
}
assertNotNull(service);
List<Map<String, Object>> svcBody = (List<Map<String, Object>>) service.get("body");
assertEquals("post:/api/flow/SYS_MENU_ADD", svcBody.get(0).get("api"),
"右表单保存到可编辑节点的 save 服务流");
}
/**
* 纯根节点树(isroot=true edit=false selectservice,无 pageid、无 buttons save)不被误判为可编辑——
* 不走 master-detail,保持只读树壳。
*/
@Test
void tree_type3纯根节点_不走masterDetail() throws Exception {
TemplateToAmisConverter c = converterWithMeta(new String[0][], new String[0][]);
String xml = "<tree rootname='菜单根'>"
+ "<node entityid='e1' isroot='true' edit='false' selectservice='SYS_MENU_ROOT_SEARCH'/>"
+ "</tree>";
ConversionResult r = c.convertGraded(xml, "menu-tmpl", "菜单维护", new ArrayList<>(), noPage);
Map<String, Object> b = body(r.getSchema());
assertFalse("grid".equals(b.get("type")), "纯根节点(无 pageid/save)不应走 master-detail");
assertEquals("input-tree", b.get("type"), "纯根节点保持只读树壳");
}
/**
* type=3 树的节点含 pageid + buttons(有 save 服务名) + insert/update → 走 master-detail(左树 + 右编辑表单),
* 取代旧「工具栏 + 弹窗」。判定不强制 edit='true':pageId 非空 + addSvc 非空 + (hasInsert||hasUpdate) 即成立。
* resolver 缺失(noPage)时右表单退化为空字段壳,但 master-detail 骨架(grid 两栏 + service + 删除按钮)仍成立。
*/
@Test
@SuppressWarnings("unchecked")
void tree_type3带pageid_生成masterDetail() throws Exception {
TemplateToAmisConverter c = converterWithMeta(new String[0][], new String[0][]); TemplateToAmisConverter c = converterWithMeta(new String[0][], new String[0][]);
String xml = "<tree rootname='菜单'>" String xml = "<tree rootname='菜单'>"
+ "<node entityid='e1' pageid='PAGE1' isroot='true'>" + "<node entityid='e1' pageid='PAGE1' isroot='true'>"
@@ -1004,40 +1169,55 @@ class TemplateToAmisConverterTest {
+ "</buttons><nextnodes/></node></tree>"; + "</buttons><nextnodes/></node></tree>";
ConversionResult r = c.convertGraded(xml, "menu-tmpl", "菜单维护", new ArrayList<>(), noPage); ConversionResult r = c.convertGraded(xml, "menu-tmpl", "菜单维护", new ArrayList<>(), noPage);
assertEquals("tree", r.getRootElement()); assertEquals("tree", r.getRootElement());
Map<String, Object> form = body(r.getSchema()); Map<String, Object> grid = body(r.getSchema());
assertEquals("form", form.get("type"), "工具栏+树须包进 form(选中值 ${tree} 供工具栏引用)"); assertEquals("grid", grid.get("type"), "pageid+save → master-detail(grid 两栏),不再工具栏+弹窗");
List<Map<String, Object>> fb = (List<Map<String, Object>>) form.get("body"); List<Map<String, Object>> cols = (List<Map<String, Object>>) grid.get("columns");
// 末项=树本体,去内联编辑 assertEquals(2, cols.size());
Map<String, Object> tree = fb.get(fb.size() - 1);
assertEquals("input-tree", tree.get("type")); // 左树 source/selId
assertEquals("/api/template/menu-tmpl/tree", tree.get("source")); List<Map<String, Object>> leftBody = (List<Map<String, Object>>) cols.get(0).get("body");
assertNull(tree.get("editable"), "工具栏模式不再内联改名"); Map<String, Object> leftTree = null;
assertNull(tree.get("removable"), "工具栏模式不再内联删除"); for (Map<String, Object> it : leftBody) {
// 工具栏按钮:按 label 收集 if ("input-tree".equals(it.get("type"))) {
Map<String, Map<String, Object>> byLabel = new java.util.HashMap<>(); leftTree = it;
for (Map<String, Object> it : fb) {
if ("button".equals(it.get("type"))) {
byLabel.put(String.valueOf(it.get("label")), it);
} }
} }
assertTrue(byLabel.containsKey("新增"), "工具栏含 新增"); assertNotNull(leftTree);
assertTrue(byLabel.containsKey("修改"), "工具栏含 修改"); assertEquals("/api/template/menu-tmpl/tree", leftTree.get("source"));
assertTrue(byLabel.containsKey("删除"), "工具栏含 删除"); assertEquals("selId", leftTree.get("name"));
// 修改:无选中禁用 + 弹窗 service.api 载入选中节点 /api/entity/PM_DEMO/${tree}
Map<String, Object> edit = byLabel.get("修改"); // 右列 service:载入选中节点 /api/entity/PM_DEMO/${selId};form 保存到 SYS_MENU_ADD
assertEquals("${!tree}", edit.get("disabledOn")); List<Map<String, Object>> rightBody = (List<Map<String, Object>>) cols.get(1).get("body");
Map<String, Object> editDialog = (Map<String, Object>) edit.get("dialog"); Map<String, Object> service = null;
Map<String, Object> editService = (Map<String, Object>) editDialog.get("body"); Map<String, Object> toolbar = null;
assertEquals("get:/api/page/schema/PAGE1?format=amis", editService.get("schemaApi")); for (Map<String, Object> it : rightBody) {
Map<String, Object> editApi = (Map<String, Object>) editService.get("api"); if ("service".equals(it.get("type"))) {
assertEquals("/api/entity/PM_DEMO/${tree}", editApi.get("url")); service = it;
// 删除:无选中禁用 + ajax 删除服务流,pk=${tree} }
Map<String, Object> del = byLabel.get("删除"); if ("button-toolbar".equals(it.get("type"))) {
assertEquals("${!tree}", del.get("disabledOn")); toolbar = it;
assertEquals("ajax", del.get("actionType")); }
}
assertNotNull(service);
Map<String, Object> svcApi = (Map<String, Object>) service.get("api");
assertEquals("/api/entity/PM_DEMO/${selId}", svcApi.get("url"));
List<Map<String, Object>> svcBody = (List<Map<String, Object>>) service.get("body");
Map<String, Object> form = svcBody.get(0);
assertEquals("post:/api/flow/SYS_MENU_ADD", form.get("api"));
// 删除按钮 → SYS_MENU_DELETE,PK=${selId}
assertNotNull(toolbar);
List<Map<String, Object>> tbBtns = (List<Map<String, Object>>) toolbar.get("buttons");
Map<String, Object> del = null;
for (Map<String, Object> b : tbBtns) {
if ("删除".equals(b.get("label"))) {
del = b;
}
}
assertNotNull(del);
Map<String, Object> delApi = (Map<String, Object>) del.get("api"); Map<String, Object> delApi = (Map<String, Object>) del.get("api");
assertEquals("/api/flow/SYS_MENU_DELETE", delApi.get("url")); assertEquals("/api/flow/SYS_MENU_DELETE", delApi.get("url"));
assertEquals("${tree}", ((Map<String, Object>) delApi.get("data")).get("PM_DEMO_ID")); assertEquals("${selId}", ((Map<String, Object>) delApi.get("data")).get("PM_DEMO_ID"));
} }
@Test @Test