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:
@@ -1057,10 +1057,141 @@ public class TemplateToAmisConverter {
|
||||
result.note("树选择 " + name + " → dialogid=" + dialogId
|
||||
+ " 是 type=3 树模板 → tree-select(source=/api/template/.../tree),非扁平 picker"
|
||||
+ "(修上级菜单等层级引用显列表选择框)");
|
||||
} else if (!dialogId.isBlank() && isType4Dialog(dialogId)) {
|
||||
// ④:树+grid 选择框——dialogid 指向 type=4「树+grid」模板(<treetemplate ref/> + <gridtemplate
|
||||
// ref/ rcolumnname/>,如「功能管理」)→ 把扁平 picker 改写为「弹窗内 = 左分类树过滤 + 右 CRUD 表格」
|
||||
// (降级规则:通用 6 + 自定义 3 全走此路,不看 engineclass)。机制与 type=4 浏览页(convertTreeGrid)
|
||||
// 同源、与 spike 实证一致:picker.source=右表子树聚合端点 /api/template/treegrid?...&node=${rcol},
|
||||
// pickerSchema.filter=分类 tree-select(name=rcol, source=左树端点),选分类→${rcol}→node 过滤右表,
|
||||
// 选行回填 picker(valueField=_id 提交裸 id 不变)。列取自 gridtemplate <display>(转换器侧解析)。
|
||||
applyTreeGridPicker(item, f, dialogId, result);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* type=4 树+grid 选择框(弹窗内 = 左分类树过滤 + 右 CRUD 表格)的 picker 改写。
|
||||
*
|
||||
* <p>读 dialog(type=4 view_template)XML 的 {@code <treetemplate ref/>}(左分类树)+
|
||||
* {@code <gridtemplate ref/ entityid/ rcolumnname/>}(右数据表 + 分类过滤列),按 spike 确认的机制重写
|
||||
* 入参 {@code item}(原 UiTypeMapper 产的扁平 picker):
|
||||
* <ul>
|
||||
* <li>{@code source}=右表子树聚合端点 {@code /api/template/treegrid?treeRef=&gridTable=&rcol=&node=${rcol}}
|
||||
* (与 {@link #convertTreeGrid} 浏览页右表同源;node 取分类 tree-select 的当前值 {@code ${rcol}});</li>
|
||||
* <li>{@code labelField}=右表显示列(gridtemplate display 首个可见列,回落实体显示列)——treegrid 端点返
|
||||
* 业务行(无统一 {@code _label}),故 chip/选中显示绑真实显示列,显名而非裸 id;</li>
|
||||
* <li>{@code valueField=_id}(保持表单提交值=裸主键不变);</li>
|
||||
* <li>{@code pickerSchema}={@code crud(mode=table)} + {@code filter:[tree-select name=rcol source=左树端点]}
|
||||
* + {@code columns}(gridtemplate {@code <display>} 解析,转换器侧——与 convertTreeGrid 右表列同源)。</li>
|
||||
* </ul>
|
||||
* 解析失败(dialog XML 缺 treetemplate/gridtemplate、实体/rcol 解析不出)→ 保留扁平 picker 基线(零回归)。
|
||||
*/
|
||||
private void applyTreeGridPicker(Map<String, Object> item, Element f, String dialogId, ConversionResult result) {
|
||||
Element dialogRoot = loadRefRoot(dialogId, result);
|
||||
if (dialogRoot == null) {
|
||||
return; // dialog XML 取不到 → 保留扁平 picker 基线
|
||||
}
|
||||
Element treeTemplate = dialogRoot.element("treetemplate");
|
||||
Element gridTemplate = dialogRoot.element("gridtemplate");
|
||||
if (treeTemplate == null || gridTemplate == null) {
|
||||
return; // 非标准 tree+grid 结构 → 保留扁平 picker 基线
|
||||
}
|
||||
String treeRef = treeTemplate.attributeValue("ref", "");
|
||||
String gridRef = gridTemplate.attributeValue("ref", "");
|
||||
String gridEntityId = gridTemplate.attributeValue("entityid", "");
|
||||
String rcol = gridTemplate.attributeValue("rcolumnname", "");
|
||||
String gridTable = resolveTableName(gridEntityId, result);
|
||||
String gridTableUpper = gridTable != null ? gridTable.toUpperCase() : null;
|
||||
if (treeRef.isBlank() || rcol.isBlank() || gridTableUpper == null
|
||||
|| gridTableUpper.isBlank() || gridTableUpper.startsWith("UNKNOWN_")
|
||||
|| gridTableUpper.startsWith("ORPHAN_")) {
|
||||
result.degrade("树+grid选择框 dialogid=" + dialogId + " treetemplate/gridtemplate 解析失败"
|
||||
+ "(treeRef=" + treeRef + ",rcol=" + rcol + ",gridTable=" + gridTableUpper
|
||||
+ ") → 保留扁平 picker 基线");
|
||||
return;
|
||||
}
|
||||
String rcolUpper = rcol.toUpperCase();
|
||||
boolean multiple = Boolean.TRUE.equals(item.get("multiple"));
|
||||
String name = f.attributeValue("name", "");
|
||||
|
||||
// 右表列:取自 gridtemplate 引用模板的 <display>(与 convertTreeGrid 右表列同源)。
|
||||
List<Map<String, Object>> gridCols = new ArrayList<>();
|
||||
Element gridRoot = loadRefRoot(gridRef, result);
|
||||
if (gridRoot != null) {
|
||||
Element display = gridRoot.element("display");
|
||||
if (display != null) {
|
||||
List<Map<String, Object>> refCols = buildColumns(display, gridEntityId, result);
|
||||
if (refCols != null && !refCols.isEmpty()) {
|
||||
gridCols = refCols;
|
||||
}
|
||||
}
|
||||
}
|
||||
// labelField=_label:treegrid 端点已为每行补统一显示值 _label(= 网格实体显示列),与「加载已存值经
|
||||
// EntityController 解析出的 {_id,_label}」同口径——chip/选中/加载三处显人可读名而非裸 id(与 PickerController
|
||||
// 扁平 picker 的 _label 约定一致)。
|
||||
String labelField = "_label";
|
||||
|
||||
// 右表数据源:子树聚合端点(点分类含整棵子树,对齐老系统),node 取分类 tree-select 当前值。
|
||||
String source = "/api/template/treegrid?treeRef=" + treeRef + "&gridTable=" + gridTableUpper
|
||||
+ "&rcol=" + rcolUpper + "&node=${" + rcolUpper + "}&page=${page}&perPage=${perPage}";
|
||||
|
||||
// 左分类树过滤器:tree-select(name=rcol),source=左树端点;选分类→${rcol}→source.node 过滤右表重载。
|
||||
Map<String, Object> treeFilter = new LinkedHashMap<>();
|
||||
treeFilter.put("type", "tree-select");
|
||||
treeFilter.put("name", rcolUpper);
|
||||
treeFilter.put("label", "分类");
|
||||
treeFilter.put("source", "/api/template/" + treeRef + "/tree");
|
||||
treeFilter.put("searchable", true);
|
||||
treeFilter.put("clearable", true);
|
||||
Map<String, Object> filter = new LinkedHashMap<>();
|
||||
filter.put("title", "");
|
||||
filter.put("body", new ArrayList<>(List.of(treeFilter)));
|
||||
|
||||
Map<String, Object> pickerSchema = new LinkedHashMap<>();
|
||||
pickerSchema.put("mode", "table");
|
||||
pickerSchema.put("filter", filter);
|
||||
if (!gridCols.isEmpty()) {
|
||||
pickerSchema.put("columns", gridCols);
|
||||
}
|
||||
pickerSchema.put("footerToolbar", List.of("pagination"));
|
||||
|
||||
// 重写 item:保持 type=picker,换数据源/字段/弹窗内容为 tree+grid。
|
||||
item.put("type", "picker");
|
||||
item.put("clearable", true);
|
||||
if (multiple) {
|
||||
item.put("multiple", true);
|
||||
}
|
||||
item.put("source", source);
|
||||
item.put("labelField", labelField);
|
||||
item.put("valueField", "_id");
|
||||
item.put("modalMode", "dialog");
|
||||
item.put("modalSize", "lg");
|
||||
item.put("pickerSchema", pickerSchema);
|
||||
|
||||
result.note("树+grid选择框 " + name + " → dialogid=" + dialogId + " 是 type=4 树+grid 模板"
|
||||
+ " → picker(弹窗内=左分类树[" + rcolUpper + "]过滤 + 右表 " + gridTableUpper
|
||||
+ " CRUD,labelField=" + labelField + "),提交值仍 _id");
|
||||
}
|
||||
|
||||
/**
|
||||
* dialogid(=view_template_id) 指向的模板是否 type=4(树+grid,浏览/选择两用)。
|
||||
* 用于把 type=4 选择框(SelectDialog/MultiSelectDialog)的扁平 picker 改写为「树过滤 + grid」picker。
|
||||
* 查询失败/非 type=4 → false(保持扁平 picker 基线,零回归)。
|
||||
*/
|
||||
private boolean isType4Dialog(String dialogId) {
|
||||
if (dialogId == null || dialogId.isBlank()) {
|
||||
return false;
|
||||
}
|
||||
try {
|
||||
Integer type = jdbcTemplate.queryForObject(
|
||||
"SELECT type FROM view_template WHERE view_template_id = ?",
|
||||
Integer.class, dialogId);
|
||||
return type != null && type == 4;
|
||||
} catch (Exception e) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* dialogid(=view_template_id) 指向的模板是否 type=3(树形对话框,绑自引用层级实体)。
|
||||
* 用于把「上级菜单/父分类」等层级引用的 SelectDialog 从扁平 picker 改写为 tree-select。
|
||||
|
||||
@@ -259,6 +259,113 @@ class TemplateToAmisConverterTest {
|
||||
assertEquals("/api/picker/LIST1/list", items.get(0).get("source"));
|
||||
}
|
||||
|
||||
/**
|
||||
* 树+grid 选择框:可编辑 SelectDialog 的 dialogid 指向 type=4「树+grid」模板({@code <treetemplate ref/>}
|
||||
* + {@code <gridtemplate ref/ entityid/ rcolumnname/>},如「功能管理」)→ 改写为 picker,弹窗内 =
|
||||
* 左分类树过滤(tree-select name=rcol source=左树端点)+ 右 CRUD 表格(source=treegrid 子树聚合端点,
|
||||
* node=${rcol}),列取自 gridtemplate display,labelField=_label,valueField=_id(提交仍裸 id)。
|
||||
* 降级规则:通用 + 自定义 type=4 全走此路(不看 engineclass)。
|
||||
*/
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void selectDialog_dialogid指向type4树grid模板_转tree加grid的picker() {
|
||||
JdbcTemplate jdbc = mock(JdbcTemplate.class);
|
||||
// queryForObject(Integer) → dialog 模板 type=4
|
||||
lenient().when(jdbc.queryForObject(any(String.class), eq(Integer.class), any(Object[].class)))
|
||||
.thenReturn(4);
|
||||
// queryForObject(String) → resolveTableName(gridEntityId='ge') 取实体表名
|
||||
lenient().when(jdbc.queryForObject(any(String.class), eq(String.class), any(Object[].class)))
|
||||
.thenReturn("VIEW_TEMPLATE");
|
||||
// queryForList(xml::text) by ref:dialogid=TG4 → 树+grid 结构;gridRef=GREF → 右表 display
|
||||
lenient().when(jdbc.queryForList(any(String.class), eq(String.class), any(Object[].class)))
|
||||
.thenAnswer(inv -> {
|
||||
// 末位参数=绑定值(varargs):可能被 Mockito 摊为单值或数组,统一摊平找 ref。
|
||||
Object[] all = inv.getArguments();
|
||||
Object last = all[all.length - 1];
|
||||
String ref = last instanceof Object[] arr && arr.length > 0
|
||||
? String.valueOf(arr[0]) : String.valueOf(last);
|
||||
if ("TG4".equals(ref)) {
|
||||
return List.of("<tree>"
|
||||
+ "<treetemplate ref='TREF' entityid='te'/>"
|
||||
+ "<gridtemplate ref='GREF' entityid='ge' rcolumnname='ENTITYTYPE'/>"
|
||||
+ "</tree>");
|
||||
}
|
||||
if ("GREF".equals(ref)) {
|
||||
return List.of("<crud entityid='ge'><display>"
|
||||
+ "<field name='NAME' text='功能名称'/>"
|
||||
+ "<field name='TYPE' text='类型'/>"
|
||||
+ "</display></crud>");
|
||||
}
|
||||
return List.of();
|
||||
});
|
||||
TemplateToAmisConverter c = new TemplateToAmisConverter(jdbc);
|
||||
|
||||
String xml = "<crud entityid='e1'><display/>"
|
||||
+ "<search><field name='VIEW_TEMPLATEID' label='功能' uitype='SelectDialog' dialogid='TG4'/></search>"
|
||||
+ "</crud>";
|
||||
ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage);
|
||||
Map<String, Object> crud = body(r.getSchema());
|
||||
Map<String, Object> filter = (Map<String, Object>) crud.get("filter");
|
||||
List<Map<String, Object>> items = (List<Map<String, Object>>) filter.get("body");
|
||||
Map<String, Object> picker = items.get(0);
|
||||
|
||||
// 仍是 picker(非 tree-select、非扁平 /api/picker),数据源为 treegrid 子树聚合端点
|
||||
assertEquals("picker", picker.get("type"), "type=4 选择框应为 tree+grid picker");
|
||||
assertEquals("_id", picker.get("valueField"), "提交值仍裸主键 _id");
|
||||
assertEquals("_label", picker.get("labelField"), "选中显示绑统一显示值 _label");
|
||||
String source = String.valueOf(picker.get("source"));
|
||||
assertTrue(source.startsWith("/api/template/treegrid?"), "右表走 treegrid 子树聚合端点: " + source);
|
||||
assertTrue(source.contains("gridTable=VIEW_TEMPLATE"), "右表实体来自 gridtemplate: " + source);
|
||||
assertTrue(source.contains("rcol=ENTITYTYPE"), "过滤列来自 rcolumnname: " + source);
|
||||
assertTrue(source.contains("node=${ENTITYTYPE}"), "node 取分类 tree-select 当前值: " + source);
|
||||
assertTrue(source.contains("treeRef=TREF"), "treeRef 来自 treetemplate: " + source);
|
||||
|
||||
// pickerSchema:左分类树过滤 + 右表列
|
||||
Map<String, Object> ps = (Map<String, Object>) picker.get("pickerSchema");
|
||||
assertNotNull(ps, "应有 pickerSchema");
|
||||
assertEquals("table", ps.get("mode"));
|
||||
Map<String, Object> psFilter = (Map<String, Object>) ps.get("filter");
|
||||
assertNotNull(psFilter, "弹窗内应有分类树过滤器");
|
||||
List<Map<String, Object>> filterBody = (List<Map<String, Object>>) psFilter.get("body");
|
||||
Map<String, Object> treeSel = filterBody.get(0);
|
||||
assertEquals("tree-select", treeSel.get("type"), "过滤器是分类 tree-select");
|
||||
assertEquals("ENTITYTYPE", treeSel.get("name"), "tree-select 绑过滤列 rcol");
|
||||
assertEquals("/api/template/TREF/tree", treeSel.get("source"), "分类树 source 指 treetemplate 树端点");
|
||||
List<Map<String, Object>> cols = (List<Map<String, Object>>) ps.get("columns");
|
||||
assertNotNull(cols, "右表列取自 gridtemplate display");
|
||||
assertEquals("NAME", cols.get(0).get("name"));
|
||||
assertEquals("功能名称", cols.get(0).get("label"));
|
||||
}
|
||||
|
||||
/**
|
||||
* 不回归:type=4 树+grid 结构缺失(dialog XML 无 treetemplate/gridtemplate)→ 保留扁平 picker 基线,
|
||||
* 不误改写、不抛错。
|
||||
*/
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void selectDialog_type4但结构缺失_保留扁平picker基线() {
|
||||
JdbcTemplate jdbc = mock(JdbcTemplate.class);
|
||||
lenient().when(jdbc.queryForObject(any(String.class), eq(Integer.class), any(Object[].class)))
|
||||
.thenReturn(4);
|
||||
lenient().when(jdbc.queryForObject(any(String.class), eq(String.class), any(Object[].class)))
|
||||
.thenReturn("PM_DEMO");
|
||||
// dialog XML 不是标准 tree+grid(无 treetemplate/gridtemplate)
|
||||
lenient().when(jdbc.queryForList(any(String.class), eq(String.class), any(Object[].class)))
|
||||
.thenReturn(List.of("<tree><node entityid='ne'/></tree>"));
|
||||
TemplateToAmisConverter c = new TemplateToAmisConverter(jdbc);
|
||||
|
||||
String xml = "<crud entityid='e1'><display/>"
|
||||
+ "<search><field name='REF' label='引用' uitype='SelectDialog' dialogid='TG4'/></search>"
|
||||
+ "</crud>";
|
||||
ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage);
|
||||
Map<String, Object> crud = body(r.getSchema());
|
||||
Map<String, Object> filter = (Map<String, Object>) crud.get("filter");
|
||||
List<Map<String, Object>> items = (List<Map<String, Object>>) filter.get("body");
|
||||
Map<String, Object> picker = items.get(0);
|
||||
assertEquals("picker", picker.get("type"));
|
||||
assertEquals("/api/picker/TG4/list", picker.get("source"), "结构缺失应保留 UiTypeMapper 扁平 picker 基线");
|
||||
}
|
||||
|
||||
/**
|
||||
* 修复:ComboBox 非 _SEARCH 命名的列表服务(推不出实体表)→ 经 sys_serviceflow.entityid 解析数据源实体
|
||||
* → /api/picker/{实体}/list(而非保底空字典)。mock jdbc 返 PM_DEMO 作实体表。
|
||||
|
||||
Reference in New Issue
Block a user