F2-17: 列表增改删全链路打通(#3过滤+#4按钮组)

#3 查询不过滤:转换器 crud api 去显式 query 模板(amis 自动序列化 filter+分页)
#4 按钮组:
  - 添加/修改/查看 → dialog service 加载 EDITFORM schema(get:前缀强制GET;
    /api/page/schema?format=amis 返回 {status,data} 信封,适配 amis service.schemaApi)
  - 修改/查看 → 选中行整行并入 dialog 数据域,form 字段按 name 回显(实测TITLE回显)
  - 删除 → bulkActions(amis 批量槽,${ids};headerToolbar 单选不填 selectedItems);
    后端 EntityWriteController 支持 ids 多删,实测删除成功 DB isactive=0
PageSchemaController 新增 ?format=amis 信封模式(默认裸 schema 不变,ETag 仅裸模式)
e2e 80/80;转换器 46 单测 + metadata 163 单测全绿

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
2026-06-12 08:47:29 +08:00
parent 4519f6a0e5
commit 29199e6ead
5 changed files with 1108 additions and 780 deletions

View File

@@ -126,7 +126,8 @@ public class TemplateToAmisConverter {
List<Map<String, Object>> columns = display != null ? buildColumns(display, entityId, result) : new ArrayList<>(); List<Map<String, Object>> columns = display != null ? buildColumns(display, entityId, result) : new ArrayList<>();
Map<String, Object> filter = buildSearchFilter(crud.element("search"), result); Map<String, Object> filter = buildSearchFilter(crud.element("search"), result);
List<Object> toolbar = buildToolbar(collectButtons(crud), table, result); List<Map<String, Object>> bulkActions = new ArrayList<>();
List<Object> toolbar = buildToolbar(collectButtons(crud), table, bulkActions, result);
// 主子表识别:display 段含 <subtemplate>/<detail> 指向子表,或 crud 含 ismaster 标记 // 主子表识别:display 段含 <subtemplate>/<detail> 指向子表,或 crud 含 ismaster 标记
boolean masterSub = crud.element("subtemplate") != null boolean masterSub = crud.element("subtemplate") != null
@@ -139,11 +140,18 @@ public class TemplateToAmisConverter {
crudSchema.put("type", "crud"); crudSchema.put("type", "crud");
crudSchema.put("api", listApi(crud, table)); crudSchema.put("api", listApi(crud, table));
crudSchema.put("syncLocation", false); crudSchema.put("syncLocation", false);
// F2-17:selectable=true 启用行级 checkbox,selectedItems 供修改/查看/删除按钮使用
crudSchema.put("selectable", true);
if (filter != null) { if (filter != null) {
crudSchema.put("filter", filter); crudSchema.put("filter", filter);
} }
crudSchema.put("columns", columns); crudSchema.put("columns", columns);
crudSchema.put("headerToolbar", toolbar); crudSchema.put("headerToolbar", toolbar);
// F2-17:删除走 bulkActions(amis 标准批量操作槽,可靠提供 ${ids};headerToolbar
// 单选 radio 不填充 selectedItems 字段访问)。bulkActions 非空才设。
if (!bulkActions.isEmpty()) {
crudSchema.put("bulkActions", bulkActions);
}
crudSchema.put("primaryField", table + "_ID"); crudSchema.put("primaryField", table + "_ID");
return page(title, crudSchema); return page(title, crudSchema);
@@ -393,7 +401,8 @@ public class TemplateToAmisConverter {
return buttons; return buttons;
} }
private List<Object> buildToolbar(List<Element> buttons, String table, ConversionResult result) { private List<Object> buildToolbar(List<Element> buttons, String table,
List<Map<String, Object>> bulkActions, ConversionResult result) {
List<Object> toolbar = new ArrayList<>(); List<Object> toolbar = new ArrayList<>();
toolbar.add("bulkActions"); toolbar.add("bulkActions");
for (Element b : buttons) { for (Element b : buttons) {
@@ -401,34 +410,59 @@ public class TemplateToAmisConverter {
continue; continue;
} }
String btnType = b.attributeValue("type", ""); String btnType = b.attributeValue("type", "");
String btnName = UiTypeMapper.firstNonBlank(b.attributeValue("name"), b.attributeValue("id"), btnType);
Map<String, Object> btn = new LinkedHashMap<>(); Map<String, Object> btn = new LinkedHashMap<>();
btn.put("type", "button"); btn.put("type", "button");
btn.put("label", UiTypeMapper.firstNonBlank(b.attributeValue("name"), b.attributeValue("id"), btnType)); btn.put("label", btnName);
switch (btnType) { switch (btnType) {
case "insert" -> { case "insert" -> {
String pageId = b.attributeValue("pageid", "");
String editFormTemplateId = resolveEditFormTemplateId(pageId, result);
btn.put("level", "primary"); btn.put("level", "primary");
btn.put("actionType", "dialog"); btn.put("actionType", "dialog");
Map<String, Object> dlg = new LinkedHashMap<>(); Map<String, Object> dlg = buildFormDialog(btnName, editFormTemplateId, null, false, result);
dlg.put("type", "dialog");
dlg.put("title", b.attributeValue("name", "新增"));
dlg.put("body", Map.of("type", "tpl",
"tpl", "表单页(pageid=" + b.attributeValue("pageid", "") + ")待 EDITFORM 模板联动"));
btn.put("dialog", dlg); btn.put("dialog", dlg);
result.note("button[insert] " + b.attributeValue("name") + " → dialog 占位(指向 pageid=" result.note("button[insert] " + btnName + " → dialog 加载 /api/page/schema/" + editFormTemplateId
+ b.attributeValue("pageid", "") + ",需 EDITFORM 转换器联动)"); + "(pageid=" + pageId + ")");
} }
case "delete" -> { case "delete" -> {
btn.put("level", "danger"); // F2-17:删除入 bulkActions(amis 批量操作槽,自动注入 ${ids}=选中行主键逗号串;
btn.put("actionType", "ajax"); // 后端 EntityWriteController.delete 支持 ids 多删)。不进 headerToolbar。
btn.put("confirmText", UiTypeMapper.firstNonBlank(b.attributeValue("showmsg"), "确认删除选中记录?")); Map<String, Object> del = new LinkedHashMap<>();
btn.put("api", "delete:/api/entity/" + table + "/${ids}"); del.put("type", "button");
result.note("button[delete] → ajax DELETE /api/entity/" + table + "/${ids}(REST 端点待实现)"); del.put("label", btnName);
del.put("level", "danger");
del.put("actionType", "ajax");
del.put("confirmText", UiTypeMapper.firstNonBlank(b.attributeValue("showmsg"), "确认删除选中记录?"));
del.put("api", "POST:/api/entity/" + table + "/delete");
del.put("data", new LinkedHashMap<>(Map.of("ids", "${ids}")));
bulkActions.add(del);
result.note("button[delete] → bulkActions ajax POST /api/entity/" + table + "/delete(ids=${ids})");
continue;
} }
case "update" -> { case "update" -> {
String pageId = b.attributeValue("pageid", "");
String editFormTemplateId = resolveEditFormTemplateId(pageId, result);
btn.put("actionType", "dialog"); btn.put("actionType", "dialog");
result.note("button[update] " + b.attributeValue("name") + " → 编辑 dialog 占位(需 EDITFORM 联动)"); btn.put("disabledOn", "${!selectedItems || selectedItems.length === 0}");
Map<String, Object> dlg = buildFormDialog(btnName, editFormTemplateId,
table + "_ID", false, table, result);
btn.put("dialog", dlg);
result.note("button[update] " + btnName + " → dialog 加载 /api/page/schema/" + editFormTemplateId
+ ",传选中行主键(pageid=" + pageId + ")");
} }
default -> result.note("button[" + btnType + "] " + b.attributeValue("name") + " → 普通按钮占位"); case "read" -> {
String pageId = b.attributeValue("pageid", "");
String editFormTemplateId = resolveEditFormTemplateId(pageId, result);
btn.put("actionType", "dialog");
btn.put("disabledOn", "${!selectedItems || selectedItems.length === 0}");
Map<String, Object> dlg = buildFormDialog(btnName, editFormTemplateId,
table + "_ID", true, table, result);
btn.put("dialog", dlg);
result.note("button[read] " + btnName + " → dialog 加载 /api/page/schema/" + editFormTemplateId
+ "(查看态 static=true,pageid=" + pageId + ")");
}
default -> result.note("button[" + btnType + "] " + btnName + " → 普通按钮占位");
} }
toolbar.add(btn); toolbar.add(btn);
} }
@@ -436,14 +470,118 @@ public class TemplateToAmisConverter {
return toolbar; return toolbar;
} }
/**
* F2-17:构造 dialog body 为 service 加载 /api/page/schema/{templateId} 的 dialog。
*
* <p>insert(添加):service 加载 schema,无 initApi(新增无需回显)。
* <p>update(修改):service 加载 schema + initApi 回显(/api/entity/{table}/{id});
* 需选中行,dialog 传 primaryKey 上下文。
* <p>read(查看):同 update,但表单 static=true(只读)。
*
* @param title dialog 标题
* @param templateId EDITFORM 模板 id(为空时降级为 disabled+tooltip)
* @param primaryKey 主键列名(为 null 时为新增,无 initApi)
* @param readOnly 查看态:body 外层追加 static=true 覆盖
* @param result 转换结果(用于登记台账)
*/
private Map<String, Object> buildFormDialog(String title, String templateId,
String primaryKey, boolean readOnly,
ConversionResult result) {
return buildFormDialog(title, templateId, primaryKey, readOnly, null, result);
}
/**
* @param tableName 实体表名(update/read 模式下用于 service.api 拉取选中行数据回显;insert 传 null)
*/
private Map<String, Object> buildFormDialog(String title, String templateId,
String primaryKey, boolean readOnly,
String tableName, ConversionResult result) {
Map<String, Object> dlg = new LinkedHashMap<>();
dlg.put("type", "dialog");
dlg.put("title", title);
if (templateId == null || templateId.isBlank() || templateId.startsWith("MISSING_")) {
// 无 EDITFORM 映射:诚实降级,按钮 disabled + tooltip
Map<String, Object> tpl = new LinkedHashMap<>();
tpl.put("type", "tpl");
tpl.put("tpl", "该单据未配编辑表单");
dlg.put("body", tpl);
result.degrade("button dialog 无 EDITFORM 模板映射(templateId=" + templateId + ")→ 诚实降级");
return dlg;
}
// update/read:把选中行整行并入 dialog 数据域,内层 form 字段按 name 自动回显
// (列表行已含全部字段,免一次取数;无 primaryKey=新增,不传)
if (primaryKey != null && !primaryKey.isBlank()) {
// amis: {"&": "${selectedItems[0]}"} 将选中行所有键展开进当前作用域
dlg.put("data", new LinkedHashMap<>(Map.of("&", "${selectedItems[0]}")));
}
// service 加载页面 schema:
// - get: 前缀强制 GET(amis service.schemaApi 默认 POST,会撞后端 GET 端点 405)
// - format=amis:返回 {status,data} 信封(amis api 响应契约要求)
Map<String, Object> service = new LinkedHashMap<>();
service.put("type", "service");
service.put("schemaApi", "get:/api/page/schema/" + templateId + "?format=amis");
// 查看态:在 service 外层追加 static 覆盖(amis service 透传 static 给子组件)
if (readOnly) {
service.put("static", true);
}
dlg.put("body", service);
return dlg;
}
/**
* F2-17:通过 pageid 查对应的 EDITFORM 模板 id(view_template 表,pageid 含于 xml 属性中)。
*
* <p>查找口径:VIEW_TEMPLATE 表中 TYPE=7(EDITFORM)且 XML 含该 pageid 属性的模板,
* 同实体有多个时取 view_template_id 字典序首个(稳定可重复)。
*
* <p>pageid 为空或查无结果时返回 "MISSING_pageid" 占位(调用方降级处理,不抛异常)。
*
* @param pageId 按钮 pageid 属性值(view_page.id)
* @param result 转换结果(用于登记台账)
* @return EDITFORM 模板 id,或 "MISSING_{pageId}" 占位
*/
private String resolveEditFormTemplateId(String pageId, ConversionResult result) {
if (pageId == null || pageId.isBlank()) {
result.degrade("button pageid 为空 → 无法映射 EDITFORM 模板,诚实降级");
return "MISSING_empty";
}
try {
String templateId = jdbcTemplate.queryForObject(
"SELECT view_template_id FROM view_template "
+ "WHERE type=7 AND xml::text LIKE '%' || ? || '%' "
+ "ORDER BY view_template_id LIMIT 1",
String.class, pageId);
if (templateId != null && !templateId.isBlank()) {
result.note("button pageid=" + pageId + " → EDITFORM 模板 " + templateId);
return templateId.trim();
}
} catch (Exception e) {
result.note("button pageid=" + pageId + " EDITFORM 映射查询失败: " + safeMsg(e) + " → 降级");
}
result.degrade("button pageid=" + pageId + " 无对应 EDITFORM(type=7) 模板 → 诚实降级");
return "MISSING_" + pageId;
}
/**
* F2-17:crud api 改为裸路径,不带 query 参数模板。
*
* <p>amis GET 会自动将 page/perPage + filter 表单值全部序列化为 query,
* 带显式 query 模板(?page=${page}&perPage=${perPage})会使 amis 把其视为封闭参数列表,
* filter 数据不并入,导致搜索不过滤(F2-17 #3 根因)。
*/
private String listApi(Element crud, String table) { private String listApi(Element crud, String table) {
Element display = crud.element("display"); Element display = crud.element("display");
String selectservice = crud.attributeValue("selectservice", String selectservice = crud.attributeValue("selectservice",
display != null ? display.attributeValue("selectservice") : null); display != null ? display.attributeValue("selectservice") : null);
if (selectservice != null && !selectservice.isBlank()) { if (selectservice != null && !selectservice.isBlank()) {
return "/api/flow/" + selectservice + "?page=${page}&perPage=${perPage}"; return "/api/flow/" + selectservice;
} }
return "/api/entity/" + table + "/list?page=${page}&perPage=${perPage}"; return "/api/entity/" + table + "/list";
} }
// ────────────────────────────────────────────────────────────────────── // ──────────────────────────────────────────────────────────────────────

View File

@@ -65,8 +65,8 @@ class TemplateToAmisConverterTest {
assertEquals(false, cols.get(0).get("toggled")); // 隐藏列默认折叠 assertEquals(false, cols.get(0).get("toggled")); // 隐藏列默认折叠
assertEquals("number", cols.get(1).get("type")); // 金额列 number assertEquals("number", cols.get(1).get("type")); // 金额列 number
assertEquals("text-right", cols.get(1).get("className")); assertEquals("text-right", cols.get(1).get("className"));
// selectservice → api 走 /api/flow // selectservice → api 走 /api/flow(F2-17:裸路径,不带 query 参数)
assertTrue(((String) crud.get("api")).startsWith("/api/flow/SYS_LOGIN_SEARCH")); assertEquals("/api/flow/SYS_LOGIN_SEARCH", crud.get("api"));
} }
@Test @Test
@@ -115,11 +115,19 @@ class TemplateToAmisConverterTest {
+ "<method servicename='X_DELETE'/></button></crud>"; + "<method servicename='X_DELETE'/></button></crud>";
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage); ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
Map<String, Object> crud = body(r.getSchema()); Map<String, Object> crud = body(r.getSchema());
List<Object> toolbar = (List<Object>) crud.get("headerToolbar"); // F2-17: 删除入 bulkActions(amis 批量槽,${ids}),不在 headerToolbar
Map<String, Object> btn = (Map<String, Object>) toolbar.get(1); List<Map<String, Object>> bulk = (List<Map<String, Object>>) crud.get("bulkActions");
assertNotNull(bulk);
assertEquals(1, bulk.size());
Map<String, Object> btn = bulk.get(0);
assertEquals("ajax", btn.get("actionType")); assertEquals("ajax", btn.get("actionType"));
assertEquals("确认删除?", btn.get("confirmText")); assertEquals("确认删除?", btn.get("confirmText"));
assertTrue(((String) btn.get("api")).startsWith("delete:/api/entity/")); assertEquals("POST:/api/entity/PM_DEMO/delete", btn.get("api"));
Map<String, Object> data = (Map<String, Object>) btn.get("data");
assertEquals("${ids}", data.get("ids"));
// headerToolbar 只剩 bulkActions 占位 + pagination
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
assertEquals(2, toolbar.size());
} }
@Test @Test
@@ -131,6 +139,8 @@ class TemplateToAmisConverterTest {
List<Object> toolbar = (List<Object>) crud.get("headerToolbar"); List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
// bulkActions + pagination,无删除按钮 // bulkActions + pagination,无删除按钮
assertEquals(2, toolbar.size()); assertEquals(2, toolbar.size());
// isshow=false 的删除不进 bulkActions
assertNull(crud.get("bulkActions"));
} }
// ── form (EDITFORM) ────────────────────────────────────────────────── // ── form (EDITFORM) ──────────────────────────────────────────────────
@@ -673,4 +683,170 @@ class TemplateToAmisConverterTest {
assertEquals("STATUS", cols.get(0).get("name")); assertEquals("STATUS", cols.get(0).get("name"));
assertNull(cols.get(0).get("type")); // 无元数据,不注入 assertNull(cols.get(0).get("type")); // 无元数据,不注入
} }
// ── F2-17 #3 列表查询过滤(api 裸路径)────────────────────────────────────
@Test
@SuppressWarnings("unchecked")
void f2_17_crud_api裸路径不带query参数_selectservice() {
// selectservice → /api/flow/X(裸路径,amis 自动序列化 page/perPage + filter)
String xml = "<crud entityid='e1'><display selectservice='OA_NOTICEMANAGE_SEARCH'/></crud>";
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
Map<String, Object> crud = body(r.getSchema());
String api = (String) crud.get("api");
assertEquals("/api/flow/OA_NOTICEMANAGE_SEARCH", api);
// 裸路径不含任何 ? 或 ${}
assertFalse(api.contains("?"), "api 不能带 query 参数模板(会封闭参数列表阻止 filter 并入)");
assertFalse(api.contains("${"), "api 不能含 amis 模板变量(会封闭参数列表)");
}
@Test
@SuppressWarnings("unchecked")
void f2_17_crud_api裸路径不带query参数_entity() {
// 无 selectservice → /api/entity/{table}/list(裸路径)
String xml = "<crud entityid='e1'><display/></crud>";
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
Map<String, Object> crud = body(r.getSchema());
String api = (String) crud.get("api");
assertEquals("/api/entity/PM_DEMO/list", api);
assertFalse(api.contains("?"), "api 不能带 query 参数模板");
}
// ── F2-17 #4 按钮组动作 ──────────────────────────────────────────────────
@Test
@SuppressWarnings("unchecked")
void f2_17_button_insert_加载editform_service() {
// insert 按钮 → dialog body=service schemaApi 加载 EDITFORM 模板
// mock:pageid=p1 → type=7 模板 tmpl-editform-001
JdbcTemplate jdbc = mock(JdbcTemplate.class);
lenient().when(jdbc.queryForObject(
org.mockito.ArgumentMatchers.contains("SYS_ENTITY"), eq(String.class), any(Object[].class)))
.thenReturn("OA_NOTICEMANAGE");
lenient().when(jdbc.queryForObject(
org.mockito.ArgumentMatchers.contains("view_template"), eq(String.class), any(Object[].class)))
.thenReturn("tmpl-editform-001");
TemplateToAmisConverter c = new TemplateToAmisConverter(jdbc);
String xml = "<crud entityid='e1'><display/>"
+ "<button type='insert' name='添加' isshow='true' pageid='p1'/></crud>";
ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage);
Map<String, Object> crud = body(r.getSchema());
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
Map<String, Object> btn = (Map<String, Object>) toolbar.get(1);
assertEquals("dialog", btn.get("actionType"));
assertEquals("primary", btn.get("level"));
Map<String, Object> dlg = (Map<String, Object>) btn.get("dialog");
assertNotNull(dlg);
Map<String, Object> svc = (Map<String, Object>) dlg.get("body");
assertEquals("service", svc.get("type"));
assertEquals("get:/api/page/schema/tmpl-editform-001?format=amis", svc.get("schemaApi"));
// 新增:无 id 传参
assertNull(svc.get("data"));
// 台账
assertTrue(r.getMappingNotes().stream().anyMatch(n -> n.contains("tmpl-editform-001")));
}
@Test
@SuppressWarnings("unchecked")
void f2_17_button_update_加载editform_带选中行主键() {
// update 按钮 → dialog service + 传主键 id
JdbcTemplate jdbc = mock(JdbcTemplate.class);
lenient().when(jdbc.queryForObject(
org.mockito.ArgumentMatchers.contains("SYS_ENTITY"), eq(String.class), any(Object[].class)))
.thenReturn("OA_NOTICEMANAGE");
lenient().when(jdbc.queryForObject(
org.mockito.ArgumentMatchers.contains("view_template"), eq(String.class), any(Object[].class)))
.thenReturn("tmpl-editform-001");
TemplateToAmisConverter c = new TemplateToAmisConverter(jdbc);
String xml = "<crud entityid='e1'><display/>"
+ "<button type='update' name='修改' isshow='true' pageid='p1'/></crud>";
ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage);
Map<String, Object> crud = body(r.getSchema());
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
Map<String, Object> btn = (Map<String, Object>) toolbar.get(1);
assertEquals("dialog", btn.get("actionType"));
// 禁用条件:未选行时 disabled
assertNotNull(btn.get("disabledOn"));
Map<String, Object> dlg = (Map<String, Object>) btn.get("dialog");
Map<String, Object> svc = (Map<String, Object>) dlg.get("body");
assertEquals("service", svc.get("type"));
assertEquals("get:/api/page/schema/tmpl-editform-001?format=amis", svc.get("schemaApi"));
// 选中行整行并入 dialog 数据域回显
Map<String, Object> dlgData = (Map<String, Object>) dlg.get("data");
assertNotNull(dlgData);
assertTrue(dlgData.get("&").toString().contains("selectedItems[0]"));
// 非查看态
assertNull(svc.get("static"));
}
@Test
@SuppressWarnings("unchecked")
void f2_17_button_read_加载editform_static查看态() {
// read 按钮 → dialog service static=true(只读)
JdbcTemplate jdbc = mock(JdbcTemplate.class);
lenient().when(jdbc.queryForObject(
org.mockito.ArgumentMatchers.contains("SYS_ENTITY"), eq(String.class), any(Object[].class)))
.thenReturn("OA_NOTICEMANAGE");
lenient().when(jdbc.queryForObject(
org.mockito.ArgumentMatchers.contains("view_template"), eq(String.class), any(Object[].class)))
.thenReturn("tmpl-editform-001");
TemplateToAmisConverter c = new TemplateToAmisConverter(jdbc);
String xml = "<crud entityid='e1'><display/>"
+ "<button type='read' name='查看' isshow='true' pageid='p1'/></crud>";
ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage);
Map<String, Object> crud = body(r.getSchema());
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
Map<String, Object> btn = (Map<String, Object>) toolbar.get(1);
assertEquals("dialog", btn.get("actionType"));
assertNotNull(btn.get("disabledOn"));
Map<String, Object> dlg = (Map<String, Object>) btn.get("dialog");
Map<String, Object> svc = (Map<String, Object>) dlg.get("body");
assertEquals("service", svc.get("type"));
// 查看态 static=true
assertEquals(true, svc.get("static"));
}
@Test
@SuppressWarnings("unchecked")
void f2_17_button_insert_无editform映射_诚实降级() {
// pageid 为空 → EDITFORM 找不到 → dialog body=tpl 提示,按钮降级
String xml = "<crud entityid='e1'><display/>"
+ "<button type='insert' name='添加' isshow='true'/></crud>";
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
Map<String, Object> crud = body(r.getSchema());
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
Map<String, Object> btn = (Map<String, Object>) toolbar.get(1);
Map<String, Object> dlg = (Map<String, Object>) btn.get("dialog");
assertNotNull(dlg);
Map<String, Object> dlgBody = (Map<String, Object>) dlg.get("body");
// 降级:tpl 提示"未配编辑表单"
assertEquals("tpl", dlgBody.get("type"));
assertTrue(dlgBody.get("tpl").toString().contains("未配编辑表单"));
// 降级台账
assertTrue(r.getDegrades().stream().anyMatch(d -> d.contains("降级")));
}
@Test
@SuppressWarnings("unchecked")
void f2_17_button_delete_POST端点含ids数据() {
// F2-17: 删除入 bulkActions(amis 批量槽),data={ids:${ids}} 多删
String xml = "<crud entityid='e1'><display/>"
+ "<button type='delete' name='删除' isshow='true' showmsg='确认删除?'/></crud>";
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
Map<String, Object> crud = body(r.getSchema());
List<Map<String, Object>> bulk = (List<Map<String, Object>>) crud.get("bulkActions");
assertNotNull(bulk);
Map<String, Object> btn = bulk.get(0);
assertEquals("ajax", btn.get("actionType"));
assertEquals("POST:/api/entity/PM_DEMO/delete", btn.get("api"));
Map<String, Object> data = (Map<String, Object>) btn.get("data");
assertNotNull(data);
assertEquals("${ids}", data.get("ids"));
}
} }

