From 869790d04f22fa68a60e85b022bf7ea4b18a7c82 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Sat, 20 Jun 2026 09:54:33 +0800 Subject: [PATCH] =?UTF-8?q?feat(design):=20=E7=BC=96=E8=AF=91=E5=99=A8?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E5=88=97=E6=B8=B2=E6=9F=93=E6=98=BE=E5=90=8D?= =?UTF-8?q?=C2=B7list=20=E5=88=97=20name=20=E6=8C=87=E5=90=91=20=5FDI?= =?UTF-8?q?SPLAY=5F=5F(=E8=BF=90=E8=A1=8C=E6=97=B6=20=5FSEARCH=20=E6=B3=A8?= =?UTF-8?q?=E5=85=A5,=E7=99=BD=E5=90=8D=E5=8D=95=E5=AE=89=E5=85=A8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.8 (1M context) --- .../blueprint/PageBlueprintCompiler.java | 20 +++++++++++-- .../blueprint/PageBlueprintCompilerTest.java | 30 +++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java index ced0186..d52e4d6 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java @@ -120,13 +120,24 @@ public final class PageBlueprintCompiler { continue; } ObjectNode column = columns.addObject(); - column.put("name", field.name()); + column.put("name", listColumnName(field)); column.put("label", field.label()); applyColumnRender(column, field.type()); } return columns; } + /** + * 列表列 name 解析:引用列改指 {@code _DISPLAY__}(运行时 _SEARCH 流注入显名,house-style, + * 见 FlowController.resolveRows / PickerController),其余列用原字段名。修「引用列显裸 id」。 + */ + private static String listColumnName(PageBlueprintField field) { + if ("reference".equals(field.type()) && field.name() != null && !field.name().isBlank()) { + return field.name() + "_DISPLAY__"; + } + return field.name(); + } + /** * 列渲染类型(对齐转换器 house-style):布尔列 → mapping(是/否),日期/时间列 → date/datetime * 格式化;string/integer/number 保持纯文本(amis 默认渲染即正确)。纯由 blueprint field type @@ -150,6 +161,11 @@ public final class PageBlueprintCompiler { column.put("type", "datetime"); column.put("format", "YYYY-MM-DD HH:mm:ss"); } + case "reference" -> { + // 引用列:列 name 已在 listColumnName 改指 _DISPLAY__(运行时 _SEARCH 流 + // 经 UserColumnResolver.resolveRows 注入显名)。此处保持纯文本渲染即可, + // 不引入新 amis 组件类型 → TypedPageSchemaValidator 白名单平凡通过。 + } default -> { // string / integer / number:纯文本默认渲染即可。 } @@ -259,7 +275,7 @@ public final class PageBlueprintCompiler { continue; } ObjectNode column = columns.addObject(); - column.put("name", field.name()); + column.put("name", listColumnName(field)); column.put("label", field.label()); applyColumnRender(column, field.type()); } diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompilerTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompilerTest.java index 947b956..6c919cd 100644 --- a/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompilerTest.java +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompilerTest.java @@ -191,4 +191,34 @@ class PageBlueprintCompilerTest { assertThrows(IllegalArgumentException.class, () -> new PageBlueprintCompiler(MAPPER).compile(blueprint)); } + + @Test + @DisplayName("引用列渲染显名: list 列 name 指向 _DISPLAY__(运行时 _SEARCH 注入显名),非裸 id") + void referenceColumnRendersDisplayName() { + PageBlueprint blueprint = new PageBlueprint( + PageBlueprint.VERSION, + PageBlueprint.RECIPE_MAINTENANCE_CRUD, + "eip4ai-order", + "订单维护", + "EIP4AI_ORDER", + "订单", + "EIP4AI_ORDER_ID", + "ORDERNO", + List.of( + new PageBlueprintField("ORDERNO", "订单号", "string", true, true, true, null, null), + // 引用列:指向 EIP4AI_CUSTOMER,显名列 NAME + new PageBlueprintField("CUSTOMERID", "客户", "reference", false, true, true, + "EIP4AI_CUSTOMER", "NAME")), + true, true, true, 20); + + ObjectNode schema = new PageBlueprintCompiler(MAPPER).compile(blueprint); + ArrayNode columns = (ArrayNode) schema.path("body").path("columns"); + + assertEquals(2, columns.size()); + assertEquals("ORDERNO", columns.get(0).path("name").asText()); + // 引用列:name 改指显名列,label 仍是业务标签,纯文本(无特殊 type → typed 白名单安全)。 + assertEquals("CUSTOMERID_DISPLAY__", columns.get(1).path("name").asText()); + assertEquals("客户", columns.get(1).path("label").asText()); + assertTrue(columns.get(1).path("type").asText().isBlank()); + } }