From 78d27847dd7343328e7768945fc04a3b1dae5b05 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 17 Jun 2026 22:04:26 +0800 Subject: [PATCH] fix(metadata): make user picker searchable and show selections --- .../eip4/platform/converter/UiTypeMapper.java | 1 + .../TemplateToAmisConverterTest.java | 2 ++ .../metadata/web/UserSelectController.java | 21 +++++++++++-------- 3 files changed, 15 insertions(+), 9 deletions(-) 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 8fb39d7..bfd7484 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 @@ -445,6 +445,7 @@ final class UiTypeMapper { item.put("searchable", true); item.put("selectMode", "tree"); item.put("searchResultMode", "list"); + item.put("valueTpl", "${label}"); item.put("pickerSize", "lg"); item.put("selectTitle", "可选项"); item.put("resultTitle", "已选择"); 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 6e0858a..aee74bd 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 @@ -577,8 +577,10 @@ class TemplateToAmisConverterTest { assertEquals(Boolean.TRUE, picker.get("joinValues")); assertEquals("/api/user-select/options?mode=controlled", picker.get("source")); assertEquals("/api/user-select/search?mode=controlled&term=${term}", picker.get("searchApi")); + assertEquals(Boolean.TRUE, picker.get("searchable")); assertEquals("tree", picker.get("selectMode")); assertEquals("list", picker.get("searchResultMode")); + assertEquals("${label}", picker.get("valueTpl")); assertTrue(r.getMappingNotes().stream().anyMatch(n -> n.contains("CREATEBY") && n.contains("tabs-transfer-picker") && n.contains("controlled"))); } diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/UserSelectController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/UserSelectController.java index d075b01..4626cd7 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/UserSelectController.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/UserSelectController.java @@ -45,16 +45,16 @@ public class UserSelectController { List> users = listUsers(normalizedMode, q, safeLimit); List> tabs = new ArrayList<>(); - tabs.add(tab("全部人员", "users", users)); - tabs.add(tab("按公司、部门选择人员", "depart-users", departmentUserTree(users))); - tabs.add(tab("按岗位类别选择人员", "position-type-users", positionTypeUserTree(users))); - tabs.add(tab("按用户类别选择人员", "category-users", categoryUserTree(users))); + tabs.add(tab("全部人员", "users", users, "list")); + tabs.add(tab("按公司、部门选择人员", "depart-users", departmentUserTree(users), "tree")); + tabs.add(tab("按岗位类别选择人员", "position-type-users", positionTypeUserTree(users), "tree")); + tabs.add(tab("按用户类别选择人员", "category-users", categoryUserTree(users), "tree")); if ("org".equals(normalizedMode)) { - tabs.add(tab("全体人员", "all-users", List.of(option("全体人员", ALL_VALUE, "all")))); - tabs.add(tab("选择公司", "orgs", orgOptions(null, 500))); - tabs.add(tab("选择部门", "departs", departOptions(null, 1000))); - tabs.add(tab("选择岗位类别", "position-types", positionTypeOptions(null, 500))); + tabs.add(tab("全体人员", "all-users", List.of(option("全体人员", ALL_VALUE, "all")), "list")); + tabs.add(tab("选择公司", "orgs", orgOptions(null, 500), "list")); + tabs.add(tab("选择部门", "departs", departOptions(null, 1000), "list")); + tabs.add(tab("选择岗位类别", "position-types", positionTypeOptions(null, 500), "list")); } return okOptions(tabs); } @@ -320,10 +320,13 @@ public class UserSelectController { return (rs, rowNum) -> option(rs.getString("label"), rs.getString("value"), type); } - private static Map tab(String label, String value, List> children) { + private static Map tab(String label, String value, List> children, + String selectMode) { Map tab = new LinkedHashMap<>(); tab.put("label", label); tab.put("value", value); + tab.put("searchable", true); + tab.put("selectMode", selectMode); tab.put("children", children == null ? List.of() : children); return tab; }