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 4345cd8..47ade33 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 @@ -1050,6 +1050,7 @@ public class TemplateToAmisConverter { item.put("type", "tree-select"); item.put("source", "/api/template/" + dialogId + "/tree"); item.put("clearable", true); + item.put("searchable", true); // 大树下拉带搜索框,过滤层级节点 if (multiple) { item.put("multiple", true); } @@ -2643,6 +2644,7 @@ public class TemplateToAmisConverter { parentField.put("label", "上级分类"); parentField.put("source", "/api/template/" + treeRef + "/tree"); parentField.put("clearable", true); + parentField.put("searchable", true); // 大树下拉带搜索框,过滤层级节点 parentField.put("placeholder", "留空 = 顶级分类"); fields.add(parentField); } 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 d1b8545..b7ad08a 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 @@ -207,9 +207,36 @@ class TemplateToAmisConverterTest { Map parent = items.get(0); assertEquals("tree-select", parent.get("type")); assertEquals("/api/template/TREE1/tree", parent.get("source")); + assertEquals(true, parent.get("searchable"), "大树 tree-select 应带搜索框(searchable)"); assertNull(parent.get("pickerSchema")); // picker 专属键已清除 } + /** + * 大树过滤:type=3 树模板 → tree-select 须含 {@code searchable:true}(下拉带搜索框,过滤层级节点)。 + * 单独固化 searchable,避免后续改写丢失搜索能力。 + */ + @Test + @SuppressWarnings("unchecked") + void selectDialog_树模板_treeSelect含searchable() { + JdbcTemplate jdbc = mock(JdbcTemplate.class); + lenient().when(jdbc.queryForObject(any(String.class), eq(String.class), any(Object[].class))) + .thenReturn("PM_DEMO"); + lenient().when(jdbc.queryForObject(any(String.class), eq(Integer.class), any(Object[].class))) + .thenReturn(3); // dialogid=TREE1 → type=3 树模板 + 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 parent = items.get(0); + assertEquals("tree-select", parent.get("type")); + assertEquals(true, parent.get("searchable"), "type=3 SelectDialog → tree-select 应含 searchable:true"); + } + /** 不回归:dialogid 指向非树模板(type≠3)的 SelectDialog 仍转扁平 picker。 */ @Test @SuppressWarnings("unchecked") @@ -990,6 +1017,15 @@ class TemplateToAmisConverterTest { assertEquals("button", addBtn.get("type")); assertEquals("新增分类", addBtn.get("label")); assertEquals("dialog", addBtn.get("actionType")); + // 弹窗内「上级分类」选择器 = tree-select 且带搜索框(大树过滤) + Map dialog = (Map) addBtn.get("dialog"); + Map addForm = (Map) dialog.get("body"); + List> addFields = (List>) addForm.get("body"); + Map parentSel = addFields.stream() + .filter(it -> "tree-select".equals(it.get("type"))) + .findFirst().orElse(null); + assertNotNull(parentSel, "新增弹窗应含上级分类 tree-select"); + assertEquals(true, parentSel.get("searchable"), "上级分类 tree-select 应带搜索框(searchable)"); // 树本体:可编辑/可删 + source 走 TemplateTreeController(修 undefined) assertEquals("input-tree", tree.get("type")); assertEquals("/api/template/a763d48d-tmpl/tree", tree.get("source"),