fix(converter): map user selectors to amis picker
Some checks failed
ci / build-test-parity (push) Has been cancelled
Some checks failed
ci / build-test-parity (push) Has been cancelled
This commit is contained in:
@@ -254,9 +254,9 @@ final class UiTypeMapper {
|
|||||||
result.degrade(origin + "@field " + name
|
result.degrade(origin + "@field " + name
|
||||||
+ " uitype=SelectDialog(dialogid=空) → select+source(无 dialogid,数据源缺失,保持搜索下拉)");
|
+ " uitype=SelectDialog(dialogid=空) → select+source(无 dialogid,数据源缺失,保持搜索下拉)");
|
||||||
} else if (isUserSelectDialog(dialogId)) {
|
} else if (isUserSelectDialog(dialogId)) {
|
||||||
applyUserSelectPicker(item, dialogId, false);
|
applyUserSinglePicker(item, dialogId);
|
||||||
result.note(origin + "@field " + name + " uitype=SelectDialog(dialogid="
|
result.note(origin + "@field " + name + " uitype=SelectDialog(dialogid="
|
||||||
+ dialogId + ") → user-transfer-picker(旧用户选择框,mode="
|
+ dialogId + ") → picker(旧用户单选框,mode="
|
||||||
+ userSelectMode(dialogId) + ")");
|
+ userSelectMode(dialogId) + ")");
|
||||||
} else if (isProcessSelectDialog(dialogId)) {
|
} else if (isProcessSelectDialog(dialogId)) {
|
||||||
applyProcessSelectPicker(item, false);
|
applyProcessSelectPicker(item, false);
|
||||||
@@ -292,9 +292,9 @@ final class UiTypeMapper {
|
|||||||
result.degrade(origin + "@field " + name
|
result.degrade(origin + "@field " + name
|
||||||
+ " uitype=MultiSelectDialog(dialogid=空) → select(multiple)+source(无 dialogid,保持搜索下拉)");
|
+ " uitype=MultiSelectDialog(dialogid=空) → select(multiple)+source(无 dialogid,保持搜索下拉)");
|
||||||
} else if (isUserSelectDialog(dialogId)) {
|
} else if (isUserSelectDialog(dialogId)) {
|
||||||
applyUserSelectPicker(item, dialogId, true);
|
applyUserMultiPicker(item, dialogId);
|
||||||
result.note(origin + "@field " + name + " uitype=MultiSelectDialog(dialogid="
|
result.note(origin + "@field " + name + " uitype=MultiSelectDialog(dialogid="
|
||||||
+ dialogId + ") → user-transfer-picker(旧用户选择框,mode="
|
+ dialogId + ") → picker(旧用户多选框,mode="
|
||||||
+ userSelectMode(dialogId) + ", multiple)");
|
+ userSelectMode(dialogId) + ", multiple)");
|
||||||
} else if (isProcessSelectDialog(dialogId)) {
|
} else if (isProcessSelectDialog(dialogId)) {
|
||||||
applyProcessSelectPicker(item, true);
|
applyProcessSelectPicker(item, true);
|
||||||
@@ -424,30 +424,14 @@ final class UiTypeMapper {
|
|||||||
item.put("pickerSchema", pickerSchema);
|
item.put("pickerSchema", pickerSchema);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
private static void applyUserSinglePicker(Map<String, Object> item, String dialogId) {
|
||||||
* 旧 UserSelectWindow 族 → 前端自定义 user-transfer-picker。
|
applyPicker(item, dialogId, false);
|
||||||
*
|
item.put("placeholder", "请点击右侧的图标");
|
||||||
* <p>四个 framework 定制选择窗没有普通 {@code <crud>} XML,不能走通用 /api/picker。
|
}
|
||||||
* 这里按 dialogid 切到专用数据源,保留旧窗口的多 tab/穿梭语义:
|
|
||||||
* 受控、全部、组织资源、考勤过滤分别由 {@code userSelectMode} 参数区分。
|
private static void applyUserMultiPicker(Map<String, Object> item, String dialogId) {
|
||||||
* 注意不能使用 amis 保留字段 {@code mode},否则会破坏 FormItem 的 horizontal 布局。
|
applyPicker(item, dialogId, true);
|
||||||
*/
|
item.put("placeholder", "请点击右侧的图标");
|
||||||
private static void applyUserSelectPicker(Map<String, Object> 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 boolean isUserSelectDialog(String dialogId) {
|
private static boolean isUserSelectDialog(String dialogId) {
|
||||||
|
|||||||
@@ -563,7 +563,7 @@ class TemplateToAmisConverterTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
void crud_用户选择框受控转UserTransferPicker() {
|
void crud_用户单选框受控转标准Picker() {
|
||||||
String dialogId = "76d2f950-ef40-4eff-89ec-98ad9a4976b9";
|
String dialogId = "76d2f950-ef40-4eff-89ec-98ad9a4976b9";
|
||||||
String xml = "<crud entityid='e1'><display/>"
|
String xml = "<crud entityid='e1'><display/>"
|
||||||
+ "<search><field name='CREATEBY' label='操作人' uitype='SelectDialog' dialogid='"
|
+ "<search><field name='CREATEBY' label='操作人' uitype='SelectDialog' dialogid='"
|
||||||
@@ -572,14 +572,17 @@ class TemplateToAmisConverterTest {
|
|||||||
Map<String, Object> filter = (Map<String, Object>) body(r.getSchema()).get("filter");
|
Map<String, Object> filter = (Map<String, Object>) body(r.getSchema()).get("filter");
|
||||||
List<Map<String, Object>> items = (List<Map<String, Object>>) filter.get("body");
|
List<Map<String, Object>> items = (List<Map<String, Object>>) filter.get("body");
|
||||||
Map<String, Object> picker = items.get(0);
|
Map<String, Object> picker = items.get(0);
|
||||||
assertEquals("user-transfer-picker", picker.get("type"));
|
assertEquals("picker", picker.get("type"));
|
||||||
assertEquals(Boolean.FALSE, picker.get("multiple"));
|
assertNull(picker.get("multiple"));
|
||||||
assertEquals(Boolean.TRUE, picker.get("joinValues"));
|
assertEquals("/api/picker/" + dialogId + "/list", picker.get("source"));
|
||||||
|
assertEquals("_label", picker.get("labelField"));
|
||||||
|
assertEquals("_id", picker.get("valueField"));
|
||||||
|
assertEquals("dialog", picker.get("modalMode"));
|
||||||
assertNull(picker.get("mode"));
|
assertNull(picker.get("mode"));
|
||||||
assertEquals("controlled", picker.get("userSelectMode"));
|
assertNull(picker.get("userSelectMode"));
|
||||||
assertEquals("${label}", picker.get("valueTpl"));
|
assertEquals("请点击右侧的图标", picker.get("placeholder"));
|
||||||
assertTrue(r.getMappingNotes().stream().anyMatch(n -> n.contains("CREATEBY")
|
assertTrue(r.getMappingNotes().stream().anyMatch(n -> n.contains("CREATEBY")
|
||||||
&& n.contains("user-transfer-picker") && n.contains("controlled")));
|
&& n.contains("picker") && n.contains("controlled")));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -600,12 +603,17 @@ class TemplateToAmisConverterTest {
|
|||||||
assertNull(items.get(0).get("mode"));
|
assertNull(items.get(0).get("mode"));
|
||||||
assertNull(items.get(1).get("mode"));
|
assertNull(items.get(1).get("mode"));
|
||||||
assertNull(items.get(2).get("mode"));
|
assertNull(items.get(2).get("mode"));
|
||||||
assertEquals("org", items.get(0).get("userSelectMode"));
|
assertNull(items.get(0).get("userSelectMode"));
|
||||||
assertEquals("attendance", items.get(1).get("userSelectMode"));
|
assertNull(items.get(1).get("userSelectMode"));
|
||||||
assertEquals("all", items.get(2).get("userSelectMode"));
|
assertNull(items.get(2).get("userSelectMode"));
|
||||||
|
assertEquals("picker", items.get(0).get("type"));
|
||||||
|
assertEquals("picker", items.get(1).get("type"));
|
||||||
|
assertEquals("picker", items.get(2).get("type"));
|
||||||
assertEquals(Boolean.TRUE, items.get(0).get("multiple"));
|
assertEquals(Boolean.TRUE, items.get(0).get("multiple"));
|
||||||
assertEquals("user-transfer-picker", items.get(1).get("type"));
|
assertEquals("请点击右侧的图标", items.get(0).get("placeholder"));
|
||||||
assertEquals("user-transfer-picker", items.get(2).get("type"));
|
assertEquals("/api/picker/1b3bad0b-a24b-4347-9466-db78f7432756/list", items.get(0).get("source"));
|
||||||
|
assertEquals("/api/picker/e31ce405-21c4-4892-94bb-e87e07b7f8e7/list", items.get(1).get("source"));
|
||||||
|
assertEquals("/api/picker/090981ba-0c10-4d84-92dc-80e226594480/list", items.get(2).get("source"));
|
||||||
assertTrue(r.getMappingNotes().stream().anyMatch(n -> n.contains("mode=org")));
|
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=attendance")));
|
||||||
assertTrue(r.getMappingNotes().stream().anyMatch(n -> n.contains("mode=all")));
|
assertTrue(r.getMappingNotes().stream().anyMatch(n -> n.contains("mode=all")));
|
||||||
|
|||||||
Reference in New Issue
Block a user