diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/EntityController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/EntityController.java index df15db9..9476632 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/EntityController.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/EntityController.java @@ -193,10 +193,21 @@ public class EntityController { private Map toRow(GeneralPOJO p) { Map row = new LinkedHashMap<>(); - row.put("_id", p.get_ID()); + row.put("_id", trimChar(p.get_ID())); for (int i = 0; i < p.get_ColumnCount(); i++) { - row.put(p.get_ColumnName(i), p.get_Value(i)); + row.put(p.get_ColumnName(i), trimChar(p.get_Value(i))); } return row; } + + /** + * 去 CHAR 列尾部补白:DB CHAR(n) 主键/引用值带尾空格(如 {@code "MESSAGE "}),而 + * picker 选项 {@code _id}(PickerController 已 .trim())与表单提交值均为无补白形态。表单加载 + * (master-detail/编辑页)经本端点回填引用字段时若带补白,picker valueField=_id 永不匹配选项 + * → 加载只显裸 id 而非名称(如根级菜单显 MESSAGE)。故按值统一去尾补白对齐。仅 String 生效、 + * 只去尾(stripTrailing)不动头,非 String(数字/日期/布尔)原样返回。 + */ + private static Object trimChar(Object v) { + return v instanceof String s ? s.stripTrailing() : v; + } } diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PickerController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PickerController.java index a0e7233..d50dcc6 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PickerController.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PickerController.java @@ -11,6 +11,7 @@ import org.dom4j.Document; import org.dom4j.DocumentHelper; import org.springframework.dao.DataAccessException; import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.util.MultiValueMap; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestParam; @@ -89,10 +90,23 @@ public class PickerController { * {@code /list} 后缀以与全部存量 source 对齐;同时接受 {@code q/page/perPage} 三参(amis select * 的 searchable/分页透传)。 * + *

amis picker 加载已存值自动显名({@code op=loadOptions}):amis 的 OptionsControl picker + * 在「加载一个已存值」时(mount / value 变化)会原生用本 {@code source} 发一次请求,query 带 + * {@code op=loadOptions&value=&_id=}(amis-core formItem.fetchOptions/loadOptions 约定), + * 期望响应只回该值对应的选项,再经 {@code setOptions} 合并 → 选中项显示人可读名而非裸 id(picker + * 不像 select 那样自动拉 source 解析 label,全靠这一原生回环)。本端点据此在 {@code op=loadOptions} + * 时短路到 {@link #resolveValuesToOptions}(与独立 {@code /resolve} 端点同源口径),返回 + * {@code {status,data:{options:[{label,value}]}}}——这就是「全站可编辑引用 picker 加载即显名」的落点, + * 无需重转换、无需改前端 source,存量 883 页 picker 即时生效。普通弹窗 CRUD 不带 {@code op},列表/ + * 搜索/分页路径不受影响(对齐老系统 DialogDisplayUtil「dialog 自己按 dialogid 解析显示名」)。 + * * @param entityOrRef SYS_REFERENCE_ID 或实体表名 * @param q 模糊搜索关键字(按引用实体的标识列做 LIKE,已转义) * @param page 页码(1 起) * @param perPage 每页条数 + * @param op amis 操作标记:{@code loadOptions} 时短路为「按值解析显示名」(picker 加载已存值) + * @param value amis loadOptions 透传的已存值(与 {@code idValue} 同义,取其一),支持逗号分隔多值 + * @param idValue amis loadOptions 透传的 {@code _id}(valueField=_id);与 {@code value} 互为兜底 * @param asUser 行级权限测试通道:显式当前用户(非 ADMIN 视角,触发行级过滤) * @param roles 行级权限测试通道:逗号分隔角色 * @param asDepart 多维测试通道:当前部门 @@ -103,10 +117,37 @@ public class PickerController { @RequestParam(required = false) String q, @RequestParam(defaultValue = "1") int page, @RequestParam(defaultValue = "20") int perPage, + @RequestParam(required = false) String op, + @RequestParam(required = false) String value, + @RequestParam(name = "_id", required = false) String idValue, @RequestParam(required = false) String asUser, @RequestParam(required = false) String roles, @RequestParam(required = false) String asDepart, - @RequestParam(required = false) String asOrg) { + @RequestParam(required = false) String asOrg, + @RequestParam(required = false) MultiValueMap allParams) { + // amis picker 加载已存值:op=loadOptions 短路到「按值解析显示名」,返回 options, + // 让 picker 选中项原生显名而非裸 id(与 /resolve 同源口径)。 + if ("loadOptions".equalsIgnoreCase(op)) { + // 取值口径兼容 amis 单选/多选两种序列化: + // - 单选:value= / _id=(scalar); + // - 多选:amis qs(arrayFormat=indices) 产 value[0]=v1&value[1]=v2 / _id[0]=...(indexed)。 + // 合并成逗号串交 resolveValuesToOptions(其内部按逗号拆分+保序去重+CHAR trim)。 + String wanted = collectLoadOptionsValues(value, idValue, allParams); + List> resolved = resolveValuesToOptions( + entityOrRef, wanted, asUser, roles, asDepart, asOrg, "_label", "_id"); + // 每个选项同时带 _id/_label(转换器 picker 的 valueField=_id/labelField=_label)与 value/label + // (amis 默认 field)两套键——使 picker 无论 field 配置如何,loadOptions 回来的选项都能按值匹配 + // 并显名(转换器产物用 _id/_label;缺省/历史 schema 用 value/label)。这是「全站任意 picker 通用」 + // 的关键:amis 按各自 valueField 匹配选中值,两套键全覆盖。 + for (Map o : resolved) { + o.put("value", o.get("_id")); + o.put("label", o.get("_label")); + } + Map data = new HashMap<>(); + data.put("options", resolved); + return ok(data); + } + String table = resolveTable(entityOrRef); // 安全第 1 层:解析出的表名必须存在于 SYS_ENTITY,否则 400(非法表名不进引擎拼接) identifierWhitelist.requireLegalTable(table); @@ -156,16 +197,16 @@ public class PickerController { List> rows = toRows(result.get(POJOCRUDService.LIST_RESULT)); List> options = new ArrayList<>(); for (Map row : rows) { - Object value = row.get("_id"); + Object rowId = row.get("_id"); Object label = labelColumn != null ? row.get(labelColumn) : null; String labelStr = label != null ? String.valueOf(label).trim() : ""; - String display = !labelStr.isBlank() ? labelStr : String.valueOf(value).trim(); + String display = !labelStr.isBlank() ? labelStr : String.valueOf(rowId).trim(); // _label:统一显示值字段。picker 用 labelField="_label" 显示选中项人可读名(与 select 的 // option.label 同口径),避免依赖各 dialog 实体显示列名(转换器无从得知)。 row.put("_label", display); Map opt = new LinkedHashMap<>(); opt.put("label", display); - opt.put("value", value); + opt.put("value", rowId); options.add(opt); } @@ -187,6 +228,182 @@ public class PickerController { return resp; } + /** + * 选择窗回显解析:{@code GET /api/picker/{entityOrRef}/resolve?value=}。 + * + *

对齐老系统 {@code DialogDisplayUtil.parseDisplay}——「dialog 按自己的 dialogid 配置把已存 + * 裸 id 解析成显示名」。amis {@code picker} 加载一个已存值时只显裸 id(不像 {@code select} 那样 + * 自动拉 source 解析 label),故前端宿主在 picker 加载有值时调本端点,按 dialog 同源口径拿 + * {@code _label} 回填选中项显示名(提交值仍为 {@code _id}=裸 id,不变)。 + * + *

口径与 {@link #list} 完全一致:复用同一 {@link #resolveTable}(dialogid→实体表)、 + * 同一 {@link #displayColumn}(显示列优先于标识列)、同一 {@link #isUserDirectoryTable} 上下文策略、 + * 同一 {@link #trimId} CHAR 主键去补白——保证 resolve 出的 {@code _label} 与弹窗 {@code /list} + * 里同一行的 {@code _label} 字字相同(同 dialog 同显示名)。 + * + *

语义细节: + *

+ * + * @param entityOrRef dialogid(= view_template_id)/ SYS_REFERENCE_ID / 实体表名(同 {@link #list}) + * @param value 已存裸 id,支持逗号分隔多值 + * @param asUser 行级权限测试通道(同 {@link #list}) + * @param roles 行级权限测试通道 + * @param asDepart 行级权限测试通道 + * @param asOrg 行级权限测试通道 + */ + @GetMapping("/{entityOrRef}/resolve") + public Map resolve(@PathVariable String entityOrRef, + @RequestParam(required = false) String value, + @RequestParam(required = false) String asUser, + @RequestParam(required = false) String roles, + @RequestParam(required = false) String asDepart, + @RequestParam(required = false) String asOrg) { + // 独立端点:返回 [{_id,_label}](valueField=_id/labelField=_label 口径,picker chip 直接消费) + List> data = resolveValuesToOptions( + entityOrRef, value, asUser, roles, asDepart, asOrg, "_label", "_id"); + return ok(data); + } + + /** + * 收集 amis loadOptions 透传的待解析值,兼容单选/多选两种序列化,合并为逗号串: + *
    + *
  • 单选:scalar {@code value=} / {@code _id=}({@code value}/{@code idValue} 形参已绑);
  • + *
  • 多选:amis 用 {@code qs(arrayFormat=indices)} 序列化数组 → {@code value[0]=v1&value[1]=v2} + * /{@code _id[0]=...}(indexed),Spring 标量形参绑不到,从 {@code allParams} 里捞 {@code value[*]} + * /{@code _id[*]} 全部键。
  • + *
+ * 优先 {@code value} 族(amis ctx 主键),无则回退 {@code _id} 族(valueField=_id 透传)。下游 + * {@link #resolveValuesToOptions} 再做逗号拆分 + 保序去重 + CHAR trim,故此处只需把多值拼成逗号串。 + */ + private static String collectLoadOptionsValues(String value, String idValue, + MultiValueMap allParams) { + List vals = collectIndexed(value, "value", allParams); + if (vals.isEmpty()) { + vals = collectIndexed(idValue, "_id", allParams); // value 族空 → 回退 _id 族 + } + return String.join(",", vals); + } + + /** 收集某基名的 scalar({@code base})与 indexed({@code base[n]})全部值(amis qs indices 数组形态)。 */ + private static List collectIndexed(String scalar, String base, + MultiValueMap allParams) { + List vals = new ArrayList<>(); + if (scalar != null && !scalar.isBlank()) { + vals.add(scalar); + } + if (allParams != null) { + String prefix = base + "["; + for (Map.Entry> e : allParams.entrySet()) { + String k = e.getKey(); + if (k != null && k.startsWith(prefix) && k.endsWith("]")) { + for (String v : e.getValue()) { + if (v != null && !v.isBlank()) { + vals.add(v); + } + } + } + } + } + return vals; + } + + /** + * 「按值解析显示名」核心:把已存裸 id(逗号分隔多值)按 dialog 同源口径解析为 {@code [{label,value}]} + * (字段名由 {@code labelKey}/{@code valueKey} 定,供 {@code /resolve}=「_label/_id」与 + * {@code list?op=loadOptions}=「label/value」两路复用,保证 {@code _label} 与 {@link #list} 弹窗行 + * 同显示名)。复用 {@link #resolveTable}/{@link #displayColumn}/{@link #isUserDirectoryTable}/ + * {@link #buildCtx}/{@link #trimId}——与 {@link #list} 完全同源。 + * + *

语义:① 入参 trim(CHAR 主键去补白后比对)+ 保序去重;② keyColumn {@code IN (...)} 一次查回; + * ③ 返回按入参顺序回填;④ 查不到的 value 兜底 {@code {label:value,value:value}}(不丢值、显裸 id); + * ⑤ 数据权限拒绝(PrivilegeException)→ 全部兜底,不 500(与 {@link #list} 友好降级一致)。 + */ + private List> resolveValuesToOptions(String entityOrRef, String value, + String asUser, String roles, + String asDepart, String asOrg, + String labelKey, String valueKey) { + // 入参拆分 + trim(CHAR 主键去补白后比对)+ 保序去重(重复值只查一次,回填时按原序复用) + List wanted = new ArrayList<>(); + if (value != null) { + for (String v : value.split(",")) { + String t = v.trim(); + if (!t.isBlank() && !wanted.contains(t)) { + wanted.add(t); + } + } + } + if (wanted.isEmpty()) { + return new ArrayList<>(); + } + + String table = resolveTable(entityOrRef); + // 安全第 1 层:解析出的表名必须存在于 SYS_ENTITY(与 list 同口径),否则 400 + identifierWhitelist.requireLegalTable(table); + + POJOInfo info = POInfo.getPOInfo(table); + if (info == null || !info.hasKeyColumn()) { + throw new IllegalIdentifierException("引用实体不可作选择窗数据源(无主键): " + + table.replaceAll("[^A-Z0-9_]", "?")); + } + String keyColumn = info.getKeyColumnName(); + String labelColumn = displayColumn(info, keyColumn); + + // 上下文策略与 list 同源:用户目录类强制 ADMIN,其余走 per-user 行级权限 + Properties ctx = isUserDirectoryTable(table) + ? UserSession.getAdmin() + : buildCtx(asUser, roles, asDepart, asOrg); + + // keyColumn IN (values):引擎对 String 列的 List 条件走 processListIn → col IN ('v1','v2')(值经 + // StringUtil.TO_STRING 引号转义,杜绝注入)。perPage 取「不少于入参数」的安全上限,一次查回。 + Map cond = new HashMap<>(); + cond.put(POJOCRUDService.PAGE_START, 0); + cond.put(POJOCRUDService.PAGE_SIZE, Math.max(wanted.size(), 1)); + cond.put(keyColumn, new ArrayList<>(wanted)); + + // value→显示名 命中表(id 已 trim);查不到的 value 走兜底 + Map resolved = new HashMap<>(); + try { + Map result = pojoCRUDService.listSelect(cond, table, ctx); + for (Map row : toRows(result.get(POJOCRUDService.LIST_RESULT))) { + Object idVal = row.get("_id"); // toRow 已 trimId + String id = idVal != null ? String.valueOf(idVal).trim() : ""; + if (id.isBlank()) { + continue; + } + Object label = labelColumn != null ? row.get(labelColumn) : null; + String labelStr = label != null ? String.valueOf(label).trim() : ""; + resolved.put(id, !labelStr.isBlank() ? labelStr : id); + } + } catch (PrivilegeException ex) { + // 数据权限拒绝 → 不报错、不丢值,全部走兜底(picker 至少显裸 id),与 list 的友好降级一致 + resolved = new HashMap<>(); + } + + // 按入参顺序回填;查不到的 value 兜底 {label:value,value:value} + List> data = new ArrayList<>(); + for (String v : wanted) { + String label = resolved.getOrDefault(v, v); + Map item = new LinkedHashMap<>(); + item.put(valueKey, v); + item.put(labelKey, label); + data.add(item); + } + return data; + } + + private static Map ok(Object data) { + Map resp = new HashMap<>(); + resp.put("status", 0); + resp.put("msg", ""); + resp.put("data", data); + return resp; + } + /** * 解析 path 变量为实体表名(优先级见类注释): *

    diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/PickerControllerTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/PickerControllerTest.java index d1c3b3e..982263e 100644 --- a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/PickerControllerTest.java +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/PickerControllerTest.java @@ -139,7 +139,7 @@ class PickerControllerTest { seedPoInfoCache(TABLE, fakeInfo()); PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); - Map resp = c.list(REF_ID, null, 1, 20, null, null, null, null); + Map resp = c.list(REF_ID, null, 1, 20, null, null, null, null, null, null, null, null); assertEquals(0, resp.get("status")); @SuppressWarnings("unchecked") Map data = (Map) resp.get("data"); @@ -165,7 +165,7 @@ class PickerControllerTest { PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); // path 用实体表名(小写也可,内部 toUpperCase) - Map resp = c.list("sys_usergroup", null, 1, 20, null, null, null, null); + Map resp = c.list("sys_usergroup", null, 1, 20, null, null, null, null, null, null, null, null); assertEquals(0, resp.get("status")); verify(wl).requireLegalTable(TABLE); } @@ -181,7 +181,7 @@ class PickerControllerTest { seedPoInfoCache(TABLE, fakeInfo()); PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); - c.list(REF_ID, "管理'员%组", 1, 20, null, null, null, null); + c.list(REF_ID, "管理'员%组", 1, 20, null, null, null, null, null, null, null, null); @SuppressWarnings("unchecked") ArgumentCaptor> condCap = ArgumentCaptor.forClass(Map.class); @@ -202,7 +202,7 @@ class PickerControllerTest { seedPoInfoCache(TABLE, fakeInfo()); PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); - c.list(REF_ID, null, 3, 15, null, null, null, null); + c.list(REF_ID, null, 3, 15, null, null, null, null, null, null, null, null); @SuppressWarnings("unchecked") ArgumentCaptor> condCap = ArgumentCaptor.forClass(Map.class); @@ -223,7 +223,7 @@ class PickerControllerTest { PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); IllegalIdentifierException ex = assertThrows(IllegalIdentifierException.class, - () -> c.list("nope", null, 1, 20, null, null, null, null)); + () -> c.list("nope", null, 1, 20, null, null, null, null, null, null, null, null)); assertFalse(ex.getMessage().contains("'")); // 不回显注入载荷 } @@ -238,7 +238,7 @@ class PickerControllerTest { seedPoInfoCache(TABLE, fakeInfo()); PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); - c.list(REF_ID, null, 1, 20, "alice", "role-a,role-b", null, null); + c.list(REF_ID, null, 1, 20, null, null, null, "alice", "role-a,role-b", null, null, null); ArgumentCaptor ctxCap = ArgumentCaptor.forClass(Properties.class); verify(engine).listSelect(any(), eq(TABLE), ctxCap.capture()); @@ -262,7 +262,7 @@ class PickerControllerTest { PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); assertThrows(IllegalIdentifierException.class, - () -> c.list(REF_ID, null, 1, 20, null, null, null, null)); + () -> c.list(REF_ID, null, 1, 20, null, null, null, null, null, null, null, null)); } @Test @@ -296,7 +296,7 @@ class PickerControllerTest { seedPoInfoCache("PM_PROJECT", fakeInfo()); PickerController c = new PickerController(engine, dic, wl, jdbc); - Map resp = c.list(dialogId, null, 1, 20, null, null, null, null); + Map resp = c.list(dialogId, null, 1, 20, null, null, null, null, null, null, null, null); assertEquals(0, resp.get("status")); verify(wl).requireLegalTable("PM_PROJECT"); // 解析出 PM_PROJECT 并过白名单 verify(engine).listSelect(any(), eq("PM_PROJECT"), any(Properties.class)); @@ -328,7 +328,7 @@ class PickerControllerTest { seedPoInfoCache("VIEW_SYS_USER", fakeInfo()); PickerController c = new PickerController(engine, dic, wl, jdbc); - Map resp = c.list(dialogId, null, 1, 20, null, null, null, null); + Map resp = c.list(dialogId, null, 1, 20, null, null, null, null, null, null, null, null); assertEquals(0, resp.get("status")); verify(wl).requireLegalTable("VIEW_SYS_USER"); // 路由到 VIEW_SYS_USER 并过白名单 @@ -380,7 +380,7 @@ class PickerControllerTest { when(engine.listSelect(any(), eq("VIEW_SYS_USER"), any(Properties.class))).thenReturn(result); PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); - Map resp = c.list(REF_ID, null, 1, 20, null, null, null, null); + Map resp = c.list(REF_ID, null, 1, 20, null, null, null, null, null, null, null, null); @SuppressWarnings("unchecked") Map data = (Map) resp.get("data"); @@ -413,7 +413,7 @@ class PickerControllerTest { PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); // 以非 admin 用户身份调用(asUser=ceshi,模拟真实登录用户) - Map resp = c.list(REF_ID, null, 1, 20, null, null, null, null); + Map resp = c.list(REF_ID, null, 1, 20, null, null, null, null, null, null, null, null); assertEquals(0, resp.get("status")); @SuppressWarnings("unchecked") @@ -452,7 +452,7 @@ class PickerControllerTest { PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); // 不应抛异常,不应 500 - Map resp = c.list(REF_ID, null, 1, 20, null, null, null, null); + Map resp = c.list(REF_ID, null, 1, 20, null, null, null, null, null, null, null, null); assertEquals(0, resp.get("status")); @SuppressWarnings("unchecked") @@ -468,4 +468,326 @@ class PickerControllerTest { assertTrue(resp.get("msg").toString().contains("权限"), "msg 应包含权限相关提示,实际: " + resp.get("msg")); } + + @SuppressWarnings("unchecked") + private List> resolveData(Map resp) { + return (List>) resp.get("data"); + } + + /** + * resolve 主路径:单值 → keyColumn IN 查回 → 返回 {@code [{_id,_label}]},且 {@code _label} + * 与 {@link PickerController#list} 同源(同 displayColumn 口径)。这是「picker 加载已存 id 自动显名」 + * 的后端落点(对齐老系统 DialogDisplayUtil.parseDisplay)。 + */ + @Test + @DisplayName("14. resolve:单值 → _label 与 list 同源(显示列)") + void resolveSingleValueReturnsSameLabelAsList() { + POJOCRUDService engine = mock(POJOCRUDService.class); + DataDicService dic = mock(DataDicService.class); + IdentifierWhitelist wl = mock(IdentifierWhitelist.class); + when(dic.getReferenceEntityTableName(REF_ID)).thenReturn(TABLE); + Map result = engineResult(fakeRow("g1", "管理员组")); + when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result); + seedPoInfoCache(TABLE, fakeInfo()); + PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); + + Map resp = c.resolve(REF_ID, "g1", null, null, null, null); + + assertEquals(0, resp.get("status")); + List> data = resolveData(resp); + assertEquals(1, data.size()); + assertEquals("g1", data.get(0).get("_id")); + // _label 取显示列(LABEL/NAME),与 list 返回的 option.label/_label 同口径 + assertEquals("管理员组", data.get(0).get("_label")); + verify(wl).requireLegalTable(TABLE); + // keyColumn IN (...) 条件下推(List 值) + @SuppressWarnings("unchecked") + ArgumentCaptor> condCap = ArgumentCaptor.forClass(Map.class); + verify(engine).listSelect(condCap.capture(), eq(TABLE), any(Properties.class)); + Object keyCond = condCap.getValue().get(KEY); + assertTrue(keyCond instanceof List, "keyColumn 条件应为 List(IN 查询)"); + assertTrue(((List) keyCond).contains("g1")); + } + + /** + * resolve 同源断言(核心契约):同一 dialog、同一行,resolve 的 {@code _label} 必须等于 list 的 + * {@code option.label}/{@code _label}(同显示名)。 + */ + @Test + @DisplayName("15. resolve 的 _label 与 list 的 option.label 字字相同(同 dialog 同显示名)") + void resolveLabelMatchesListLabelExactly() { + POJOCRUDService engine = mock(POJOCRUDService.class); + DataDicService dic = mock(DataDicService.class); + IdentifierWhitelist wl = mock(IdentifierWhitelist.class); + when(dic.getReferenceEntityTableName(REF_ID)).thenReturn(TABLE); + // list 与 resolve 用同一行数据源(同 fakeRow),断言两端 label 相等 + // 先建结果再 stub,避免「stubbing 内嵌 fakeRow 的 stubbing」破坏 Mockito 状态 + Map result = engineResult(fakeRow("g1", "管理员组")); + when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result); + seedPoInfoCache(TABLE, fakeInfo()); + PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); + + Map listResp = c.list(REF_ID, null, 1, 20, null, null, null, null, null, null, null, null); + @SuppressWarnings("unchecked") + Map listDataMap = (Map) listResp.get("data"); + @SuppressWarnings("unchecked") + List> options = (List>) listDataMap.get("options"); + Object listLabel = options.get(0).get("label"); + + Map resolveResp = c.resolve(REF_ID, "g1", null, null, null, null); + Object resolveLabel = resolveData(resolveResp).get(0).get("_label"); + + assertEquals(listLabel, resolveLabel, "resolve 的 _label 必须与 list 的 option.label 同源"); + } + + /** + * resolve 多值:逗号分隔 → 一次 IN 查回,结果按入参顺序回填(多选 picker 回显场景)。 + */ + @Test + @DisplayName("16. resolve:多值(逗号分隔) → 按入参顺序回填") + void resolveMultiValuePreservesInputOrder() { + POJOCRUDService engine = mock(POJOCRUDService.class); + DataDicService dic = mock(DataDicService.class); + IdentifierWhitelist wl = mock(IdentifierWhitelist.class); + when(dic.getReferenceEntityTableName(REF_ID)).thenReturn(TABLE); + // 引擎以任意顺序返回(g2 在前),resolve 须按入参顺序(g1,g2)回填 + Map result = engineResult(fakeRow("g2", "普通组"), fakeRow("g1", "管理员组")); + when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result); + seedPoInfoCache(TABLE, fakeInfo()); + PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); + + Map resp = c.resolve(REF_ID, "g1,g2", null, null, null, null); + + List> data = resolveData(resp); + assertEquals(2, data.size()); + assertEquals("g1", data.get(0).get("_id")); + assertEquals("管理员组", data.get(0).get("_label")); + assertEquals("g2", data.get(1).get("_id")); + assertEquals("普通组", data.get(1).get("_label")); + } + + /** + * resolve 兜底:查不到的 value → {@code {_id:value,_label:value}}(不丢值、不报错,picker 至少显裸 id)。 + */ + @Test + @DisplayName("17. resolve:查不到的 value 兜底 {_id:value,_label:value}") + void resolveFallsBackForUnknownValue() { + POJOCRUDService engine = mock(POJOCRUDService.class); + DataDicService dic = mock(DataDicService.class); + IdentifierWhitelist wl = mock(IdentifierWhitelist.class); + when(dic.getReferenceEntityTableName(REF_ID)).thenReturn(TABLE); + // 只查到 g1,gX 查不到 → gX 走兜底 + Map result = engineResult(fakeRow("g1", "管理员组")); + when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result); + seedPoInfoCache(TABLE, fakeInfo()); + PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); + + Map resp = c.resolve(REF_ID, "g1,gX", null, null, null, null); + + List> data = resolveData(resp); + assertEquals(2, data.size()); + assertEquals("管理员组", data.get(0).get("_label")); + // 查不到的 gX 兜底:_id 与 _label 都是原值 + assertEquals("gX", data.get(1).get("_id")); + assertEquals("gX", data.get(1).get("_label")); + } + + /** + * resolve 空值/空白:value 为空或全空白 → 返回空 data(status=0),不触引擎、不报错。 + */ + @Test + @DisplayName("18. resolve:空 value → 空 data,不触引擎") + void resolveEmptyValueReturnsEmptyData() { + POJOCRUDService engine = mock(POJOCRUDService.class); + DataDicService dic = mock(DataDicService.class); + IdentifierWhitelist wl = mock(IdentifierWhitelist.class); + PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); + + Map resp = c.resolve(REF_ID, " ", null, null, null, null); + + assertEquals(0, resp.get("status")); + assertTrue(resolveData(resp).isEmpty()); + org.mockito.Mockito.verifyNoInteractions(engine); + } + + /** + * resolve CHAR 主键 trim:入参带补白(尾空格) → trim 后比对命中,返回 _id 去补白。 + */ + @Test + @DisplayName("19. resolve:CHAR 主键入参补白 → trim 后命中,_id 去补白") + void resolveTrimsCharPaddingOnInputAndOutput() { + POJOCRUDService engine = mock(POJOCRUDService.class); + DataDicService dic = mock(DataDicService.class); + IdentifierWhitelist wl = mock(IdentifierWhitelist.class); + when(dic.getReferenceEntityTableName(REF_ID)).thenReturn(TABLE); + // 引擎行的 _id 带 CHAR 补白("g1 "),toRow.trimId 去补白为 "g1" + Map result = engineResult(fakeRow("g1 ", "管理员组")); + when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result); + seedPoInfoCache(TABLE, fakeInfo()); + PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); + + // 入参也带补白("g1 ") + Map resp = c.resolve(REF_ID, "g1 ", null, null, null, null); + + List> data = resolveData(resp); + assertEquals(1, data.size()); + assertEquals("g1", data.get(0).get("_id")); // 入参 trim + assertEquals("管理员组", data.get(0).get("_label")); // 命中显示名(非裸 id) + } + + /** + * resolve 权限降级:非用户目录 picker 被 PrivilegeException 拒绝 → 全部走兜底(显裸 id), + * 不报错、不 500(与 list 的友好降级一致)。 + */ + @Test + @DisplayName("20. resolve:PrivilegeException → 全部兜底(显裸 id),不 500") + void resolveDegradesToFallbackOnPrivilegeException() { + POJOCRUDService engine = mock(POJOCRUDService.class); + DataDicService dic = mock(DataDicService.class); + IdentifierWhitelist wl = mock(IdentifierWhitelist.class); + when(dic.getReferenceEntityTableName(REF_ID)).thenReturn("PM_PROJECT"); + when(engine.listSelect(any(), eq("PM_PROJECT"), any(Properties.class))) + .thenThrow(new PrivilegeException("没有PM_PROJECT数据访问权限")); + seedPoInfoCache("PM_PROJECT", fakeInfo()); + PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); + + Map resp = c.resolve(REF_ID, "p1", null, null, null, null); + + assertEquals(0, resp.get("status")); + List> data = resolveData(resp); + assertEquals(1, data.size()); + assertEquals("p1", data.get(0).get("_id")); + assertEquals("p1", data.get(0).get("_label")); // 权限拒绝 → 兜底显裸 id + } + + @SuppressWarnings("unchecked") + private List> listOptions(Map resp) { + Map data = (Map) resp.get("data"); + return (List>) data.get("options"); + } + + /** + * amis picker 加载已存值原生回环:{@code GET /list?op=loadOptions&value=&_id=} → 短路到 + * 按值解析显示名,返回 {@code data.options:[{label,value}]}(amis loadOptions/setOptions 直接消费), + * 选中项遂显人可读名而非裸 id。这是「全站 picker 加载即显名」的运行时落点(无需重转换/改前端 source)。 + */ + @Test + @DisplayName("21. list?op=loadOptions:按值解析 → data.options 含 {label,value}(显名)") + void listLoadOptionsResolvesValueToOption() { + POJOCRUDService engine = mock(POJOCRUDService.class); + DataDicService dic = mock(DataDicService.class); + IdentifierWhitelist wl = mock(IdentifierWhitelist.class); + when(dic.getReferenceEntityTableName(REF_ID)).thenReturn(TABLE); + Map result = engineResult(fakeRow("g1", "管理员组")); + when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result); + seedPoInfoCache(TABLE, fakeInfo()); + PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); + + // amis 同时带 value 与 _id;op=loadOptions → 短路解析 + Map resp = c.list(REF_ID, null, 1, 20, "loadOptions", "g1", "g1", + null, null, null, null, null); + + assertEquals(0, resp.get("status")); + List> options = listOptions(resp); + assertEquals(1, options.size()); + // 每个选项同带两套键:_id/_label(转换器 picker valueField=_id/labelField=_label) + // 与 value/label(amis 默认 field)——任意 picker field 配置都能匹配显名。 + assertEquals("g1", options.get(0).get("_id")); + assertEquals("管理员组", options.get(0).get("_label")); + assertEquals("g1", options.get(0).get("value")); + assertEquals("管理员组", options.get(0).get("label")); + // keyColumn IN 条件下推(与 /resolve 同源) + @SuppressWarnings("unchecked") + ArgumentCaptor> condCap = ArgumentCaptor.forClass(Map.class); + verify(engine).listSelect(condCap.capture(), eq(TABLE), any(Properties.class)); + assertTrue(condCap.getValue().get(KEY) instanceof List); + } + + /** + * list?op=loadOptions 用 {@code _id}(amis valueField=_id 透传)当值(value 缺省时兜底取 _id)。 + */ + @Test + @DisplayName("22. list?op=loadOptions:value 缺省 → 取 _id 当值解析") + void listLoadOptionsFallsBackToIdParam() { + POJOCRUDService engine = mock(POJOCRUDService.class); + DataDicService dic = mock(DataDicService.class); + IdentifierWhitelist wl = mock(IdentifierWhitelist.class); + when(dic.getReferenceEntityTableName(REF_ID)).thenReturn(TABLE); + Map result = engineResult(fakeRow("g1", "管理员组")); + when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result); + seedPoInfoCache(TABLE, fakeInfo()); + PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); + + // value=null,_id=g1 + Map resp = c.list(REF_ID, null, 1, 20, "loadOptions", null, "g1", + null, null, null, null, null); + + List> options = listOptions(resp); + assertEquals(1, options.size()); + assertEquals("管理员组", options.get(0).get("label")); + } + + /** + * 多选 picker(multiple)加载已存值:amis 用 {@code qs(arrayFormat=indices)} 把数组序列化成 + * {@code value[0]=v1&value[1]=v2}(indexed),Spring 标量形参 {@code value} 绑不到,需从 + * {@code allParams} 捞 {@code value[*]}。覆盖 {@link PickerController#collectLoadOptionsValues} + * 的多选路径——这是 live 验收揪出的 400 边界(多选 picker 显裸 id)的修复。 + */ + @Test + @DisplayName("23. list?op=loadOptions:多选 indexed(value[0]/value[1]) → 全部解析显名") + void listLoadOptionsHandlesIndexedArrayForMultiple() { + POJOCRUDService engine = mock(POJOCRUDService.class); + DataDicService dic = mock(DataDicService.class); + IdentifierWhitelist wl = mock(IdentifierWhitelist.class); + when(dic.getReferenceEntityTableName(REF_ID)).thenReturn(TABLE); + Map result = engineResult(fakeRow("g1", "管理员组"), fakeRow("g2", "普通组")); + when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result); + seedPoInfoCache(TABLE, fakeInfo()); + PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); + + // amis 多选序列化:value[0]=g1&value[1]=g2&op=loadOptions(scalar value/_id 均空) + org.springframework.util.MultiValueMap all = + new org.springframework.util.LinkedMultiValueMap<>(); + all.add("value[0]", "g1"); + all.add("value[1]", "g2"); + all.add("op", "loadOptions"); + Map resp = c.list(REF_ID, null, 1, 20, "loadOptions", null, null, + null, null, null, null, all); + + List> options = listOptions(resp); + assertEquals(2, options.size()); + // 两个值都解析为显示名(顺序对齐入参 g1,g2),两套键齐全 + assertEquals("管理员组", options.get(0).get("_label")); + assertEquals("g1", options.get(0).get("_id")); + assertEquals("管理员组", options.get(0).get("label")); + assertEquals("g1", options.get(0).get("value")); + assertEquals("普通组", options.get(1).get("_label")); + assertEquals("g2", options.get(1).get("_id")); + } + + /** + * 普通 list(op 缺省)不受影响:仍返回 items/options/columns/total 全套(弹窗 CRUD 列表路径不变)。 + */ + @Test + @DisplayName("24. list(op 缺省):列表/分页/列路径不受 loadOptions 短路影响") + void listWithoutOpStillReturnsFullCrudPayload() { + POJOCRUDService engine = mock(POJOCRUDService.class); + DataDicService dic = mock(DataDicService.class); + IdentifierWhitelist wl = mock(IdentifierWhitelist.class); + when(dic.getReferenceEntityTableName(REF_ID)).thenReturn(TABLE); + Map result = engineResult(fakeRow("g1", "管理员组"), fakeRow("g2", "普通组")); + when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(result); + seedPoInfoCache(TABLE, fakeInfo()); + PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); + + Map resp = c.list(REF_ID, null, 1, 20, null, null, null, null, null, null, null, null); + + @SuppressWarnings("unchecked") + Map data = (Map) resp.get("data"); + assertTrue(data.containsKey("items")); // 弹窗 CRUD 仍拿全套 + assertTrue(data.containsKey("options")); + assertTrue(data.containsKey("columns")); + assertTrue(data.containsKey("total")); + assertEquals(2, ((List) data.get("options")).size()); + } }