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 92d028d..a896fb7 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 @@ -2729,9 +2729,21 @@ public class TemplateToAmisConverter { treeSchema.put("heightAuto", true); // ── 右表单字段(pageid → view_page,UiTypeMapper 忠实映射)── + // 解析 pageRoot:既供字段映射,也供 buildFormBody 按 的
槽位排版 + + // 隐藏未布局字段(老引擎 FormPageTemplateComponent 用 Vaadin CustomLayout,只渲染有 location + // 槽位的字段;VERSION/主键/引用 id 等无槽位 → 绑进 FieldGroup 供提交但不显示)。 + Element pageRoot = null; List> formItems; try { - formItems = buildFormItemsFromPage(pageId, entityId, pageResolver, result); + String pageXml = (pageResolver != null && pageId != null && !pageId.isBlank()) + ? pageResolver.apply(pageId) : null; + if (pageXml != null && !pageXml.isBlank()) { + pageRoot = DocumentHelper.parseText(pageXml).getRootElement(); + } else { + result.degrade("tree(type=3) master-detail: 右表单 pageid=" + pageId + + " 无法解析 view_page(缺解析器/页面不存在)→ 空字段壳"); + } + formItems = buildFormItemsFromPage(pageId, entityId, pageRoot, result); } catch (Exception e) { result.degrade("tree(type=3) master-detail: 右表单 pageid=" + pageId + " 解析失败(" + e.getClass().getSimpleName() + ") → 空字段壳"); @@ -2770,7 +2782,9 @@ public class TemplateToAmisConverter { form.put("horizontal", new LinkedHashMap<>(Map.of("left", 3, "right", 8))); form.put("initApi", initApi); form.put("api", "post:/api/flow/" + nb.addSvc()); - form.put("body", formItems); + // 按 的
槽位排版 + 隐藏未布局字段(与 EDITFORM convertForm 同口径 buildFormBody): + // 修「树编辑表单泄露 VERSION/主键/引用 id 等隐藏字段 + 裸列名标签」;无 layout → buildFormBody 退两栏平铺。 + form.put("body", buildFormBody(pageRoot, formItems, result)); form.put("actions", List.of(submit)); // ── 工具栏:添加(清空选中+清空表单)+ 删除(删选中节点) ── 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 0e28c45..4ce4992 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 @@ -1601,12 +1601,11 @@ class TemplateToAmisConverterTest { 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"); + // form.body:经 buildFormBody 按 排版(本 mock 无 → buildFormRows 两栏分组), + // 字段被包进行组容器,故递归收集字段名→type。UiTypeMapper 忠实字段——TYPENAME=input-text, + // MENUROOT(SelectDialog+dialogid)=picker。 Map byName = new java.util.HashMap<>(); - for (Map it : formItems) { - byName.put(String.valueOf(it.get("name")), it.get("type")); - } + collectFieldTypes(form.get("body"), byName); 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 直存形态, @@ -1614,6 +1613,26 @@ class TemplateToAmisConverterTest { // bespoke 本身亦不过严格闸一,故此处不挂 SchemaGate 断言(保持与 live 一致)。 } + /** 递归收集表单 body 里所有带 name+type 的字段项 → {name: type}(穿透 buildFormBody 的 group/grid/tabs 容器)。 */ + @SuppressWarnings("unchecked") + private static void collectFieldTypes(Object node, Map out) { + if (node instanceof Map) { + Map m = (Map) node; + Object name = m.get("name"); + Object type = m.get("type"); + if (name != null && type instanceof String && !"form".equals(type)) { + out.putIfAbsent(String.valueOf(name), type); + } + for (Object v : m.values()) { + collectFieldTypes(v, out); + } + } else if (node instanceof List) { + for (Object x : (List) node) { + collectFieldTypes(x, out); + } + } + } + /** * 菜单维护:一棵 tree 含多个 <node>——可编辑数据节点(edit=true + pageid)+ 纯根节点 * (isroot=true edit=false selectservice,无 pageid)。须选可编辑节点作 master-detail 数据节点,