File diff suppressed because it is too large Load Diff

View File

@@ -79,9 +79,14 @@ public class PageSchemaController {
public ResponseEntity<String> schema( public ResponseEntity<String> schema(
@PathVariable String templateId, @PathVariable String templateId,
@RequestHeader(value = HttpHeaders.IF_NONE_MATCH, required = false) String ifNoneMatch, @RequestHeader(value = HttpHeaders.IF_NONE_MATCH, required = false) String ifNoneMatch,
@RequestParam(value = "layer", required = false) String layer) { @RequestParam(value = "layer", required = false) String layer,
@RequestParam(value = "format", required = false) String format) {
boolean forceStandard = "standard".equalsIgnoreCase(layer); boolean forceStandard = "standard".equalsIgnoreCase(layer);
// F2-17 #4:amis service.schemaApi 要求 {status,msg,data} 信封;列表按钮的弹窗
// 表单走 service 加载本端点,需 format=amis 包裹。默认(主渲染器 PageRenderPage)
// 仍取裸 schema,保持 ETag/304 与既有契约不变。
boolean amisEnvelope = "amis".equalsIgnoreCase(format);
// 1. 尝试 overlay(除非显式要求 standard 层) // 1. 尝试 overlay(除非显式要求 standard 层)
if (!forceStandard) { if (!forceStandard) {
@@ -90,7 +95,7 @@ public class PageSchemaController {
"SELECT schema_json::text AS schema_json, schema_etag FROM sys_page_schema_overlay WHERE template_id = ?", "SELECT schema_json::text AS schema_json, schema_etag FROM sys_page_schema_overlay WHERE template_id = ?",
templateId); templateId);
if (!overlayRows.isEmpty()) { if (!overlayRows.isEmpty()) {
return buildSchemaResponse(overlayRows.get(0), ifNoneMatch, "overlay"); return buildSchemaResponse(overlayRows.get(0), ifNoneMatch, "overlay", amisEnvelope);
} }
} catch (DataAccessException ex) { } catch (DataAccessException ex) {
// overlay 表不存在(尚未建表)时降级到标准层,不报 503 // overlay 表不存在(尚未建表)时降级到标准层,不报 503
@@ -117,7 +122,7 @@ public class PageSchemaController {
.body("{\"status\":1,\"msg\":\"模板不存在\"}"); .body("{\"status\":1,\"msg\":\"模板不存在\"}");
} }
return buildSchemaResponse(rows.get(0), ifNoneMatch, "standard"); return buildSchemaResponse(rows.get(0), ifNoneMatch, "standard", amisEnvelope);
} }
// ================================================================ PUT overlay(保存定制版) // ================================================================ PUT overlay(保存定制版)
@@ -210,10 +215,16 @@ public class PageSchemaController {
/** 构造统一 schema 响应(含 ETag/304 + X-Schema-Layer 头)。 */ /** 构造统一 schema 响应(含 ETag/304 + X-Schema-Layer 头)。 */
private ResponseEntity<String> buildSchemaResponse(Map<String, Object> row, String ifNoneMatch, String layer) { private ResponseEntity<String> buildSchemaResponse(Map<String, Object> row, String ifNoneMatch, String layer) {
return buildSchemaResponse(row, ifNoneMatch, layer, false);
}
private ResponseEntity<String> buildSchemaResponse(Map<String, Object> row, String ifNoneMatch, String layer,
boolean amisEnvelope) {
String etagValue = String.valueOf(row.get("schema_etag")); String etagValue = String.valueOf(row.get("schema_etag"));
String etag = "\"" + etagValue + "\""; String etag = "\"" + etagValue + "\"";
if (ifNoneMatch != null && etagMatches(ifNoneMatch, etag)) { // amis 信封模式不参与 304 协商(service 每次取最新;且包裹后 body 不同于裸 schema)
if (!amisEnvelope && ifNoneMatch != null && etagMatches(ifNoneMatch, etag)) {
return ResponseEntity.status(HttpStatus.NOT_MODIFIED) return ResponseEntity.status(HttpStatus.NOT_MODIFIED)
.eTag(etag) .eTag(etag)
.header(HEADER_SCHEMA_LAYER, layer) .header(HEADER_SCHEMA_LAYER, layer)
@@ -221,11 +232,14 @@ public class PageSchemaController {
} }
String schemaJson = String.valueOf(row.get("schema_json")); String schemaJson = String.valueOf(row.get("schema_json"));
return ResponseEntity.ok() String body = amisEnvelope ? "{\"status\":0,\"msg\":\"\",\"data\":" + schemaJson + "}" : schemaJson;
.eTag(etag) ResponseEntity.BodyBuilder builder = ResponseEntity.ok()
.contentType(MediaType.APPLICATION_JSON) .contentType(MediaType.APPLICATION_JSON)
.header(HEADER_SCHEMA_LAYER, layer) .header(HEADER_SCHEMA_LAYER, layer);
.body(schemaJson); if (!amisEnvelope) {
builder.eTag(etag);
}
return builder.body(body);
} }
/** If-None-Match 可为逗号分隔多值或 {@code *};任一匹配即命中。 */ /** If-None-Match 可为逗号分隔多值或 {@code *};任一匹配即命中。 */

View File

@@ -68,7 +68,7 @@ class PageSchemaControllerTest {
.thenReturn(oneStdRow()); // 标准层查询 .thenReturn(oneStdRow()); // 标准层查询
PageSchemaController c = new PageSchemaController(jdbc); PageSchemaController c = new PageSchemaController(jdbc);
var resp = c.schema(TID, null, null); var resp = c.schema(TID, null, null, null);
assertEquals(HttpStatus.OK, resp.getStatusCode()); assertEquals(HttpStatus.OK, resp.getStatusCode());
assertEquals(SCHEMA, resp.getBody()); assertEquals(SCHEMA, resp.getBody());
assertEquals("\"" + ETAG_VALUE + "\"", resp.getHeaders().getETag()); assertEquals("\"" + ETAG_VALUE + "\"", resp.getHeaders().getETag());
@@ -84,7 +84,7 @@ class PageSchemaControllerTest {
.thenReturn(oneStdRow()); .thenReturn(oneStdRow());
PageSchemaController c = new PageSchemaController(jdbc); PageSchemaController c = new PageSchemaController(jdbc);
var resp = c.schema(TID, "\"" + ETAG_VALUE + "\"", null); var resp = c.schema(TID, "\"" + ETAG_VALUE + "\"", null, null);
assertEquals(HttpStatus.NOT_MODIFIED, resp.getStatusCode()); assertEquals(HttpStatus.NOT_MODIFIED, resp.getStatusCode());
assertNull(resp.getBody()); assertNull(resp.getBody());
assertEquals("\"" + ETAG_VALUE + "\"", resp.getHeaders().getETag()); assertEquals("\"" + ETAG_VALUE + "\"", resp.getHeaders().getETag());
@@ -99,7 +99,7 @@ class PageSchemaControllerTest {
.thenReturn(oneStdRow()); .thenReturn(oneStdRow());
PageSchemaController c = new PageSchemaController(jdbc); PageSchemaController c = new PageSchemaController(jdbc);
var resp = c.schema(TID, "\"stale-etag\"", null); var resp = c.schema(TID, "\"stale-etag\"", null, null);
assertEquals(HttpStatus.OK, resp.getStatusCode()); assertEquals(HttpStatus.OK, resp.getStatusCode());
assertEquals(SCHEMA, resp.getBody()); assertEquals(SCHEMA, resp.getBody());
} }
@@ -113,7 +113,7 @@ class PageSchemaControllerTest {
.thenReturn(List.of()); // 标准层也空 .thenReturn(List.of()); // 标准层也空
PageSchemaController c = new PageSchemaController(jdbc); PageSchemaController c = new PageSchemaController(jdbc);
var resp = c.schema("missing", null, null); var resp = c.schema("missing", null, null, null);
assertEquals(HttpStatus.NOT_FOUND, resp.getStatusCode()); assertEquals(HttpStatus.NOT_FOUND, resp.getStatusCode());
assertTrue(String.valueOf(resp.getBody()).contains("模板不存在")); assertTrue(String.valueOf(resp.getBody()).contains("模板不存在"));
} }
@@ -127,7 +127,7 @@ class PageSchemaControllerTest {
.thenThrow(new DataAccessResourceFailureException("relation does not exist")); .thenThrow(new DataAccessResourceFailureException("relation does not exist"));
PageSchemaController c = new PageSchemaController(jdbc); PageSchemaController c = new PageSchemaController(jdbc);
var resp = c.schema(TID, null, null); var resp = c.schema(TID, null, null, null);
assertEquals(HttpStatus.SERVICE_UNAVAILABLE, resp.getStatusCode()); assertEquals(HttpStatus.SERVICE_UNAVAILABLE, resp.getStatusCode());
} }
@@ -140,7 +140,7 @@ class PageSchemaControllerTest {
.thenReturn(oneStdRow()); .thenReturn(oneStdRow());
PageSchemaController c = new PageSchemaController(jdbc); PageSchemaController c = new PageSchemaController(jdbc);
var resp = c.schema(TID, "W/\"" + ETAG_VALUE + "\"", null); var resp = c.schema(TID, "W/\"" + ETAG_VALUE + "\"", null, null);
assertEquals(HttpStatus.NOT_MODIFIED, resp.getStatusCode()); assertEquals(HttpStatus.NOT_MODIFIED, resp.getStatusCode());
} }
@@ -153,7 +153,7 @@ class PageSchemaControllerTest {
.thenReturn(oneStdRow()); .thenReturn(oneStdRow());
PageSchemaController c = new PageSchemaController(jdbc); PageSchemaController c = new PageSchemaController(jdbc);
var resp = c.schema(TID, "*", null); var resp = c.schema(TID, "*", null, null);
assertEquals(HttpStatus.NOT_MODIFIED, resp.getStatusCode()); assertEquals(HttpStatus.NOT_MODIFIED, resp.getStatusCode());
} }
@@ -168,7 +168,7 @@ class PageSchemaControllerTest {
.thenReturn(oneOverlayRow()); .thenReturn(oneOverlayRow());
PageSchemaController c = new PageSchemaController(jdbc); PageSchemaController c = new PageSchemaController(jdbc);
var resp = c.schema(TID, null, null); var resp = c.schema(TID, null, null, null);
assertEquals(HttpStatus.OK, resp.getStatusCode()); assertEquals(HttpStatus.OK, resp.getStatusCode());
assertEquals(SCHEMA_OVERLAY, resp.getBody()); assertEquals(SCHEMA_OVERLAY, resp.getBody());
assertEquals("overlay", resp.getHeaders().getFirst(PageSchemaController.HEADER_SCHEMA_LAYER)); assertEquals("overlay", resp.getHeaders().getFirst(PageSchemaController.HEADER_SCHEMA_LAYER));
@@ -185,7 +185,7 @@ class PageSchemaControllerTest {
.thenReturn(oneStdRow()); .thenReturn(oneStdRow());
PageSchemaController c = new PageSchemaController(jdbc); PageSchemaController c = new PageSchemaController(jdbc);
var resp = c.schema(TID, null, null); var resp = c.schema(TID, null, null, null);
assertEquals(HttpStatus.OK, resp.getStatusCode()); assertEquals(HttpStatus.OK, resp.getStatusCode());
assertEquals(SCHEMA, resp.getBody()); assertEquals(SCHEMA, resp.getBody());
assertEquals("standard", resp.getHeaders().getFirst(PageSchemaController.HEADER_SCHEMA_LAYER)); assertEquals("standard", resp.getHeaders().getFirst(PageSchemaController.HEADER_SCHEMA_LAYER));
@@ -199,7 +199,7 @@ class PageSchemaControllerTest {
when(jdbc.queryForList(anyString(), eq(TID))).thenReturn(oneStdRow()); when(jdbc.queryForList(anyString(), eq(TID))).thenReturn(oneStdRow());
PageSchemaController c = new PageSchemaController(jdbc); PageSchemaController c = new PageSchemaController(jdbc);
var resp = c.schema(TID, null, "standard"); var resp = c.schema(TID, null, "standard", null);
assertEquals(HttpStatus.OK, resp.getStatusCode()); assertEquals(HttpStatus.OK, resp.getStatusCode());
assertEquals(SCHEMA, resp.getBody()); assertEquals(SCHEMA, resp.getBody());
assertEquals("standard", resp.getHeaders().getFirst(PageSchemaController.HEADER_SCHEMA_LAYER)); assertEquals("standard", resp.getHeaders().getFirst(PageSchemaController.HEADER_SCHEMA_LAYER));