diff --git a/platform-converter/src/main/java/com/eip4/platform/converter/TemplateToAmisConverter.java b/platform-converter/src/main/java/com/eip4/platform/converter/TemplateToAmisConverter.java index 6fee63b..3934897 100644 --- a/platform-converter/src/main/java/com/eip4/platform/converter/TemplateToAmisConverter.java +++ b/platform-converter/src/main/java/com/eip4/platform/converter/TemplateToAmisConverter.java @@ -137,7 +137,7 @@ public class TemplateToAmisConverter { switch (root) { case "crud" -> result.setSchema(convertCrud(rootEl, result, 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 "group" -> result.setSchema(convertGroup(rootEl, result, effectiveName)); case "page" -> result.setSchema(convertViewPage(rootEl, result, effectiveName)); @@ -1170,6 +1170,49 @@ public class TemplateToAmisConverter { // 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> buildFormItemsFromPage(String pageId, String entityId, + Function 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 } → 表单字段项(共用核心,见上述 resolver 重载)。 + */ + private List> buildFormItemsFromPage(String pageId, String entityId, + Element pageRoot, ConversionResult result) { + List> formItems = new ArrayList<>(); + if (pageRoot == null) { + return formItems; + } + Element fields = pageRoot.element("fields"); + if (fields != null) { + // 列元数据(含 enumeratetype):供 ComboBox 缺省 comboboxid 但 itemisenumerate=true 取枚举字典源 + Map colMeta = loadColumnMeta(entityId, result); + for (Element f : fields.elements("field")) { + Map 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 convertForm(Element form, ConversionResult result, Function pageResolver, String templateName) throws Exception { @@ -1182,17 +1225,7 @@ public class TemplateToAmisConverter { String pageXml = (pageResolver != null && !pageId.isBlank()) ? pageResolver.apply(pageId) : null; if (pageXml != null && !pageXml.isBlank()) { pageRoot = DocumentHelper.parseText(pageXml).getRootElement(); - Element fields = pageRoot.element("fields"); - if (fields != null) { - // 列元数据(含 enumeratetype):供 ComboBox 缺省 comboboxid 但 itemisenumerate=true 取枚举字典源 - Map colMeta = loadColumnMeta(entityId, result); - for (Element f : fields.elements("field")) { - Map formItem = UiTypeMapper.mapField(f, result, "editform", colMeta); - enrichFieldRefs(formItem, f, result); - formItems.add(formItem); - } - result.note("form@pageid=" + pageId + " → 解析 view_page 取得 " + formItems.size() + " 字段"); - } + formItems = buildFormItemsFromPage(pageId, entityId, pageRoot, result); // 多 由 buildFormBody 解析为 amis tabs(见该方法);无 layout 退两栏排版 } else { result.degrade("form@pageid=" + pageId + " 无法解析 view_page(缺解析器/页面不存在)→ 空表单壳"); @@ -1983,7 +2016,8 @@ public class TemplateToAmisConverter { // tree(树 / 树+grid) // ────────────────────────────────────────────────────────────────────── - private Map convertTree(Element tree, ConversionResult result, String templateName) { + private Map convertTree(Element tree, ConversionResult result, + Function pageResolver, String templateName) { // type=4:树+grid 引用式( + ) Element treeTemplate = tree.element("treetemplate"); Element gridTemplate = tree.element("gridtemplate"); @@ -1992,7 +2026,9 @@ public class TemplateToAmisConverter { } // type=3:声明式树(含 )—— 管理页,本应可编辑(增/改/删分类节点)。 - Element node = tree.element("node"); + // 一棵 tree 可能多个 :优先选含 edit=true+pageid 的可编辑数据节点(菜单维护根 node 在前但第一个即可编辑, + // 新闻收藏分类仅一个 node;稳妥起见多 node 时选可编辑节点),否则回退第一个 。 + Element node = selectEditableNode(tree); Map treeSchema = new LinkedHashMap<>(); treeSchema.put("type", "input-tree"); treeSchema.put("name", "tree"); @@ -2024,6 +2060,20 @@ public class TemplateToAmisConverter { if (node.element("nextnodes") != null && !node.element("nextnodes").elements().isEmpty()) { 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 + 弹窗新增(管理页可编辑)。 // 实体来自 (type=4 来自 treetemplate);source/reload 同源(currentTemplateId)。 treeCrud = applyTreeNodeCrudFromNode(treeSchema, node, entityId, @@ -2162,6 +2212,210 @@ public class TemplateToAmisConverter { return page(treeGridTitle, hbox); } + /** type=3 声明式树节点的 buttons 解析结果:增/改/删能力 + 新增/删除服务流名。 */ + private record NodeButtons(boolean hasInsert, boolean hasUpdate, boolean hasDelete, + String addSvc, String deleteSvc) {} + + /** + * 解析 {@code } 的增删改保存按钮 → {@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 }:优先选含 {@code edit='true'} 且 {@code pageid} 的可编辑数据节点 + * (菜单维护根 node 在前但第一个即可编辑,新闻收藏分类仅一个 node;多 node 时稳妥选可编辑节点)。 + * 无可编辑节点 → 回退第一个 {@code }(保持现有「取第一个」语义)。 + */ + 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})忠实生成,与编辑表单页同源——不手写控件。 + * + *

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 buildEditableTreeMasterDetail(Element node, String pageId, String table, + NodeButtons nb, Map treeSchema, + String treeCompId, + Function 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> 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 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 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 svcApi = new LinkedHashMap<>(); + svcApi.put("method", "get"); + svcApi.put("url", "/api/entity/" + table + "/${selId}"); + svcApi.put("sendOn", "${selId}"); + Map service = new LinkedHashMap<>(); + service.put("type", "service"); + service.put("id", serviceId); + service.put("api", svcApi); + service.put("body", List.of(form)); + + // ── 工具栏:添加(清空选中+清空表单)+ 删除(删选中节点) ── + List> toolbarBtns = new ArrayList<>(); + if (nb.hasInsert()) { + // 添加:清空树选中(selId="") + 清空表单各字段值(开新增态) + Map clearTree = new LinkedHashMap<>(); + clearTree.put("actionType", "setValue"); + clearTree.put("componentId", treeCompId); + clearTree.put("args", new LinkedHashMap<>(Map.of("value", ""))); + Map emptyForm = new LinkedHashMap<>(); + for (Map fi : formItems) { + Object fname = fi.get("name"); + if (fname != null && !String.valueOf(fname).isBlank()) { + emptyForm.put(String.valueOf(fname), ""); + } + } + emptyForm.put(pk, ""); // 主键清空 → save 服务流按空主键走新增 + Map clearForm = new LinkedHashMap<>(); + clearForm.put("actionType", "setValue"); + clearForm.put("componentId", formId); + clearForm.put("args", new LinkedHashMap<>(Map.of("value", emptyForm))); + Map onClick = new LinkedHashMap<>(Map.of( + "actions", List.of(clearTree, clearForm))); + Map 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 delApi = new LinkedHashMap<>(); + delApi.put("method", "post"); + delApi.put("url", "/api/flow/" + nb.deleteSvc()); + delApi.put("data", mapOf(pk, "${selId}")); + Map 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 toolbar = new LinkedHashMap<>(); + toolbar.put("type", "button-toolbar"); + toolbar.put("className", "m-b-sm"); + toolbar.put("buttons", toolbarBtns); + + // ── 两栏 grid:左树 md=4,右编辑区 md=8 ── + Map leftCol = new LinkedHashMap<>(); + leftCol.put("md", 4); + leftCol.put("columnClassName", "b-r pr-md"); + leftCol.put("body", List.of(treeSchema)); + + Map rightCol = new LinkedHashMap<>(); + rightCol.put("md", 8); + rightCol.put("columnClassName", "pl-md"); + rightCol.put("body", List.of(toolbar, service)); + + Map 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 } 的增/改/删 → amis InputTree 原生 * {@code editable}/{@code removable} + {@code editApi}/{@code deleteApi},新增走弹窗表单按钮。 @@ -2186,23 +2440,9 @@ public class TemplateToAmisConverter { if (buttonsEl == null || buttonsEl.elements("button").isEmpty()) { return null; } - boolean hasInsert = false, hasUpdate = false, hasDelete = false; - String addSvc = "", deleteSvc = ""; - 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 -> { } - } - } + NodeButtons nb = parseNodeButtons(node); + boolean hasInsert = nb.hasInsert(), hasUpdate = nb.hasUpdate(), hasDelete = nb.hasDelete(); + String addSvc = nb.addSvc(), deleteSvc = nb.deleteSvc(); String treeTable = resolveTableName(entityId, result); if (treeTable == null || treeTable.isBlank() || treeTable.startsWith("UNKNOWN_") || treeTable.startsWith("ORPHAN_")) { diff --git a/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java b/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java index 64bcd92..0e095e4 100644 --- a/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java +++ b/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java @@ -986,13 +986,178 @@ class TemplateToAmisConverterTest { } /** - * 菜单维护 dogfooding:type=3 管理树的节点 <node pageid> 指向真实编辑页时,节点 CRUD 应升级为 - * 老系统式「工具栏(新增/修改/删除) + 树」——选中节点后修改/删除作用其上,修改打开全字段表单(initApi 载入 - * 选中节点数据)。树包进无面板 form 使选中值 ${tree} 可被工具栏按钮引用;不再用内联 editable/removable。 + * 可编辑 type=3 树(pageid + buttons 有 save 服务名)→ master-detail(左树 + 右「选中节点载入的编辑表单」), + * 取代「工具栏 + 弹窗」。右表单字段由 pageid 的 view_page 经 UiTypeMapper.mapField 忠实生成 + * (SelectDialog+dialogid → picker,TextField → input-text)。 + * + *

判定条件:{@code pageId 非空 且 addSvc 非空 且 (hasInsert||hasUpdate)}(不强制 edit='true', + * 真实可编辑分类树节点既有 edit=true 也有靠 buttons 表达;isroot 且 edit=false 的纯根 selectservice + * 节点无 pageid,自然不走)。 */ @Test @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 = "" + + "" + + "" + + "" + + "" + + ""; + Function resolver = pid -> "PAGE1".equals(pid) + ? "" + + "" + + "" + + "" + : null; + ConversionResult r = c.convertGraded(xml, "TID", "新闻收藏分类", new ArrayList<>(), resolver); + assertEquals("tree", r.getRootElement()); + + // 顶层 = page → body = grid(2 列:左树 md=4,右编辑区 md=8) + Map grid = body(r.getSchema()); + assertEquals("grid", grid.get("type"), "可编辑树 master-detail:body 应是 grid 两栏"); + List> cols = (List>) grid.get("columns"); + assertEquals(2, cols.size(), "应有左树/右编辑两列"); + + // 左列:input-tree(source=/api/template/TID/tree, name=selId) + List> leftBody = (List>) cols.get(0).get("body"); + Map leftTree = null; + for (Map 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> rightBody = (List>) cols.get(1).get("body"); + Map toolbar = null; + Map service = null; + for (Map 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> tbBtns = (List>) toolbar.get("buttons"); + Map delBtn = null; + Map addBtn = null; + for (Map 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 delApi = (Map) delBtn.get("api"); + assertEquals("/api/flow/OA_X_DELETE", delApi.get("url")); + assertEquals("${selId}", ((Map) delApi.get("data")).get("PM_DEMO_ID")); + + // service:api 按选中节点主键载入 /api/entity/PM_DEMO/${selId}, sendOn=${selId} + Map svcApi = (Map) 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> svcBody = (List>) service.get("body"); + Map form = svcBody.get(0); + assertEquals("form", form.get("type")); + assertEquals("post:/api/flow/OA_X_ADD", form.get("api")); + List> actions = (List>) form.get("actions"); + Map submit = actions.get(0); + assertEquals("submit", submit.get("type")); + assertEquals("保存", submit.get("label")); + + // form.body:UiTypeMapper 忠实字段——TYPENAME=input-text,MENUROOT(SelectDialog+dialogid)=picker + List> formItems = (List>) form.get("body"); + Map byName = new java.util.HashMap<>(); + for (Map 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 含多个 <node>——可编辑数据节点(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 = "" + + "" + + "" + + "" + + "" + + "" + + "" + + ""; + ConversionResult r = c.convertGraded(xml, "menu-tmpl", "菜单维护", new ArrayList<>(), noPage); + Map grid = body(r.getSchema()); + assertEquals("grid", grid.get("type"), "多 node 时选可编辑节点(edit=true+pageid)走 master-detail"); + List> cols = (List>) grid.get("columns"); + List> rightBody = (List>) cols.get(1).get("body"); + Map service = null; + for (Map it : rightBody) { + if ("service".equals(it.get("type"))) { + service = it; + } + } + assertNotNull(service); + List> svcBody = (List>) 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 = "" + + "" + + ""; + ConversionResult r = c.convertGraded(xml, "menu-tmpl", "菜单维护", new ArrayList<>(), noPage); + Map 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][]); String xml = "" + "" @@ -1004,40 +1169,55 @@ class TemplateToAmisConverterTest { + ""; ConversionResult r = c.convertGraded(xml, "menu-tmpl", "菜单维护", new ArrayList<>(), noPage); assertEquals("tree", r.getRootElement()); - Map form = body(r.getSchema()); - assertEquals("form", form.get("type"), "工具栏+树须包进 form(选中值 ${tree} 供工具栏引用)"); - List> fb = (List>) form.get("body"); - // 末项=树本体,去内联编辑 - Map tree = fb.get(fb.size() - 1); - assertEquals("input-tree", tree.get("type")); - assertEquals("/api/template/menu-tmpl/tree", tree.get("source")); - assertNull(tree.get("editable"), "工具栏模式不再内联改名"); - assertNull(tree.get("removable"), "工具栏模式不再内联删除"); - // 工具栏按钮:按 label 收集 - Map> byLabel = new java.util.HashMap<>(); - for (Map it : fb) { - if ("button".equals(it.get("type"))) { - byLabel.put(String.valueOf(it.get("label")), it); + Map grid = body(r.getSchema()); + assertEquals("grid", grid.get("type"), "pageid+save → master-detail(grid 两栏),不再工具栏+弹窗"); + List> cols = (List>) grid.get("columns"); + assertEquals(2, cols.size()); + + // 左树 source/selId + List> leftBody = (List>) cols.get(0).get("body"); + Map leftTree = null; + for (Map it : leftBody) { + if ("input-tree".equals(it.get("type"))) { + leftTree = it; } } - assertTrue(byLabel.containsKey("新增"), "工具栏含 新增"); - assertTrue(byLabel.containsKey("修改"), "工具栏含 修改"); - assertTrue(byLabel.containsKey("删除"), "工具栏含 删除"); - // 修改:无选中禁用 + 弹窗 service.api 载入选中节点 /api/entity/PM_DEMO/${tree} - Map edit = byLabel.get("修改"); - assertEquals("${!tree}", edit.get("disabledOn")); - Map editDialog = (Map) edit.get("dialog"); - Map editService = (Map) editDialog.get("body"); - assertEquals("get:/api/page/schema/PAGE1?format=amis", editService.get("schemaApi")); - Map editApi = (Map) editService.get("api"); - assertEquals("/api/entity/PM_DEMO/${tree}", editApi.get("url")); - // 删除:无选中禁用 + ajax 删除服务流,pk=${tree} - Map del = byLabel.get("删除"); - assertEquals("${!tree}", del.get("disabledOn")); - assertEquals("ajax", del.get("actionType")); + assertNotNull(leftTree); + assertEquals("/api/template/menu-tmpl/tree", leftTree.get("source")); + assertEquals("selId", leftTree.get("name")); + + // 右列 service:载入选中节点 /api/entity/PM_DEMO/${selId};form 保存到 SYS_MENU_ADD + List> rightBody = (List>) cols.get(1).get("body"); + Map service = null; + Map toolbar = null; + for (Map it : rightBody) { + if ("service".equals(it.get("type"))) { + service = it; + } + if ("button-toolbar".equals(it.get("type"))) { + toolbar = it; + } + } + assertNotNull(service); + Map svcApi = (Map) service.get("api"); + assertEquals("/api/entity/PM_DEMO/${selId}", svcApi.get("url")); + List> svcBody = (List>) service.get("body"); + Map form = svcBody.get(0); + assertEquals("post:/api/flow/SYS_MENU_ADD", form.get("api")); + + // 删除按钮 → SYS_MENU_DELETE,PK=${selId} + assertNotNull(toolbar); + List> tbBtns = (List>) toolbar.get("buttons"); + Map del = null; + for (Map b : tbBtns) { + if ("删除".equals(b.get("label"))) { + del = b; + } + } + assertNotNull(del); Map delApi = (Map) del.get("api"); assertEquals("/api/flow/SYS_MENU_DELETE", delApi.get("url")); - assertEquals("${tree}", ((Map) delApi.get("data")).get("PM_DEMO_ID")); + assertEquals("${selId}", ((Map) delApi.get("data")).get("PM_DEMO_ID")); } @Test