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 29432ba..aa0a4f9 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 @@ -367,11 +367,17 @@ final class UiTypeMapper { if ("true".equals(sub.attributeValue("hidden"))) { continue; } - // 子列复用同一套 uitype 映射,但落到 quickEdit 语义;这里取最小可渲染列 + // A1:子列递归走同一套 uitype 映射,落 amis input-table 列的 quickEdit:{type,...}, + // 子表内 SelectDialog/ComboBox/NumberField/PopupDateField/CheckBox 不再退化为纯文本。 + // 子表是独立实体(editgrid@entityid),其列枚举元数据未加载,故 colMeta 传空 Map: + // 显式 comboboxid/dialogid 的控件正常,依赖列枚举元数据的无源 ComboBox 仍走原降级(与列表页同口径)。 + Map control = mapField(sub, result, "editgrid:" + name, java.util.Map.of()); Map col = new LinkedHashMap<>(); - col.put("name", sub.attributeValue("name", "")); - col.put("label", firstNonBlank(sub.attributeValue("label"), sub.attributeValue("name"))); - col.put("type", "input-text"); // 子表列统一可编辑文本;精细控件由 quickEdit 后续细化 + col.put("name", control.get("name")); + col.put("label", control.get("label")); + Map quickEdit = new LinkedHashMap<>(control); + quickEdit.remove("label"); // label 归列头,避免编辑器内重复显示 + col.put("quickEdit", quickEdit); columns.add(col); } result.note("editgrid " + name + " → input-table " + columns.size() + " 列(取自 editgridtemplate)"); 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 30711cf..1fcb2e4 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 @@ -341,6 +341,40 @@ class TemplateToAmisConverterTest { assertEquals("MONEY", cols.get(0).get("name")); } + @Test + @SuppressWarnings("unchecked") + void form_editGrid子表列递归映射控件类型() { + // A1:子表列不再硬写 input-text,按子字段 uitype 递归落 quickEdit:{type,...}, + // 子表内 SelectDialog/ComboBox/NumberField/Date/CheckBox 恢复真实控件。 + String pageXml = "" + + "" + + "" + + "]]>" + + ""; + Function resolver = id -> pageXml; + String xml = "
"; + ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), resolver); + Map sub = flattenFormBody(body(r.getSchema())).get(0); + assertEquals("input-table", sub.get("type")); + List> cols = (List>) sub.get("columns"); + assertEquals(4, cols.size()); // 隐藏主键列被过滤,余 4 列 + + // 每列按子字段 uitype 落 quickEdit 控件(不再统一 input-text) + Map> byName = new java.util.HashMap<>(); + for (Map c : cols) { + byName.put((String) c.get("name"), (Map) c.get("quickEdit")); + } + assertEquals("picker", byName.get("USERID").get("type")); // SelectDialog+dialogid → picker + assertEquals("input-number", byName.get("MONEY").get("type")); // NumberField → input-number + assertEquals("input-date", byName.get("ADATE").get("type")); // PopupDateField → input-date + assertEquals("select", byName.get("FLAG").get("type")); // ComboBox → select + } + @Test void form_缺页面解析器降级() { String xml = "";