feat(converter): 树 type=3 选择框 tree-select 加 searchable(大树下拉搜索过滤)

type=3 树 dialog 的 SelectDialog→tree-select 改写(1052)+ master-detail 新增分类上级选择器(2646)均补 searchable:true。amis tree-select 6.13 searchable 实测生效:输入即过滤(实测 6622 节点→匹配项)、值显层级路径(信息站/通讯工具/个人通讯录)、提交值仍 id。amis picker 装不了弹窗树(spike 证空弹窗),故保持 tree-select 加搜索为可靠惯用法。重转重导:123 页 tree-select 带 searchable。138 测试绿。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-06-16 21:12:22 +08:00
parent e2ddf157d5
commit dc2aa31df8
2 changed files with 38 additions and 0 deletions

View File

@@ -1050,6 +1050,7 @@ public class TemplateToAmisConverter {
item.put("type", "tree-select"); item.put("type", "tree-select");
item.put("source", "/api/template/" + dialogId + "/tree"); item.put("source", "/api/template/" + dialogId + "/tree");
item.put("clearable", true); item.put("clearable", true);
item.put("searchable", true); // 大树下拉带搜索框,过滤层级节点
if (multiple) { if (multiple) {
item.put("multiple", true); item.put("multiple", true);
} }
@@ -2643,6 +2644,7 @@ public class TemplateToAmisConverter {
parentField.put("label", "上级分类"); parentField.put("label", "上级分类");
parentField.put("source", "/api/template/" + treeRef + "/tree"); parentField.put("source", "/api/template/" + treeRef + "/tree");
parentField.put("clearable", true); parentField.put("clearable", true);
parentField.put("searchable", true); // 大树下拉带搜索框,过滤层级节点
parentField.put("placeholder", "留空 = 顶级分类"); parentField.put("placeholder", "留空 = 顶级分类");
fields.add(parentField); fields.add(parentField);
} }

View File

@@ -207,9 +207,36 @@ class TemplateToAmisConverterTest {
Map<String, Object> parent = items.get(0); Map<String, Object> parent = items.get(0);
assertEquals("tree-select", parent.get("type")); assertEquals("tree-select", parent.get("type"));
assertEquals("/api/template/TREE1/tree", parent.get("source")); assertEquals("/api/template/TREE1/tree", parent.get("source"));
assertEquals(true, parent.get("searchable"), "大树 tree-select 应带搜索框(searchable)");
assertNull(parent.get("pickerSchema")); // picker 专属键已清除 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 = "<crud entityid='e1'><display/>"
+ "<search><field name='PARENTID' label='上级菜单' uitype='SelectDialog' dialogid='TREE1'/></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> 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。 */ /** 不回归:dialogid 指向非树模板(type≠3)的 SelectDialog 仍转扁平 picker。 */
@Test @Test
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@@ -990,6 +1017,15 @@ class TemplateToAmisConverterTest {
assertEquals("button", addBtn.get("type")); assertEquals("button", addBtn.get("type"));
assertEquals("新增分类", addBtn.get("label")); assertEquals("新增分类", addBtn.get("label"));
assertEquals("dialog", addBtn.get("actionType")); assertEquals("dialog", addBtn.get("actionType"));
// 弹窗内「上级分类」选择器 = tree-select 且带搜索框(大树过滤)
Map<String, Object> dialog = (Map<String, Object>) addBtn.get("dialog");
Map<String, Object> addForm = (Map<String, Object>) dialog.get("body");
List<Map<String, Object>> addFields = (List<Map<String, Object>>) addForm.get("body");
Map<String, Object> 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) // 树本体:可编辑/可删 + source 走 TemplateTreeController(修 undefined)
assertEquals("input-tree", tree.get("type")); assertEquals("input-tree", tree.get("type"));
assertEquals("/api/template/a763d48d-tmpl/tree", tree.get("source"), assertEquals("/api/template/a763d48d-tmpl/tree", tree.get("source"),