diff --git a/platform-converter/src/main/java/com/eip4/platform/converter/TemplateToAmisConverter.java b/platform-converter/src/main/java/com/eip4/platform/converter/TemplateToAmisConverter.java index 47ade33..b685c49 100644 --- a/platform-converter/src/main/java/com/eip4/platform/converter/TemplateToAmisConverter.java +++ b/platform-converter/src/main/java/com/eip4/platform/converter/TemplateToAmisConverter.java @@ -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」模板( + ,如「功能管理」)→ 把扁平 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 (转换器侧解析)。 + applyTreeGridPicker(item, f, dialogId, result); } } } + /** + * type=4 树+grid 选择框(弹窗内 = 左分类树过滤 + 右 CRUD 表格)的 picker 改写。 + * + *

读 dialog(type=4 view_template)XML 的 {@code }(左分类树)+ + * {@code }(右数据表 + 分类过滤列),按 spike 确认的机制重写 + * 入参 {@code item}(原 UiTypeMapper 产的扁平 picker): + *

    + *
  • {@code source}=右表子树聚合端点 {@code /api/template/treegrid?treeRef=&gridTable=&rcol=&node=${rcol}} + * (与 {@link #convertTreeGrid} 浏览页右表同源;node 取分类 tree-select 的当前值 {@code ${rcol}});
  • + *
  • {@code labelField}=右表显示列(gridtemplate display 首个可见列,回落实体显示列)——treegrid 端点返 + * 业务行(无统一 {@code _label}),故 chip/选中显示绑真实显示列,显名而非裸 id;
  • + *
  • {@code valueField=_id}(保持表单提交值=裸主键不变);
  • + *
  • {@code pickerSchema}={@code crud(mode=table)} + {@code filter:[tree-select name=rcol source=左树端点]} + * + {@code columns}(gridtemplate {@code } 解析,转换器侧——与 convertTreeGrid 右表列同源)。
  • + *
+ * 解析失败(dialog XML 缺 treetemplate/gridtemplate、实体/rcol 解析不出)→ 保留扁平 picker 基线(零回归)。 + */ + private void applyTreeGridPicker(Map 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 引用模板的 (与 convertTreeGrid 右表列同源)。 + List> gridCols = new ArrayList<>(); + Element gridRoot = loadRefRoot(gridRef, result); + if (gridRoot != null) { + Element display = gridRoot.element("display"); + if (display != null) { + List> 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 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 filter = new LinkedHashMap<>(); + filter.put("title", ""); + filter.put("body", new ArrayList<>(List.of(treeFilter))); + + Map 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。 diff --git a/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java b/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java index b7ad08a..b6703b8 100644 --- a/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java +++ b/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java @@ -259,6 +259,113 @@ class TemplateToAmisConverterTest { assertEquals("/api/picker/LIST1/list", items.get(0).get("source")); } + /** + * 树+grid 选择框:可编辑 SelectDialog 的 dialogid 指向 type=4「树+grid」模板({@code } + * + {@code },如「功能管理」)→ 改写为 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("" + + "" + + "" + + ""); + } + if ("GREF".equals(ref)) { + return List.of("" + + "" + + "" + + ""); + } + return List.of(); + }); + TemplateToAmisConverter c = new TemplateToAmisConverter(jdbc); + + String xml = "" + + "" + + ""; + ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage); + Map crud = body(r.getSchema()); + Map filter = (Map) crud.get("filter"); + List> items = (List>) filter.get("body"); + Map 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 ps = (Map) picker.get("pickerSchema"); + assertNotNull(ps, "应有 pickerSchema"); + assertEquals("table", ps.get("mode")); + Map psFilter = (Map) ps.get("filter"); + assertNotNull(psFilter, "弹窗内应有分类树过滤器"); + List> filterBody = (List>) psFilter.get("body"); + Map 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> cols = (List>) 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("")); + TemplateToAmisConverter c = new TemplateToAmisConverter(jdbc); + + String xml = "" + + "" + + ""; + ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage); + Map crud = body(r.getSchema()); + Map filter = (Map) crud.get("filter"); + List> items = (List>) filter.get("body"); + Map 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 作实体表。 diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/TemplateTreeController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/TemplateTreeController.java index 2d0062d..deb9d55 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/TemplateTreeController.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/TemplateTreeController.java @@ -152,7 +152,45 @@ public class TemplateTreeController { if (perPage != null) { body.put("perPage", perPage); } - return flowController.executePost(gridTable.toUpperCase() + "_SEARCH", null, body); + ResponseEntity> 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> 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 row = (Map) 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 过滤)。节点不在树中(陈旧)→ 退化为仅自身。 */ diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/TemplateTreeControllerTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/TemplateTreeControllerTest.java index 9f28b3a..5e1c10b 100644 --- a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/TemplateTreeControllerTest.java +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/TemplateTreeControllerTest.java @@ -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> items = new ArrayList<>(); + Map r1 = new LinkedHashMap<>(); + r1.put("_id", "ROW1"); + r1.put("NAME", "功能甲"); + items.add(r1); + Map r2 = new LinkedHashMap<>(); + r2.put("_id", "ROW2"); + r2.put("NAME", ""); // 空显示值 → _label 回落主键 + items.add(r2); + Map data = new LinkedHashMap<>(); + data.put("items", items); + data.put("total", 2); + Map 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守卫() {