From ea6fc747d8ab6492097811376b22247cd7202500 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Fri, 12 Jun 2026 00:20:17 +0800 Subject: [PATCH] =?UTF-8?q?F2-14b:=20=E6=B5=81=E6=9F=A5=E8=AF=A2=E8=BE=93?= =?UTF-8?q?=E5=87=BA=E6=8B=8D=E5=B9=B3=E5=AF=B9=E9=BD=90=20amis=20crud=20?= =?UTF-8?q?=E5=A5=91=E7=BA=A6(data.result.items=E2=86=92data.items)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 一层之差导致全部列表页空态(数据实际已返回)。仅单输出 result 且为 {items,total} 查询形态时拍平;其他流输出原样。实证:通知管理页 266 条真实数据上屏(27 页分页); e2e 34/34 不回归。 Co-Authored-By: Claude Fable 5 --- .../platform/metadata/web/FlowController.java | 17 ++++++++++++++++- .../metadata/web/FlowControllerTest.java | 6 +++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/FlowController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/FlowController.java index 97335d0..f5a9501 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/FlowController.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/FlowController.java @@ -128,10 +128,25 @@ public class FlowController { Map resp = new LinkedHashMap<>(); resp.put("status", 0); resp.put("msg", ""); - resp.put("data", normalize(output)); + resp.put("data", unwrapCrudResult(normalize(output))); return ResponseEntity.ok(resp); } + /** + * F2-14b:流输出变量名为 result(DefaultFlowHelper 默认搜索流口径),查询结果被包成 + * {result:{items,total}},而 amis crud 契约读 data.items/data.total——一层之差导致 + * 全部列表页空态(数据实际已返回)。仅当 result 恰为 {items,total} 查询形态时拍平; + * 其他流输出(多变量/非查询)原样保留,不破坏既有消费方。 + */ + @SuppressWarnings("unchecked") + private Object unwrapCrudResult(Object data) { + if (data instanceof Map m && m.size() == 1 && m.get("result") instanceof Map r + && r.containsKey("items") && r.containsKey("total")) { + return r; + } + return data; + } + private static String sanitize(String id) { if (id == null) return ""; return id.replaceAll("[^A-Za-z0-9_\\-]", "?"); diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/FlowControllerTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/FlowControllerTest.java index 07f0b01..6220d50 100644 --- a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/FlowControllerTest.java +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/FlowControllerTest.java @@ -160,10 +160,10 @@ class FlowControllerTest { FlowController controller = new FlowController(engine, resolverReturning(flowId, uuidPassthrough())); ResponseEntity> resp = controller.executeGet(flowId, new HashMap<>()); + // F2-14b:单输出 result 且为 {items,total} 查询形态时拍平到 data 顶层(amis crud 契约 + // data.items/data.total;原 data.result.items 一层之差导致全部列表页空态) @SuppressWarnings("unchecked") - Map data = (Map) resp.getBody().get("data"); - @SuppressWarnings("unchecked") - Map result = (Map) data.get("result"); + Map result = (Map) resp.getBody().get("data"); assertEquals(1, result.get("total"), "pagecount → total"); assertInstanceOf(List.class, result.get("items"), "listresult → items"); @SuppressWarnings("unchecked")