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:
@@ -79,9 +79,14 @@ public class PageSchemaController {
|
||||
public ResponseEntity<String> schema(
|
||||
@PathVariable String templateId,
|
||||
@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);
|
||||
// F2-17 #4:amis service.schemaApi 要求 {status,msg,data} 信封;列表按钮的弹窗
|
||||
// 表单走 service 加载本端点,需 format=amis 包裹。默认(主渲染器 PageRenderPage)
|
||||
// 仍取裸 schema,保持 ETag/304 与既有契约不变。
|
||||
boolean amisEnvelope = "amis".equalsIgnoreCase(format);
|
||||
|
||||
// 1. 尝试 overlay(除非显式要求 standard 层)
|
||||
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 = ?",
|
||||
templateId);
|
||||
if (!overlayRows.isEmpty()) {
|
||||
return buildSchemaResponse(overlayRows.get(0), ifNoneMatch, "overlay");
|
||||
return buildSchemaResponse(overlayRows.get(0), ifNoneMatch, "overlay", amisEnvelope);
|
||||
}
|
||||
} catch (DataAccessException ex) {
|
||||
// overlay 表不存在(尚未建表)时降级到标准层,不报 503
|
||||
@@ -117,7 +122,7 @@ public class PageSchemaController {
|
||||
.body("{\"status\":1,\"msg\":\"模板不存在\"}");
|
||||
}
|
||||
|
||||
return buildSchemaResponse(rows.get(0), ifNoneMatch, "standard");
|
||||
return buildSchemaResponse(rows.get(0), ifNoneMatch, "standard", amisEnvelope);
|
||||
}
|
||||
|
||||
// ================================================================ PUT overlay(保存定制版)
|
||||
@@ -210,10 +215,16 @@ public class PageSchemaController {
|
||||
|
||||
/** 构造统一 schema 响应(含 ETag/304 + X-Schema-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 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)
|
||||
.eTag(etag)
|
||||
.header(HEADER_SCHEMA_LAYER, layer)
|
||||
@@ -221,11 +232,14 @@ public class PageSchemaController {
|
||||
}
|
||||
|
||||
String schemaJson = String.valueOf(row.get("schema_json"));
|
||||
return ResponseEntity.ok()
|
||||
.eTag(etag)
|
||||
String body = amisEnvelope ? "{\"status\":0,\"msg\":\"\",\"data\":" + schemaJson + "}" : schemaJson;
|
||||
ResponseEntity.BodyBuilder builder = ResponseEntity.ok()
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.header(HEADER_SCHEMA_LAYER, layer)
|
||||
.body(schemaJson);
|
||||
.header(HEADER_SCHEMA_LAYER, layer);
|
||||
if (!amisEnvelope) {
|
||||
builder.eTag(etag);
|
||||
}
|
||||
return builder.body(body);
|
||||
}
|
||||
|
||||
/** If-None-Match 可为逗号分隔多值或 {@code *};任一匹配即命中。 */
|
||||
|
||||
Reference in New Issue
Block a user