feat(design): 编译器引用列渲染显名·list 列 name 指向 <COL>_DISPLAY__(运行时 _SEARCH 注入,白名单安全)
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -120,13 +120,24 @@ public final class PageBlueprintCompiler {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
ObjectNode column = columns.addObject();
|
ObjectNode column = columns.addObject();
|
||||||
column.put("name", field.name());
|
column.put("name", listColumnName(field));
|
||||||
column.put("label", field.label());
|
column.put("label", field.label());
|
||||||
applyColumnRender(column, field.type());
|
applyColumnRender(column, field.type());
|
||||||
}
|
}
|
||||||
return columns;
|
return columns;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 列表列 name 解析:引用列改指 {@code <COL>_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
|
* 列渲染类型(对齐转换器 house-style):布尔列 → mapping(是/否),日期/时间列 → date/datetime
|
||||||
* 格式化;string/integer/number 保持纯文本(amis 默认渲染即正确)。纯由 blueprint field type
|
* 格式化;string/integer/number 保持纯文本(amis 默认渲染即正确)。纯由 blueprint field type
|
||||||
@@ -150,6 +161,11 @@ public final class PageBlueprintCompiler {
|
|||||||
column.put("type", "datetime");
|
column.put("type", "datetime");
|
||||||
column.put("format", "YYYY-MM-DD HH:mm:ss");
|
column.put("format", "YYYY-MM-DD HH:mm:ss");
|
||||||
}
|
}
|
||||||
|
case "reference" -> {
|
||||||
|
// 引用列:列 name 已在 listColumnName 改指 <COL>_DISPLAY__(运行时 _SEARCH 流
|
||||||
|
// 经 UserColumnResolver.resolveRows 注入显名)。此处保持纯文本渲染即可,
|
||||||
|
// 不引入新 amis 组件类型 → TypedPageSchemaValidator 白名单平凡通过。
|
||||||
|
}
|
||||||
default -> {
|
default -> {
|
||||||
// string / integer / number:纯文本默认渲染即可。
|
// string / integer / number:纯文本默认渲染即可。
|
||||||
}
|
}
|
||||||
@@ -259,7 +275,7 @@ public final class PageBlueprintCompiler {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
ObjectNode column = columns.addObject();
|
ObjectNode column = columns.addObject();
|
||||||
column.put("name", field.name());
|
column.put("name", listColumnName(field));
|
||||||
column.put("label", field.label());
|
column.put("label", field.label());
|
||||||
applyColumnRender(column, field.type());
|
applyColumnRender(column, field.type());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -191,4 +191,34 @@ class PageBlueprintCompilerTest {
|
|||||||
|
|
||||||
assertThrows(IllegalArgumentException.class, () -> new PageBlueprintCompiler(MAPPER).compile(blueprint));
|
assertThrows(IllegalArgumentException.class, () -> new PageBlueprintCompiler(MAPPER).compile(blueprint));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@DisplayName("引用列渲染显名: list 列 name 指向 <COL>_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());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user