fix(converter): master-detail 右侧 service→form initApi + pageId 放 api.data(picker 加载显名)

spike 实证:amis picker 仅挂载时值已在才经 source 解析,service 包裹异步填值→裸id;form initApi 载入时正确触发解析。改 buildEditableTreeMasterDetail 右侧 service(api)>form → form initApi。pageId 必须放 api.data(GET 时 amis 拼成 query 发出)——url 内联 ?pageId= amis 不可靠发出致后端收不到、退化裸id(真实页网络实证)。配合后端 ?pageId 把引用字段解析成 {_id,_label} 对象,picker 自带 label 即显名(切节点动态重取每次都显名);提交值仍 _id。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-06-16 17:58:23 +08:00
parent 76ad354605
commit 4468616e88
2 changed files with 48 additions and 41 deletions

View File

@@ -2309,7 +2309,6 @@ public class TemplateToAmisConverter {
} }
String formId = table.toLowerCase() + "_editform"; String formId = table.toLowerCase() + "_editform";
String serviceId = table.toLowerCase() + "_detail";
String formTitle = templateName != null ? templateName : ""; String formTitle = templateName != null ? templateName : "";
// 保存动作:submit → post /api/flow/{addSvc},成功 reload 左树 // 保存动作:submit → post /api/flow/{addSvc},成功 reload 左树
@@ -2320,27 +2319,30 @@ public class TemplateToAmisConverter {
submit.put("icon", "fa fa-save"); submit.put("icon", "fa fa-save");
submit.put("reload", treeCompId); submit.put("reload", treeCompId);
// form initApi:按选中节点主键 ${selId} 动态载入编辑表单数据,带 pageId 让后端把引用字段
// (SelectDialog/MultiSelectDialog)解析为 {_id,_label} 对象——picker 自带 label 即显名,
// 不依赖 source 补拉(spike 实证:service 包裹 picker 加载已存值只显裸 id;form initApi+对象值 → 显名)。
// pageId 必须放 api.data(GET 时 amis 拼成 query 发出)——url 内联 ?pageId= amis 不可靠发出(spike 实证:
// url-query 丢失致后端收不到 pageId、退化返裸 id)。sendOn=${selId} 使空选中(添加态)不触发坏请求。
Map<String, Object> initApi = new LinkedHashMap<>();
initApi.put("method", "get");
initApi.put("url", "/api/entity/" + table + "/${selId}");
Map<String, Object> initData = new LinkedHashMap<>();
initData.put("pageId", pageId);
initApi.put("data", initData);
initApi.put("sendOn", "${selId}");
Map<String, Object> form = new LinkedHashMap<>(); Map<String, Object> form = new LinkedHashMap<>();
form.put("type", "form"); form.put("type", "form");
form.put("id", formId); form.put("id", formId);
form.put("title", formTitle); form.put("title", formTitle);
form.put("mode", "horizontal"); form.put("mode", "horizontal");
form.put("horizontal", new LinkedHashMap<>(Map.of("left", 3, "right", 8))); 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("api", "post:/api/flow/" + nb.addSvc());
form.put("body", formItems); form.put("body", formItems);
form.put("actions", List.of(submit)); 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<>(); List<Map<String, Object>> toolbarBtns = new ArrayList<>();
if (nb.hasInsert()) { if (nb.hasInsert()) {
@@ -2402,7 +2404,7 @@ public class TemplateToAmisConverter {
Map<String, Object> rightCol = new LinkedHashMap<>(); Map<String, Object> rightCol = new LinkedHashMap<>();
rightCol.put("md", 8); rightCol.put("md", 8);
rightCol.put("columnClassName", "pl-md"); rightCol.put("columnClassName", "pl-md");
rightCol.put("body", List.of(toolbar, service)); rightCol.put("body", List.of(toolbar, form));
Map<String, Object> grid = new LinkedHashMap<>(); Map<String, Object> grid = new LinkedHashMap<>();
grid.put("type", "grid"); grid.put("type", "grid");

View File

@@ -1035,20 +1035,20 @@ class TemplateToAmisConverterTest {
assertEquals(false, leftTree.get("label")); assertEquals(false, leftTree.get("label"));
assertEquals(100000, leftTree.get("virtualThreshold")); assertEquals(100000, leftTree.get("virtualThreshold"));
// 右列:button-toolbar(含 删除)+ service(载入选中节点) + form(UiTypeMapper 字段) // 右列:button-toolbar(含 删除)+ form(initApi 动态载入选中节点 + UiTypeMapper 字段)
List<Map<String, Object>> rightBody = (List<Map<String, Object>>) cols.get(1).get("body"); List<Map<String, Object>> rightBody = (List<Map<String, Object>>) cols.get(1).get("body");
Map<String, Object> toolbar = null; Map<String, Object> toolbar = null;
Map<String, Object> service = null; Map<String, Object> form = null;
for (Map<String, Object> it : rightBody) { for (Map<String, Object> it : rightBody) {
if ("button-toolbar".equals(it.get("type"))) { if ("button-toolbar".equals(it.get("type"))) {
toolbar = it; toolbar = it;
} }
if ("service".equals(it.get("type"))) { if ("form".equals(it.get("type"))) {
service = it; form = it;
} }
} }
assertNotNull(toolbar, "右列应含 button-toolbar"); assertNotNull(toolbar, "右列应含 button-toolbar");
assertNotNull(service, "右列应含 service(按选中节点载入编辑表单)"); assertNotNull(form, "右列应直接含 form(initApi 动态载入,不再 service 包裹)");
// 工具栏:删除按钮 → ajax /api/flow/OA_X_DELETE,data 含 PK=${selId} // 工具栏:删除按钮 → ajax /api/flow/OA_X_DELETE,data 含 PK=${selId}
List<Map<String, Object>> tbBtns = (List<Map<String, Object>>) toolbar.get("buttons"); List<Map<String, Object>> tbBtns = (List<Map<String, Object>>) toolbar.get("buttons");
@@ -1069,15 +1069,20 @@ class TemplateToAmisConverterTest {
assertEquals("/api/flow/OA_X_DELETE", delApi.get("url")); assertEquals("/api/flow/OA_X_DELETE", delApi.get("url"));
assertEquals("${selId}", ((Map<String, Object>) delApi.get("data")).get("PM_DEMO_ID")); assertEquals("${selId}", ((Map<String, Object>) delApi.get("data")).get("PM_DEMO_ID"));
// service:api 按选中节点主键载入 /api/entity/PM_DEMO/${selId}, sendOn=${selId} // form.initApi:按选中节点主键动态载入 /api/entity/PM_DEMO/${selId}, data.pageId=PAGE1, sendOn=${selId}
Map<String, Object> svcApi = (Map<String, Object>) service.get("api"); // (pageId 放 data——GET 时 amis 拼成 query 发出;url 内联 ?pageId= amis 不可靠发出。让后端把引用字段
assertEquals("/api/entity/PM_DEMO/${selId}", svcApi.get("url")); // 解析为 {_id,_label} 对象,picker 自带 label 即显名)
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("form", form.get("type"));
Map<String, Object> initApi = (Map<String, Object>) form.get("initApi");
assertNotNull(initApi, "form 应有 initApi(替代旧 service 包裹)");
assertEquals("/api/entity/PM_DEMO/${selId}", initApi.get("url"));
Map<String, Object> initData = (Map<String, Object>) initApi.get("data");
assertNotNull(initData, "initApi 应把 pageId 放 data(GET 拼 query),而非 url 内联");
assertEquals("PAGE1", initData.get("pageId"));
assertEquals("${selId}", initApi.get("sendOn"));
assertEquals("get", initApi.get("method"));
// form:api=post:/api/flow/OA_X_ADD(保存),actions submit label 保存
assertEquals("post:/api/flow/OA_X_ADD", form.get("api")); assertEquals("post:/api/flow/OA_X_ADD", form.get("api"));
List<Map<String, Object>> actions = (List<Map<String, Object>>) form.get("actions"); List<Map<String, Object>> actions = (List<Map<String, Object>>) form.get("actions");
Map<String, Object> submit = actions.get(0); Map<String, Object> submit = actions.get(0);
@@ -1122,15 +1127,14 @@ class TemplateToAmisConverterTest {
assertEquals("grid", grid.get("type"), "多 node 时选可编辑节点(edit=true+pageid)走 master-detail"); 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>> cols = (List<Map<String, Object>>) grid.get("columns");
List<Map<String, Object>> rightBody = (List<Map<String, Object>>) cols.get(1).get("body"); List<Map<String, Object>> rightBody = (List<Map<String, Object>>) cols.get(1).get("body");
Map<String, Object> service = null; Map<String, Object> form = null;
for (Map<String, Object> it : rightBody) { for (Map<String, Object> it : rightBody) {
if ("service".equals(it.get("type"))) { if ("form".equals(it.get("type"))) {
service = it; form = it;
} }
} }
assertNotNull(service); assertNotNull(form);
List<Map<String, Object>> svcBody = (List<Map<String, Object>>) service.get("body"); assertEquals("post:/api/flow/SYS_MENU_ADD", form.get("api"),
assertEquals("post:/api/flow/SYS_MENU_ADD", svcBody.get(0).get("api"),
"右表单保存到可编辑节点的 save 服务流"); "右表单保存到可编辑节点的 save 服务流");
} }
@@ -1186,23 +1190,24 @@ class TemplateToAmisConverterTest {
assertEquals("/api/template/menu-tmpl/tree", leftTree.get("source")); assertEquals("/api/template/menu-tmpl/tree", leftTree.get("source"));
assertEquals("selId", leftTree.get("name")); assertEquals("selId", leftTree.get("name"));
// 右列 service:载入选中节点 /api/entity/PM_DEMO/${selId};form 保存到 SYS_MENU_ADD // 右列 form.initApi:动态载入选中节点 /api/entity/PM_DEMO/${selId}?pageId=PAGE1;form 保存到 SYS_MENU_ADD
List<Map<String, Object>> rightBody = (List<Map<String, Object>>) cols.get(1).get("body"); List<Map<String, Object>> rightBody = (List<Map<String, Object>>) cols.get(1).get("body");
Map<String, Object> service = null; Map<String, Object> form = null;
Map<String, Object> toolbar = null; Map<String, Object> toolbar = null;
for (Map<String, Object> it : rightBody) { for (Map<String, Object> it : rightBody) {
if ("service".equals(it.get("type"))) { if ("form".equals(it.get("type"))) {
service = it; form = it;
} }
if ("button-toolbar".equals(it.get("type"))) { if ("button-toolbar".equals(it.get("type"))) {
toolbar = it; toolbar = it;
} }
} }
assertNotNull(service); assertNotNull(form);
Map<String, Object> svcApi = (Map<String, Object>) service.get("api"); Map<String, Object> initApi = (Map<String, Object>) form.get("initApi");
assertEquals("/api/entity/PM_DEMO/${selId}", svcApi.get("url")); assertNotNull(initApi);
List<Map<String, Object>> svcBody = (List<Map<String, Object>>) service.get("body"); assertEquals("/api/entity/PM_DEMO/${selId}", initApi.get("url"));
Map<String, Object> form = svcBody.get(0); assertEquals("PAGE1", ((Map<String, Object>) initApi.get("data")).get("pageId"));
assertEquals("${selId}", initApi.get("sendOn"));
assertEquals("post:/api/flow/SYS_MENU_ADD", form.get("api")); assertEquals("post:/api/flow/SYS_MENU_ADD", form.get("api"));
// 删除按钮 → SYS_MENU_DELETE,PK=${selId} // 删除按钮 → SYS_MENU_DELETE,PK=${selId}