feat(metadata): restore legacy user transfer picker flow
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:
@@ -256,7 +256,7 @@ final class UiTypeMapper {
|
||||
} else if (isUserSelectDialog(dialogId)) {
|
||||
applyUserSelectPicker(item, dialogId, false);
|
||||
result.note(origin + "@field " + name + " uitype=SelectDialog(dialogid="
|
||||
+ dialogId + ") → tabs-transfer-picker(旧用户选择框,mode="
|
||||
+ dialogId + ") → user-transfer-picker(旧用户选择框,mode="
|
||||
+ userSelectMode(dialogId) + ")");
|
||||
} else if (isProcessSelectDialog(dialogId)) {
|
||||
applyProcessSelectPicker(item, false);
|
||||
@@ -294,7 +294,7 @@ final class UiTypeMapper {
|
||||
} else if (isUserSelectDialog(dialogId)) {
|
||||
applyUserSelectPicker(item, dialogId, true);
|
||||
result.note(origin + "@field " + name + " uitype=MultiSelectDialog(dialogid="
|
||||
+ dialogId + ") → tabs-transfer-picker(旧用户选择框,mode="
|
||||
+ dialogId + ") → user-transfer-picker(旧用户选择框,mode="
|
||||
+ userSelectMode(dialogId) + ", multiple)");
|
||||
} else if (isProcessSelectDialog(dialogId)) {
|
||||
applyProcessSelectPicker(item, true);
|
||||
@@ -425,7 +425,7 @@ final class UiTypeMapper {
|
||||
}
|
||||
|
||||
/**
|
||||
* 旧 UserSelectWindow 族 → amis 内建 tabs-transfer-picker。
|
||||
* 旧 UserSelectWindow 族 → 前端自定义 user-transfer-picker。
|
||||
*
|
||||
* <p>四个 framework 定制选择窗没有普通 {@code <crud>} XML,不能走通用 /api/picker。
|
||||
* 这里按 dialogid 切到专用数据源,保留旧窗口的多 tab/穿梭语义:
|
||||
@@ -433,18 +433,14 @@ final class UiTypeMapper {
|
||||
*/
|
||||
private static void applyUserSelectPicker(Map<String, Object> item, String dialogId, boolean multiple) {
|
||||
String mode = userSelectMode(dialogId);
|
||||
item.put("type", "tabs-transfer-picker");
|
||||
item.put("type", "user-transfer-picker");
|
||||
item.put("mode", 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("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("valueTpl", "${label}");
|
||||
item.put("pickerSize", "lg");
|
||||
item.put("selectTitle", "可选项");
|
||||
|
||||
@@ -563,7 +563,7 @@ class TemplateToAmisConverterTest {
|
||||
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void crud_用户选择框受控转tabsTransferPicker() {
|
||||
void crud_用户选择框受控转UserTransferPicker() {
|
||||
String dialogId = "76d2f950-ef40-4eff-89ec-98ad9a4976b9";
|
||||
String xml = "<crud entityid='e1'><display/>"
|
||||
+ "<search><field name='CREATEBY' label='操作人' uitype='SelectDialog' dialogid='"
|
||||
@@ -572,17 +572,13 @@ class TemplateToAmisConverterTest {
|
||||
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("user-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(Boolean.TRUE, picker.get("searchable"));
|
||||
assertEquals("tree", picker.get("selectMode"));
|
||||
assertEquals("list", picker.get("searchResultMode"));
|
||||
assertEquals("controlled", picker.get("mode"));
|
||||
assertEquals("${label}", picker.get("valueTpl"));
|
||||
assertTrue(r.getMappingNotes().stream().anyMatch(n -> n.contains("CREATEBY")
|
||||
&& n.contains("tabs-transfer-picker") && n.contains("controlled")));
|
||||
&& n.contains("user-transfer-picker") && n.contains("controlled")));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -600,12 +596,12 @@ class TemplateToAmisConverterTest {
|
||||
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("org", items.get(0).get("mode"));
|
||||
assertEquals("attendance", items.get(1).get("mode"));
|
||||
assertEquals("all", items.get(2).get("mode"));
|
||||
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"));
|
||||
assertEquals("user-transfer-picker", items.get(1).get("type"));
|
||||
assertEquals("user-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")));
|
||||
|
||||
Reference in New Issue
Block a user