feat(converter+metadata): 树+表 type=4 选择框 → picker 弹窗(分类树过滤+功能表格)
SelectDialog/MultiSelectDialog 的 dialogid 指向 type=4 treeGrid 模板时(如功能 8b89fd29:treetemplate分类树+gridtemplate功能表 rcolumnname=ENTITYTYPE),转换器 applyTreeGridPicker 产 picker:source=/api/template/treegrid?treeRef=&gridTable=&rcol=&node=${rcol},pickerSchema={mode:table, filter:[tree-select 分类 source=/api/template/{treeRef}/tree searchable], columns(取自gridtemplate display)}。降级规则:通用+自定义 type=4 都走此(不看 engineclass,自定义降级为通用 treeGrid 渲染,非扁平表)。后端 TemplateTreeController.treeGrid 每行补 _label(grid实体显示列)供 picker labelField 显名。spike 实证 amis picker pickerSchema=crud+tree-select filter 机制成立。live:菜单维护 功能 picker 开弹窗=分类树过滤+功能表格(7列单选),选行回填 id+显名,console 0错。caveat:8b89fd29 右表 VIEW_TEMPLATE 无物理 ENTITYTYPE 列→该 dialog 分类过滤不缩窄(数据特性非机制缺陷),其它 type=4 正常。converter121+metadata323测试绿。
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -152,7 +152,45 @@ public class TemplateTreeController {
|
||||
if (perPage != null) {
|
||||
body.put("perPage", perPage);
|
||||
}
|
||||
return flowController.executePost(gridTable.toUpperCase() + "_SEARCH", null, body);
|
||||
ResponseEntity<Map<String, Object>> resp =
|
||||
flowController.executePost(gridTable.toUpperCase() + "_SEARCH", null, body);
|
||||
// type=4 选择框 picker:每行补 _label(统一显示值=网格显示列),使 picker(labelField=_label)选中/
|
||||
// chip 显人可读名而非裸 id,且与「加载已存值经 EntityController 解析出的 {_id,_label}」labelField 同口径。
|
||||
// 浏览页 type=4 右表不读 _label(按 columns 渲染),故无副作用。
|
||||
attachLabel(resp, gridTable.toUpperCase());
|
||||
return resp;
|
||||
}
|
||||
|
||||
/**
|
||||
* 给 treegrid 右表响应每行补 {@code _label}(= 网格实体显示列值),供 type=4 选择框 picker
|
||||
* ({@code labelField=_label})显选中项人可读名。显示列复用 {@link #displayColumn}(与左树节点 label 同源);
|
||||
* 列是虚拟表达式(物理不存在)时退回主键值。响应非预期结构/无 items → 原样不动(零副作用)。
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
private void attachLabel(ResponseEntity<Map<String, Object>> resp, String table) {
|
||||
if (resp == null || resp.getBody() == null) {
|
||||
return;
|
||||
}
|
||||
Object dataObj = resp.getBody().get("data");
|
||||
if (!(dataObj instanceof Map<?, ?> data) || !(data.get("items") instanceof List<?> items)) {
|
||||
return;
|
||||
}
|
||||
String keyCol = table + "_ID";
|
||||
String dispCol = displayColumn(table, keyCol);
|
||||
boolean dispIsExpr = com.eip4.platform.metadata.flow.EntityDisplayColumns.isExpression(dispCol);
|
||||
for (Object o : items) {
|
||||
if (!(o instanceof Map)) {
|
||||
continue;
|
||||
}
|
||||
Map<String, Object> row = (Map<String, Object>) o;
|
||||
Object id = row.get("_id");
|
||||
// 虚拟表达式显示列无法按列名取行值(行键是物理列)→ 退回主键;物理列直接取该列值。
|
||||
Object lbl = dispIsExpr ? null : row.get(dispCol);
|
||||
String label = lbl != null && !String.valueOf(lbl).isBlank()
|
||||
? String.valueOf(lbl).trim()
|
||||
: (id != null ? String.valueOf(id).trim() : "");
|
||||
row.put("_label", label);
|
||||
}
|
||||
}
|
||||
|
||||
/** 解析「点中节点 + 全部后代」的原始 id 列表(供右表 IN 过滤)。节点不在树中(陈旧)→ 退化为仅自身。 */
|
||||
|
||||
@@ -234,6 +234,39 @@ class TemplateTreeControllerTest {
|
||||
assertEquals("1", body.get("page"));
|
||||
}
|
||||
|
||||
/**
|
||||
* type=4 选择框 picker:treegrid 右表响应每行补 {@code _label}(= 网格实体显示列值),
|
||||
* 供 picker(labelField=_label)显选中项人可读名而非裸 id。显示列 NAME(mock isentitydisplay=1 → NAME)。
|
||||
*/
|
||||
@Test
|
||||
@DisplayName("treegrid 端点:响应每行补 _label(=显示列值) 供 picker 显名")
|
||||
@SuppressWarnings("unchecked")
|
||||
void treeGrid_补_label供picker显名() {
|
||||
// 用 CAT 表(setup 已 mock 其 isentitydisplay=NAME + 物理列含 NAME),flow 返带 items 的可变响应
|
||||
List<Map<String, Object>> items = new ArrayList<>();
|
||||
Map<String, Object> r1 = new LinkedHashMap<>();
|
||||
r1.put("_id", "ROW1");
|
||||
r1.put("NAME", "功能甲");
|
||||
items.add(r1);
|
||||
Map<String, Object> r2 = new LinkedHashMap<>();
|
||||
r2.put("_id", "ROW2");
|
||||
r2.put("NAME", ""); // 空显示值 → _label 回落主键
|
||||
items.add(r2);
|
||||
Map<String, Object> data = new LinkedHashMap<>();
|
||||
data.put("items", items);
|
||||
data.put("total", 2);
|
||||
Map<String, Object> respBody = new LinkedHashMap<>();
|
||||
respBody.put("status", 0);
|
||||
respBody.put("data", data);
|
||||
when(flow.executePost(eq("CAT_SEARCH"), any(), any()))
|
||||
.thenReturn(ResponseEntity.ok(respBody));
|
||||
|
||||
controller.treeGrid(TREE_REF, "CAT", "PARENTID", "", "1", "10", Map.of());
|
||||
|
||||
assertEquals("功能甲", items.get(0).get("_label"), "显示列(NAME)非空 → _label=显示值");
|
||||
assertEquals("ROW2", items.get(1).get("_label"), "显示列空 → _label 回落主键 _id");
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("treegrid 端点:非法表名/列名 → 400,不触达引擎")
|
||||
void treeGrid_IDENT守卫() {
|
||||
|
||||
Reference in New Issue
Block a user