feat(metadata): wire legacy user select picker
Some checks failed
ci / build-test-parity (push) Has been cancelled

This commit is contained in:
2026-06-17 21:31:11 +08:00
parent 380d1f17ca
commit 1581a99d75
8 changed files with 2694 additions and 2157 deletions

View File

@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.dom4j.Document;
import org.dom4j.DocumentHelper;
@@ -22,6 +23,13 @@ import org.dom4j.Element;
*/
final class UiTypeMapper {
private static final String USER_SELECT_CONTROLLED = "76d2f950-ef40-4eff-89ec-98ad9a4976b9";
private static final String USER_SELECT_ORG = "1b3bad0b-a24b-4347-9466-db78f7432756";
private static final String USER_SELECT_ALL = "090981ba-0c10-4d84-92dc-80e226594480";
private static final String USER_SELECT_ATTENDANCE = "e31ce405-21c4-4892-94bb-e87e07b7f8e7";
private static final Set<String> USER_SELECT_DIALOG_IDS = Set.of(
USER_SELECT_CONTROLLED, USER_SELECT_ORG, USER_SELECT_ALL, USER_SELECT_ATTENDANCE);
private UiTypeMapper() {
}
@@ -244,6 +252,11 @@ final class UiTypeMapper {
applySelectDialogFallback(item, "", false);
result.degrade(origin + "@field " + name
+ " uitype=SelectDialog(dialogid=空) → select+source(无 dialogid,数据源缺失,保持搜索下拉)");
} else if (isUserSelectDialog(dialogId)) {
applyUserSelectPicker(item, dialogId, false);
result.note(origin + "@field " + name + " uitype=SelectDialog(dialogid="
+ dialogId + ") → tabs-transfer-picker(旧用户选择框,mode="
+ userSelectMode(dialogId) + ")");
} else {
applyPicker(item, dialogId, false);
result.note(origin + "@field " + name + " uitype=SelectDialog(dialogid="
@@ -273,6 +286,11 @@ final class UiTypeMapper {
applySelectDialogFallback(item, "", true);
result.degrade(origin + "@field " + name
+ " uitype=MultiSelectDialog(dialogid=空) → select(multiple)+source(无 dialogid,保持搜索下拉)");
} else if (isUserSelectDialog(dialogId)) {
applyUserSelectPicker(item, dialogId, true);
result.note(origin + "@field " + name + " uitype=MultiSelectDialog(dialogid="
+ dialogId + ") → tabs-transfer-picker(旧用户选择框,mode="
+ userSelectMode(dialogId) + ", multiple)");
} else {
applyPicker(item, dialogId, true);
result.note(origin + "@field " + name + " uitype=MultiSelectDialog(dialogid="
@@ -397,6 +415,48 @@ final class UiTypeMapper {
item.put("pickerSchema", pickerSchema);
}
/**
* 旧 UserSelectWindow 族 → amis 内建 tabs-transfer-picker。
*
* <p>四个 framework 定制选择窗没有普通 {@code <crud>} XML,不能走通用 /api/picker。
* 这里按 dialogid 切到专用数据源,保留旧窗口的多 tab/穿梭语义:
* 受控、全部、组织资源、考勤过滤分别由 {@code mode} 参数区分。
*/
private static void applyUserSelectPicker(Map<String, Object> item, String dialogId, boolean multiple) {
String mode = userSelectMode(dialogId);
item.put("type", "tabs-transfer-picker");
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("source", "/api/user-select/options?mode=" + mode);
item.put("searchApi", "/api/user-select/search?mode=" + mode + "&term=${term}");
item.put("searchable", true);
item.put("selectMode", "tree");
item.put("searchResultMode", "list");
item.put("pickerSize", "lg");
item.put("selectTitle", "可选项");
item.put("resultTitle", "已选择");
item.put("placeholder", "请选择");
item.put("statistics", true);
}
private static boolean isUserSelectDialog(String dialogId) {
return dialogId != null && USER_SELECT_DIALOG_IDS.contains(dialogId.trim().toLowerCase());
}
private static String userSelectMode(String dialogId) {
String id = dialogId == null ? "" : dialogId.trim().toLowerCase();
return switch (id) {
case USER_SELECT_ALL -> "all";
case USER_SELECT_ORG -> "org";
case USER_SELECT_ATTENDANCE -> "attendance";
default -> "controlled";
};
}
/**
* dialogid 缺失时的降级:保持 F2-9 的 {@code select + 远程 source}(搜索下拉)。
* 无 dialogid 即无可解析数据源,弹窗 picker 会空载,故不退化为弹窗,沿用既有搜索下拉降级形态。

View File

@@ -561,6 +561,54 @@ class TemplateToAmisConverterTest {
assertEquals("/api/picker/d9/list", picker.get("source"));
}
@Test
@SuppressWarnings("unchecked")
void crud_用户选择框受控转tabsTransferPicker() {
String dialogId = "76d2f950-ef40-4eff-89ec-98ad9a4976b9";
String xml = "<crud entityid='e1'><display/>"
+ "<search><field name='CREATEBY' label='操作人' uitype='SelectDialog' dialogid='"
+ dialogId + "'/></search></crud>";
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
Map<String, Object> filter = (Map<String, Object>) body(r.getSchema()).get("filter");
List<Map<String, Object>> items = (List<Map<String, Object>>) filter.get("body");
Map<String, Object> picker = items.get(0);
assertEquals("tabs-transfer-picker", picker.get("type"));
assertEquals(Boolean.FALSE, picker.get("multiple"));
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("tree", picker.get("selectMode"));
assertEquals("list", picker.get("searchResultMode"));
assertTrue(r.getMappingNotes().stream().anyMatch(n -> n.contains("CREATEBY")
&& n.contains("tabs-transfer-picker") && n.contains("controlled")));
}
@Test
@SuppressWarnings("unchecked")
void crud_用户选择框组织与考勤模式接线() {
String xml = "<crud entityid='e1'><display/>"
+ "<search>"
+ "<field name='ORG_USERS' label='组织人员' uitype='MultiSelectDialog'"
+ " dialogid='1b3bad0b-a24b-4347-9466-db78f7432756'/>"
+ "<field name='KQ_USERS' label='考勤人员' uitype='MultiSelectDialog'"
+ " dialogid='e31ce405-21c4-4892-94bb-e87e07b7f8e7'/>"
+ "<field name='ALL_USERS' label='全部人员' uitype='MultiSelectDialog'"
+ " dialogid='090981ba-0c10-4d84-92dc-80e226594480'/>"
+ "</search></crud>";
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
Map<String, Object> filter = (Map<String, Object>) body(r.getSchema()).get("filter");
List<Map<String, Object>> items = (List<Map<String, Object>>) filter.get("body");
assertEquals("/api/user-select/options?mode=org", items.get(0).get("source"));
assertEquals("/api/user-select/options?mode=attendance", items.get(1).get("source"));
assertEquals("/api/user-select/options?mode=all", items.get(2).get("source"));
assertEquals(Boolean.TRUE, items.get(0).get("multiple"));
assertEquals("tabs-transfer-picker", items.get(1).get("type"));
assertEquals("tabs-transfer-picker", items.get(2).get("type"));
assertTrue(r.getMappingNotes().stream().anyMatch(n -> n.contains("mode=org")));
assertTrue(r.getMappingNotes().stream().anyMatch(n -> n.contains("mode=attendance")));
assertTrue(r.getMappingNotes().stream().anyMatch(n -> n.contains("mode=all")));
}
@Test
@SuppressWarnings("unchecked")
void crud_selectDialog无dialogid保持select降级() {