fix(platform): complete picker parity and message detail
Some checks failed
ci / build-test-parity (push) Has been cancelled

This commit is contained in:
2026-06-18 00:30:01 +08:00
parent c380659ef0
commit bf7bb2515b
7 changed files with 320 additions and 9 deletions

View File

@@ -77,6 +77,13 @@ public final class EngineclassDelta {
EngineclassDelta::taskTodoDataSource);
registerMutator("com.dsasp.client.wf.task.component.FinishTaskComponentNew",
EngineclassDelta::taskDoneDataSource);
// 消息查看:MessageReceiveView/MessageSendView 在默认 GridTemplateComponent 之上加「查看」按钮。
// 收到消息按 SYS_MESSAGEUSER_ID 打开并置已读;已发送消息按 SYS_MESSAGE_ID 打开只读详情。
register("com.dsasp.client.tools.message.MessageReceiveView",
EngineclassDelta::receivedMessageDetailButton);
register("com.dsasp.client.tools.message.MessageSendView",
EngineclassDelta::sentMessageDetailButton);
}
private EngineclassDelta() {
@@ -309,6 +316,39 @@ public final class EngineclassDelta {
return "${selectedItems[0]." + field + "}";
}
// ── 消息 · 查看详情 / 打开即已读 ───────────────────────────────────────
/** 收到消息「查看」:选 1 条 SYS_MESSAGEUSER → 打开详情并置已读,关闭后刷新列表。 */
private static Map<String, Object> receivedMessageDetailButton(String pkField) {
Map<String, Object> args = mapOf(
"kind", "received",
"receiveId", selectedSingleFieldExpr(pkField),
"title", "${selectedItems[0].SYS_MESSAGE_ID_DISPLAY__ || selectedItems[0].TITLE || ''}");
return messageDetailButton(args);
}
/** 已发送消息「查看」:选 1 条 SYS_MESSAGE → 只读详情。 */
private static Map<String, Object> sentMessageDetailButton(String pkField) {
Map<String, Object> args = mapOf(
"kind", "sent",
"messageId", selectedSingleFieldExpr(pkField),
"title", "${selectedItems[0].TITLE || ''}");
return messageDetailButton(args);
}
private static Map<String, Object> messageDetailButton(Map<String, Object> args) {
Map<String, Object> action = mapOf(
"actionType", "openMessageDetail",
"args", args);
Map<String, Object> btn = new LinkedHashMap<>();
btn.put("type", "button");
btn.put("id", "查看");
btn.put("label", "查看");
btn.put("icon", "fa fa-search");
btn.put("disabledOn", "${!selectedItems || selectedItems.length !== 1}");
btn.put("onEvent", mapOf("click", mapOf("actions", List.of(action))));
return btn;
}
// ── 用户管理 · 设置主岗位 ──────────────────────────────────────────────
/**
* 「设置主岗位」按钮:选 1 用户 → 弹窗 form。initApi 拉该用户岗位(SYS_POSITIONUSER_SEARCH by USERID),

View File

@@ -405,6 +405,10 @@ final class UiTypeMapper {
item.put("clearable", true);
if (multiple) {
item.put("multiple", true);
item.put("overflowConfig", Map.of(
"maxTagCount", 1,
"displayPosition", List.of("select")
));
}
item.put("source", "/api/picker/" + dialogId + "/list");
item.put("labelField", "_label");

View File

@@ -559,6 +559,9 @@ class TemplateToAmisConverterTest {
assertEquals("picker", picker.get("type"));
assertEquals(Boolean.TRUE, picker.get("multiple"));
assertEquals("/api/picker/d9/list", picker.get("source"));
Map<String, Object> overflowConfig = (Map<String, Object>) picker.get("overflowConfig");
assertEquals(1, overflowConfig.get("maxTagCount"));
assertEquals(List.of("select"), overflowConfig.get("displayPosition"));
}
@Test
@@ -574,6 +577,7 @@ class TemplateToAmisConverterTest {
Map<String, Object> picker = items.get(0);
assertEquals("picker", picker.get("type"));
assertNull(picker.get("multiple"));
assertNull(picker.get("overflowConfig"));
assertEquals("/api/picker/" + dialogId + "/list", picker.get("source"));
assertEquals("_label", picker.get("labelField"));
assertEquals("_id", picker.get("valueField"));
@@ -610,6 +614,9 @@ class TemplateToAmisConverterTest {
assertEquals("picker", items.get(1).get("type"));
assertEquals("picker", items.get(2).get("type"));
assertEquals(Boolean.TRUE, items.get(0).get("multiple"));
Map<String, Object> overflowConfig = (Map<String, Object>) items.get(0).get("overflowConfig");
assertEquals(1, overflowConfig.get("maxTagCount"));
assertEquals(List.of("select"), overflowConfig.get("displayPosition"));
assertEquals("请点击右侧的图标", items.get(0).get("placeholder"));
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"));
@@ -1065,6 +1072,51 @@ class TemplateToAmisConverterTest {
assertEquals("read", args.get("mode"));
}
/** engineclass=MessageReceiveView → 注入「查看」,按 SYS_MESSAGEUSER 主键打开详情并置已读。 */
@Test
@SuppressWarnings("unchecked")
void engineclass_MessageReceiveView_注入查看并置已读按钮() {
String xml = "<crud entityid='e1'><display/></crud>";
ConversionResult r = converter.convertGraded(xml, null,
"com.dsasp.client.tools.message.MessageReceiveView", "收到的消息", new ArrayList<>(), noPage);
List<Object> toolbar = (List<Object>) body(r.getSchema()).get("headerToolbar");
Map<String, Object> detail = toolbar.stream()
.filter(o -> o instanceof Map && "查看".equals(((Map<String, Object>) o).get("label")))
.map(o -> (Map<String, Object>) o).findFirst().orElse(null);
assertNotNull(detail, "收到的消息应注入「查看」按钮");
assertEquals("${!selectedItems || selectedItems.length !== 1}", detail.get("disabledOn"));
Map<String, Object> action = (Map<String, Object>) ((List<Object>) ((Map<String, Object>)
((Map<String, Object>) detail.get("onEvent")).get("click")).get("actions")).get(0);
Map<String, Object> args = (Map<String, Object>) action.get("args");
assertEquals("openMessageDetail", action.get("actionType"));
assertEquals("received", args.get("kind"));
assertEquals("${selectedItems[0].PM_DEMO_ID}", args.get("receiveId"));
assertTrue(String.valueOf(args.get("title")).contains("SYS_MESSAGE_ID_DISPLAY__"),
"收到消息标题应优先取列表中的消息显示名");
}
/** engineclass=MessageSendView → 注入「查看」,按 SYS_MESSAGE 主键打开只读详情。 */
@Test
@SuppressWarnings("unchecked")
void engineclass_MessageSendView_注入查看按钮() {
String xml = "<crud entityid='e1'><display/></crud>";
ConversionResult r = converter.convertGraded(xml, null,
"com.dsasp.client.tools.message.MessageSendView", "已发送消息", new ArrayList<>(), noPage);
List<Object> toolbar = (List<Object>) body(r.getSchema()).get("headerToolbar");
Map<String, Object> detail = toolbar.stream()
.filter(o -> o instanceof Map && "查看".equals(((Map<String, Object>) o).get("label")))
.map(o -> (Map<String, Object>) o).findFirst().orElse(null);
assertNotNull(detail, "已发送消息应注入「查看」按钮");
Map<String, Object> action = (Map<String, Object>) ((List<Object>) ((Map<String, Object>)
((Map<String, Object>) detail.get("onEvent")).get("click")).get("actions")).get(0);
Map<String, Object> args = (Map<String, Object>) action.get("args");
assertEquals("openMessageDetail", action.get("actionType"));
assertEquals("sent", args.get("kind"));
assertEquals("${selectedItems[0].PM_DEMO_ID}", args.get("messageId"));
}
/**
* engineclass=FuncDownloadComponent(功能模板下载模板管理/设置,type=3 树页)→ 整页改写器(机制① MUTATORS):
* 移除右表单「添加」按钮(空 toolbar 整条移除)+ 右表单标题改「编辑模板附件」。复刻 refreshRightLayout。