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 4c15ca3..18e5693 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 @@ -429,12 +429,13 @@ final class UiTypeMapper { * *

四个 framework 定制选择窗没有普通 {@code } XML,不能走通用 /api/picker。 * 这里按 dialogid 切到专用数据源,保留旧窗口的多 tab/穿梭语义: - * 受控、全部、组织资源、考勤过滤分别由 {@code mode} 参数区分。 + * 受控、全部、组织资源、考勤过滤分别由 {@code userSelectMode} 参数区分。 + * 注意不能使用 amis 保留字段 {@code mode},否则会破坏 FormItem 的 horizontal 布局。 */ private static void applyUserSelectPicker(Map item, String dialogId, boolean multiple) { String mode = userSelectMode(dialogId); item.put("type", "user-transfer-picker"); - item.put("mode", mode); + item.put("userSelectMode", mode); item.put("clearable", true); item.put("multiple", multiple); item.put("joinValues", true); 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 5f74cbf..91e8540 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 @@ -575,7 +575,8 @@ class TemplateToAmisConverterTest { assertEquals("user-transfer-picker", picker.get("type")); assertEquals(Boolean.FALSE, picker.get("multiple")); assertEquals(Boolean.TRUE, picker.get("joinValues")); - assertEquals("controlled", picker.get("mode")); + assertNull(picker.get("mode")); + assertEquals("controlled", picker.get("userSelectMode")); assertEquals("${label}", picker.get("valueTpl")); assertTrue(r.getMappingNotes().stream().anyMatch(n -> n.contains("CREATEBY") && n.contains("user-transfer-picker") && n.contains("controlled"))); @@ -596,9 +597,12 @@ class TemplateToAmisConverterTest { ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage); Map filter = (Map) body(r.getSchema()).get("filter"); List> items = (List>) filter.get("body"); - assertEquals("org", items.get(0).get("mode")); - assertEquals("attendance", items.get(1).get("mode")); - assertEquals("all", items.get(2).get("mode")); + assertNull(items.get(0).get("mode")); + assertNull(items.get(1).get("mode")); + assertNull(items.get(2).get("mode")); + assertEquals("org", items.get(0).get("userSelectMode")); + assertEquals("attendance", items.get(1).get("userSelectMode")); + assertEquals("all", items.get(2).get("userSelectMode")); assertEquals(Boolean.TRUE, items.get(0).get("multiple")); assertEquals("user-transfer-picker", items.get(1).get("type")); assertEquals("user-transfer-picker", items.get(2).get("type"));