diff --git a/platform-converter/src/main/java/com/eip4/platform/converter/UiTypeMapper.java b/platform-converter/src/main/java/com/eip4/platform/converter/UiTypeMapper.java index c9c5677..707e58a 100644 --- a/platform-converter/src/main/java/com/eip4/platform/converter/UiTypeMapper.java +++ b/platform-converter/src/main/java/com/eip4/platform/converter/UiTypeMapper.java @@ -122,30 +122,33 @@ final class UiTypeMapper { + (hasTime ? "input-datetime-range" : "input-date-range") + "(区间)"); } case "SelectDialog" -> { - // 旧引擎弹窗选择器 → amis select + 远程 source(弹窗数据由 dialogid 指向的模板提供,跨模板引用本批未联动)。 - // 注:不用 amis picker——picker 需内嵌 pickerSchema(CRUD),且 6.13 schema 未把 picker 纳入 - // 表单项 oneOf,闸一会拒(手册 §8.2 schema 严格性);select+source 双闸皆过,是更保真的降级。 - // F2-9:searchable=true + source 带 q=${term} 透传搜索关键字到后端 /api/picker/{id}/list?q= - item.put("type", "select"); - item.put("clearable", true); - item.put("searchable", true); - item.put("source", - "/api/picker/" + f.attributeValue("dialogid", "") - + "/list?q=${term}&page=${page}&perPage=${perPage}"); - result.degrade(origin + "@field " + name + " uitype=SelectDialog(dialogid=" - + f.attributeValue("dialogid", "") + ") → select+source(searchable) /api/picker(F2-9)"); + // 旧引擎弹窗选择器 → amis picker(弹窗多列表格 + 搜索 + 分页),恢复老系统「弹窗对照选择」语义。 + // 历史降级注释「6.13 schema 未纳入 picker」已核实失实:amis-schema-6.13.0.json 的 SchemaObject + // allOf 含 {if type==picker then PickerControlSchema},picker 表单项过得了闸一(见 + // SchemaGateTest.picker表单项过闸一)。列由 /api/picker 运行时随响应 data.columns 提供—— + // 转换器不解析跨模板 dialog XML(§6:不加深转换器对 XML 的耦合),列知识落在运行时 PickerController。 + String dialogId = f.attributeValue("dialogid", ""); + if (dialogId.isBlank()) { + applySelectDialogFallback(item, "", false); + result.degrade(origin + "@field " + name + + " uitype=SelectDialog(dialogid=空) → select+source(无 dialogid,数据源缺失,保持搜索下拉)"); + } else { + applyPicker(item, dialogId, false); + result.note(origin + "@field " + name + " uitype=SelectDialog(dialogid=" + + dialogId + ") → picker(弹窗 table,列由 /api/picker 运行时提供)"); + } } case "MultiSelectDialog" -> { - // F2-9:多选 + searchable - item.put("type", "select"); - item.put("multiple", true); - item.put("clearable", true); - item.put("searchable", true); - item.put("source", - "/api/picker/" + f.attributeValue("dialogid", "") - + "/list?q=${term}&page=${page}&perPage=${perPage}"); - result.degrade(origin + "@field " + name + " uitype=MultiSelectDialog(dialogid=" - + f.attributeValue("dialogid", "") + ") → select(multiple,searchable)+source /api/picker(F2-9)"); + String dialogId = f.attributeValue("dialogid", ""); + if (dialogId.isBlank()) { + applySelectDialogFallback(item, "", true); + result.degrade(origin + "@field " + name + + " uitype=MultiSelectDialog(dialogid=空) → select(multiple)+source(无 dialogid,保持搜索下拉)"); + } else { + applyPicker(item, dialogId, true); + result.note(origin + "@field " + name + " uitype=MultiSelectDialog(dialogid=" + + dialogId + ") → picker(弹窗 table,multiple,列由 /api/picker 运行时提供)"); + } } case "MultiFileUploadField", "FileUploadField" -> { // F2-8 附件控件:旧引擎 MultiFileUploadField/FileUploadField → amis input-file。 @@ -173,6 +176,56 @@ final class UiTypeMapper { return item; } + /** + * SelectDialog/MultiSelectDialog → amis {@code picker}(弹窗对照选择)。 + * + *

picker 的 {@code source} 即内嵌 CRUD 的 {@code api}(见 amis Picker.tsx buildSchema: + * {@code api: props.source});{@code pickerSchema} 留空 {@code columns} → CRUD 按响应 + * {@code data.columns} 渲染(见 amis crud.ts:{@code self.columns = columns.concat()}),故 + * 列由运行时 {@link PickerController} 随每个 dialog 的实体提供,转换器零跨模板耦合。 + * {@code labelField="_label"}(PickerController 为每行补的统一显示值,选中 chip 显示人可读名而非 id)、 + * {@code valueField="_id"}(与旧 select 写回值同口径,保证表单提交值不变)。 + * {@code source} 不带 {@code ?q=&page=} 模板——CRUD 自动把搜索框值 {@code q} 与 {@code page/perPage} + * 作 query 透传(见官方 picker 文档示例)。 + */ + private static void applyPicker(Map item, String dialogId, boolean multiple) { + item.put("type", "picker"); + item.put("clearable", true); + if (multiple) { + item.put("multiple", true); + } + item.put("source", "/api/picker/" + dialogId + "/list"); + item.put("labelField", "_label"); + item.put("valueField", "_id"); + item.put("modalMode", "dialog"); + item.put("modalSize", "lg"); + + Map searchBox = new LinkedHashMap<>(); + searchBox.put("type", "search-box"); + searchBox.put("name", "q"); // CRUD 把它作 query 透传 → PickerController 读 q + searchBox.put("placeholder", "输入关键字搜索"); + + Map pickerSchema = new LinkedHashMap<>(); + pickerSchema.put("mode", "table"); // 多列表格(默认 list 为单列),列由 API 提供 + pickerSchema.put("headerToolbar", List.of(searchBox)); + pickerSchema.put("footerToolbar", List.of("pagination")); + item.put("pickerSchema", pickerSchema); + } + + /** + * dialogid 缺失时的降级:保持 F2-9 的 {@code select + 远程 source}(搜索下拉)。 + * 无 dialogid 即无可解析数据源,弹窗 picker 会空载,故不退化为弹窗,沿用既有搜索下拉降级形态。 + */ + private static void applySelectDialogFallback(Map item, String dialogId, boolean multiple) { + item.put("type", "select"); + if (multiple) { + item.put("multiple", true); + } + item.put("clearable", true); + item.put("searchable", true); + item.put("source", "/api/picker/" + dialogId + "/list?q=${term}&page=${page}&perPage=${perPage}"); + } + /** 解析 EditGrid 的 {@code } CDATA,把内嵌 editgrid 字段转成 input-table 列。 */ private static List> buildEditGridColumns(Element f, ConversionResult result, String name) { List> columns = new ArrayList<>(); diff --git a/platform-converter/src/test/java/com/eip4/platform/converter/SchemaGateAndCliTest.java b/platform-converter/src/test/java/com/eip4/platform/converter/SchemaGateAndCliTest.java index a35773c..08c0e3d 100644 --- a/platform-converter/src/test/java/com/eip4/platform/converter/SchemaGateAndCliTest.java +++ b/platform-converter/src/test/java/com/eip4/platform/converter/SchemaGateAndCliTest.java @@ -36,6 +36,27 @@ class SchemaGateAndCliTest { assertTrue(errors.isEmpty(), () -> "闸一应通过,但有错误: " + errors); } + @Test + void schemaGate_picker表单项过闸一() { + // 核实历史降级注释「6.13 schema 未把 picker 纳入表单项 oneOf,闸一会拒」失实: + // amis-schema-6.13.0.json 的 SchemaObject allOf 含 {if type==picker then PickerControlSchema}, + // SelectDialog→picker 的转换产物应过闸一。此测固化该结论,防回归。 + JdbcTemplate jdbc = mock(JdbcTemplate.class); + lenient().when(jdbc.queryForObject(any(String.class), eq(String.class), any(Object[].class))) + .thenReturn("PM_DEMO"); + TemplateToAmisConverter converter = new TemplateToAmisConverter(jdbc); + String xml = "" + + "" + + ""; + ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), id -> null); + String json = new com.fasterxml.jackson.databind.ObjectMapper().valueToTree(r.getSchema()).toString(); + assertTrue(json.contains("\"picker\""), "SelectDialog 应生成 picker 表单项"); + + SchemaGate gate = new SchemaGate(); + List errors = gate.validate(r.getSchema()); + assertTrue(errors.isEmpty(), () -> "picker 表单项应过闸一,但有错误: " + errors); + } + @Test void schemaGate_明显非法schema被拒() { SchemaGate gate = new SchemaGate(); 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 4caa098..13f42af 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 @@ -109,18 +109,54 @@ class TemplateToAmisConverterTest { } @Test - void crud_selectDialog降级为select() { + @SuppressWarnings("unchecked") + void crud_selectDialog转picker弹窗() { + // SelectDialog → amis picker(弹窗多列表格 + 搜索 + 分页),恢复老系统弹窗对照选择。 + // 列由 /api/picker 运行时随 data.columns 提供(转换器不解析跨模板 dialog XML)。 String xml = "" + ""; ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage); - assertEquals(ConversionGrade.PARTIAL, r.getGrade()); // 数据源未联动 → 降级 Map crud = body(r.getSchema()); Map filter = (Map) crud.get("filter"); List> items = (List>) filter.get("body"); - // SelectDialog → select+source(picker 会被闸一拒,见 §8.2;F2-9 加了 q/page 参数) + Map picker = items.get(0); + assertEquals("picker", picker.get("type")); + assertEquals("/api/picker/d1/list", picker.get("source")); + assertEquals("_label", picker.get("labelField")); + assertEquals("_id", picker.get("valueField")); + assertEquals("dialog", picker.get("modalMode")); + Map ps = (Map) picker.get("pickerSchema"); + assertEquals("table", ps.get("mode")); + // 现为升级 note 而非降级;degrades 不再含该 SelectDialog + assertTrue(r.getMappingNotes().stream().anyMatch(n -> n.contains("PROJ") && n.contains("picker"))); + assertFalse(r.getDegrades().stream().anyMatch(d -> d.contains("SelectDialog(dialogid=d1"))); + } + + @Test + @SuppressWarnings("unchecked") + void crud_multiSelectDialog转picker多选弹窗() { + String xml = "" + + ""; + ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage); + Map filter = (Map) body(r.getSchema()).get("filter"); + List> items = (List>) filter.get("body"); + Map picker = items.get(0); + assertEquals("picker", picker.get("type")); + assertEquals(Boolean.TRUE, picker.get("multiple")); + assertEquals("/api/picker/d9/list", picker.get("source")); + } + + @Test + @SuppressWarnings("unchecked") + void crud_selectDialog无dialogid保持select降级() { + // 无 dialogid → 无可解析数据源,picker 会空载,故保持 F2-9 的 select 搜索下拉降级 + String xml = "" + + ""; + ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage); + Map filter = (Map) body(r.getSchema()).get("filter"); + List> items = (List>) filter.get("body"); assertEquals("select", items.get(0).get("type")); - assertTrue(((String) items.get(0).get("source")).startsWith("/api/picker/d1/list")); - assertTrue(r.getDegrades().stream().anyMatch(d -> d.contains("SelectDialog"))); + assertTrue(r.getDegrades().stream().anyMatch(d -> d.contains("dialogid=空"))); } @Test diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PickerController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PickerController.java index 42c25cc..04b951b 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PickerController.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PickerController.java @@ -156,10 +156,15 @@ public class PickerController { List> rows = toRows(result.get(POJOCRUDService.LIST_RESULT)); List> options = new ArrayList<>(); for (Map row : rows) { - Map opt = new LinkedHashMap<>(); Object value = row.get("_id"); Object label = labelColumn != null ? row.get(labelColumn) : null; - opt.put("label", label != null && !String.valueOf(label).isBlank() ? label : value); + String labelStr = label != null ? String.valueOf(label).trim() : ""; + String display = !labelStr.isBlank() ? labelStr : String.valueOf(value).trim(); + // _label:统一显示值字段。picker 用 labelField="_label" 显示选中项人可读名(与 select 的 + // option.label 同口径),避免依赖各 dialog 实体显示列名(转换器无从得知)。 + row.put("_label", display); + Map opt = new LinkedHashMap<>(); + opt.put("label", display); opt.put("value", value); options.add(opt); } @@ -167,6 +172,7 @@ public class PickerController { Map data = new HashMap<>(); data.put("items", rows); // amis crud/picker 内嵌 CRUD 直接消费 data.put("options", options); // amis select 的 source 直接消费 + data.put("columns", gridColumns(table, info, keyColumn, labelColumn)); // amis picker 内嵌 CRUD 按响应 columns 渲染多列 data.put("total", result.get(POJOCRUDService.PAGE_COUNT)); Map resp = new HashMap<>(); @@ -347,6 +353,102 @@ public class PickerController { return null; } + /** + * 选择窗多列网格列定义(amis picker 内嵌 CRUD 按响应 {@code data.columns} 渲染多列,见 amis crud.ts + * {@code self.columns = columns.concat()})。faithfully 恢复老系统弹窗的「多列对照」: + *

    + *
  1. 名称列:绑 {@code _label}(统一显示值),标签取显示列的 {@code displayname},回落「名称」;
  2. + *
  3. 标识列(工号/编码等,{@code isidentifier=1})作对照列,最多再加 3 列;
  4. + *
  5. 仍不足 2 列 → 补首个非系统、非主键的 String 列。
  6. + *
+ * 对照列均绑 {@code info} 列名 → 与 items 行键一致;{@code displayname} 友好标签查 + * {@code SYS_ENTITYATTRIBUTE},失败回落列名。列知识落在运行时(非转换器),转换器对 dialog XML 零耦合(§6)。 + */ + private List> gridColumns(String table, POJOInfo info, String keyColumn, String labelColumn) { + Map friendly = columnDisplayNames(table); + String keyUp = keyColumn == null ? "" : keyColumn.toUpperCase(); + String labelUp = labelColumn == null ? "" : labelColumn.toUpperCase(); + java.util.Set used = new java.util.LinkedHashSet<>(); + List> cols = new ArrayList<>(); + + // 1) 名称列:绑 _label(已 trim 的显示值),标签取显示列 displayname,回落「名称」 + String nameLabel = !labelUp.isBlank() ? friendly.getOrDefault(labelUp, "名称") : "名称"; + cols.add(col("_label", nameLabel)); + + // 2) 标识列(工号/编码等)作对照列,最多再加 3 列(共 ≤4) + for (int i = 0; i < info.getColumnCount() && cols.size() < 4; i++) { + if (!info.isIdentifier(i)) { + continue; + } + String c = info.getColumnName(i); + if (c == null) { + continue; + } + String cu = c.toUpperCase(); + if (cu.equals(keyUp) || cu.equals(labelUp) || used.contains(cu) || isSystemColumn(cu)) { + continue; + } + cols.add(col(cu, friendly.getOrDefault(cu, cu))); + used.add(cu); + } + // 3) 不足 2 列 → 补首个非系统、非主键 String 列增加对照 + for (int i = 0; i < info.getColumnCount() && cols.size() < 2; i++) { + String c = info.getColumnName(i); + if (c == null) { + continue; + } + String cu = c.toUpperCase(); + if (cu.equals(keyUp) || cu.equals(labelUp) || used.contains(cu) || isSystemColumn(cu)) { + continue; + } + if (info.getColumnClass(i) == String.class) { + cols.add(col(cu, friendly.getOrDefault(cu, cu))); + used.add(cu); + } + } + return cols; + } + + private static Map col(String name, String label) { + Map c = new LinkedHashMap<>(); + c.put("name", name); + c.put("label", label); + c.put("type", "text"); + return c; + } + + /** 实体各列的 {@code displayname} 友好标签(UPPER(列名)→中文名)。查询失败 → 空 map(列标签回落列名)。 */ + private Map columnDisplayNames(String table) { + Map map = new HashMap<>(); + try { + jdbcTemplate.query( + "SELECT UPPER(ea.columnname) AS col, ea.displayname AS nm " + + "FROM sys_entityattribute ea " + + "JOIN sys_entity e ON UPPER(e.sys_entity_id) = UPPER(ea.entityid) " + + "WHERE UPPER(e.tablename) = ?", + rs -> { + String c = rs.getString("col"); + String nm = rs.getString("nm"); + if (c != null && nm != null && !nm.isBlank()) { + map.put(c, nm.trim()); + } + }, + table.toUpperCase()); + } catch (DataAccessException ex) { + // 元数据查询异常 → 列标签回落列名,不影响数据返回 + } + return map; + } + + /** 系统/审计列:不作选择窗对照列(噪声)。 */ + private static boolean isSystemColumn(String colUpper) { + return switch (colUpper) { + case "CREATETIME", "CREATEBY", "UPDATETIME", "UPDATEBY", "VERSION", + "ISACTIVE", "ISDEL", "SEQ", "SYS_ORG_ID", "ORGID", "PARENTID" -> true; + default -> false; + }; + } + /** * 转义进引擎 LIKE 裸拼点的搜索值(引擎 {@code GeneralPO} 对 String 条件做 {@code col like '%值%'} * 字符串拼接,见 GeneralPO.java:1940):单引号双写防 SQL 注入,{@code %}/{@code _} 转义防通配符逃逸。