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 bff6f68..266ee5f 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 @@ -118,19 +118,27 @@ final class UiTypeMapper { // 旧引擎弹窗选择器 → 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("source", "/api/picker/" + f.attributeValue("dialogid", "") + "/list"); + 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 占位(弹窗数据源 /api/picker,需后端实现)"); + + f.attributeValue("dialogid", "") + ") → select+source(searchable) /api/picker(F2-9)"); } case "MultiSelectDialog" -> { + // F2-9:多选 + searchable item.put("type", "select"); item.put("multiple", true); item.put("clearable", true); - item.put("source", "/api/picker/" + f.attributeValue("dialogid", "") + "/list"); + 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)+source 占位(数据源待实现)"); + + f.attributeValue("dialogid", "") + ") → select(multiple,searchable)+source /api/picker(F2-9)"); } case "MultiFileUploadField", "FileUploadField" -> { // F2-8 附件控件:旧引擎 MultiFileUploadField/FileUploadField → amis input-file。 diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/OrgController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/OrgController.java index 073b1fe..bc06a6a 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/OrgController.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/OrgController.java @@ -111,6 +111,59 @@ public class OrgController { return okList(rows); } + /** + * F2-9:部门树——amis tree-select 消费格式。 + * + *
返回 {@code [{label, value, children:[...]}]} 嵌套结构,供 amis {@code select-tree} 的
+ * {@code source=/api/org/depart-tree/{orgId}/amis-tree} 直接消费。
+ * path 字段即部门名称(VIEW_DEPART_TREE.path 无父路径前缀时为叶节点名),parentid 空串视为根节点。
+ */
+ @Operation(summary = "部门树(amis tree-select 格式,{label,value,children}嵌套)")
+ @GetMapping("/api/org/depart-tree/{orgId}/amis-tree")
+ public Map