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 18e5693..77be47a 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 @@ -254,9 +254,9 @@ final class UiTypeMapper { result.degrade(origin + "@field " + name + " uitype=SelectDialog(dialogid=空) → select+source(无 dialogid,数据源缺失,保持搜索下拉)"); } else if (isUserSelectDialog(dialogId)) { - applyUserSelectPicker(item, dialogId, false); + applyUserSinglePicker(item, dialogId); result.note(origin + "@field " + name + " uitype=SelectDialog(dialogid=" - + dialogId + ") → user-transfer-picker(旧用户选择框,mode=" + + dialogId + ") → picker(旧用户单选框,mode=" + userSelectMode(dialogId) + ")"); } else if (isProcessSelectDialog(dialogId)) { applyProcessSelectPicker(item, false); @@ -292,9 +292,9 @@ final class UiTypeMapper { result.degrade(origin + "@field " + name + " uitype=MultiSelectDialog(dialogid=空) → select(multiple)+source(无 dialogid,保持搜索下拉)"); } else if (isUserSelectDialog(dialogId)) { - applyUserSelectPicker(item, dialogId, true); + applyUserMultiPicker(item, dialogId); result.note(origin + "@field " + name + " uitype=MultiSelectDialog(dialogid=" - + dialogId + ") → user-transfer-picker(旧用户选择框,mode=" + + dialogId + ") → picker(旧用户多选框,mode=" + userSelectMode(dialogId) + ", multiple)"); } else if (isProcessSelectDialog(dialogId)) { applyProcessSelectPicker(item, true); @@ -424,30 +424,14 @@ final class UiTypeMapper { item.put("pickerSchema", pickerSchema); } - /** - * 旧 UserSelectWindow 族 → 前端自定义 user-transfer-picker。 - * - *

四个 framework 定制选择窗没有普通 {@code } XML,不能走通用 /api/picker。 - * 这里按 dialogid 切到专用数据源,保留旧窗口的多 tab/穿梭语义: - * 受控、全部、组织资源、考勤过滤分别由 {@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("userSelectMode", mode); - item.put("clearable", true); - item.put("multiple", multiple); - item.put("joinValues", true); - item.put("delimiter", ","); - item.put("labelField", "label"); - item.put("valueField", "value"); - item.put("valueTpl", "${label}"); - item.put("pickerSize", "lg"); - item.put("selectTitle", "可选项"); - item.put("resultTitle", "已选择"); - item.put("placeholder", "请选择"); - item.put("statistics", true); + private static void applyUserSinglePicker(Map item, String dialogId) { + applyPicker(item, dialogId, false); + item.put("placeholder", "请点击右侧的图标"); + } + + private static void applyUserMultiPicker(Map item, String dialogId) { + applyPicker(item, dialogId, true); + item.put("placeholder", "请点击右侧的图标"); } private static boolean isUserSelectDialog(String dialogId) { 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 91e8540..4192343 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 @@ -563,7 +563,7 @@ class TemplateToAmisConverterTest { @Test @SuppressWarnings("unchecked") - void crud_用户选择框受控转UserTransferPicker() { + void crud_用户单选框受控转标准Picker() { String dialogId = "76d2f950-ef40-4eff-89ec-98ad9a4976b9"; String xml = "" + "