fix(flow): restore workflow task converted pages

This commit is contained in:
2026-06-17 20:44:52 +08:00
parent 5946afa6e6
commit 57c3412aff
6 changed files with 689 additions and 15 deletions

View File

@@ -64,6 +64,19 @@ public final class EngineclassDelta {
// 非 crud 加按钮,走整页改写器(MUTATORS)。
registerMutator("com.dsasp.client.viewframework.component.FuncDownloadComponent",
EngineclassDelta::funcDownloadDelta);
// 流程待办/已办:TaskComponentNew/FinishTaskComponentNew 在默认 GridTemplateComponent 之上加任务详情/处理按钮。
// 这些模板的主键列就是 Flowable taskId(不同库可能为 VIEW_ACT_TASK_ID 或 VIEW_ACT_RU_TASK_ID),
// 因此必须使用转换后 crud.primaryField,不能硬编码列名。
register("com.dsasp.client.wf.task.component.TaskComponentNew",
EngineclassDelta::taskDetailButton,
EngineclassDelta::taskHandleButton);
register("com.dsasp.client.wf.task.component.FinishTaskComponentNew",
EngineclassDelta::finishedTaskDetailButton);
registerMutator("com.dsasp.client.wf.task.component.TaskComponentNew",
EngineclassDelta::taskTodoDataSource);
registerMutator("com.dsasp.client.wf.task.component.FinishTaskComponentNew",
EngineclassDelta::taskDoneDataSource);
}
private EngineclassDelta() {
@@ -223,6 +236,79 @@ public final class EngineclassDelta {
return kept.isEmpty();
}
// ── 工作流任务 · 查看详细 / 处理 ────────────────────────────────────────
/** 待办任务数据源:老 VIEW_ACT_RU_TASK 视图为空,改走 Flowable 聚合后的 amis 兼容端点。 */
private static void taskTodoDataSource(Map<String, Object> schema, ConversionResult result) {
replaceCrudApi(schema, "/api/workflow/tasks/todo-amis");
if (result != null) {
result.note("engineclass[TaskComponentNew] 改写待办任务数据源为 /api/workflow/tasks/todo-amis");
}
}
/** 已办任务数据源:老 VIEW_ACT_TASK_COMPLETE 服务流不可用,改走 Flowable 聚合后的 amis 兼容端点。 */
private static void taskDoneDataSource(Map<String, Object> schema, ConversionResult result) {
replaceCrudApi(schema, "/api/workflow/tasks/done-amis");
if (result != null) {
result.note("engineclass[FinishTaskComponentNew] 改写已办任务数据源为 /api/workflow/tasks/done-amis");
}
}
@SuppressWarnings("unchecked")
private static void replaceCrudApi(Map<String, Object> schema, String api) {
Object bodyObj = schema.get("body");
if (bodyObj instanceof Map<?, ?> body && "crud".equals(body.get("type"))) {
((Map<String, Object>) body).put("api", api);
}
}
/** 待办任务「查看详细」:选 1 条 → 按 taskId 打开只读审批详情。 */
private static Map<String, Object> taskDetailButton(String pkField) {
return approvalDrawerButton("查看详细", "fa fa-search", pkField, true);
}
/** 待办任务「处理」:选 1 条 → 按 taskId 打开可办理审批抽屉。 */
private static Map<String, Object> taskHandleButton(String pkField) {
Map<String, Object> btn = approvalDrawerButton("处理", "fa fa-edit", pkField, false);
btn.put("level", "primary");
return btn;
}
/** 已办任务「查看详细」:历史 taskId 只读查看业务单据与轨迹,不暴露办理动作。 */
private static Map<String, Object> finishedTaskDetailButton(String pkField) {
return approvalDrawerButton("查看详细", "fa fa-search", pkField, true);
}
private static Map<String, Object> approvalDrawerButton(String label, String icon, String pkField,
boolean readOnly) {
Map<String, Object> args = mapOf(
"taskId", selectedSingleFieldExpr(pkField),
"taskName", "${selectedItems[0].TASKNAME || selectedItems[0].TASK_NAME || selectedItems[0].TITLE || ''}",
"processInstanceId", "${selectedItems[0].processInstanceId || selectedItems[0].PROCESSINSTANCEID || ''}",
"businessKey", "${selectedItems[0].businessKey || selectedItems[0].BUSINESSKEY || ''}",
"businessTable", "${selectedItems[0].businessTable || selectedItems[0].BUSINESSTABLE || ''}",
"businessSummary", "${selectedItems[0].businessSummary || {}}",
"readOnly", readOnly,
"mode", readOnly ? "read" : "handle");
Map<String, Object> action = mapOf(
"actionType", "openApprovalDrawer",
"args", args);
Map<String, Object> btn = new LinkedHashMap<>();
btn.put("type", "button");
btn.put("id", label);
btn.put("label", label);
btn.put("icon", icon);
btn.put("disabledOn", "${!selectedItems || selectedItems.length !== 1}");
btn.put("onEvent", mapOf("click", mapOf("actions", List.of(action))));
return btn;
}
private static String selectedSingleFieldExpr(String field) {
if (field == null || field.isBlank()) {
return "${selectedItems[0].id}";
}
return "${selectedItems[0]." + field + "}";
}
// ── 用户管理 · 设置主岗位 ──────────────────────────────────────────────
/**
* 「设置主岗位」按钮:选 1 用户 → 弹窗 form。initApi 拉该用户岗位(SYS_POSITIONUSER_SEARCH by USERID),

View File

@@ -913,6 +913,78 @@ class TemplateToAmisConverterTest {
"下钻应内嵌登录历史(edc05980) schema");
}
/** engineclass=TaskComponentNew → 注入「查看详细」「处理」并按 crud.primaryField 传 taskId。 */
@Test
@SuppressWarnings("unchecked")
void engineclass_TaskComponentNew_注入任务详情和处理按钮() {
String xml = "<crud entityid='e1'><display/></crud>";
ConversionResult r = converter.convertGraded(xml, null,
"com.dsasp.client.wf.task.component.TaskComponentNew", "待办任务", 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);
Map<String, Object> handle = 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, "待办任务应注入「查看详细」");
assertNotNull(handle, "待办任务应注入「处理」");
assertEquals("/api/workflow/tasks/todo-amis", body(r.getSchema()).get("api"),
"TaskComponentNew 应改走 Flowable 聚合 amis 数据源,避免老 VIEW_ACT_RU_TASK 视图空数据");
assertTrue(toolbar.indexOf(detail) < toolbar.indexOf("pagination"), "按钮应插在 pagination 前");
assertTrue(toolbar.indexOf(handle) < toolbar.indexOf("pagination"), "按钮应插在 pagination 前");
assertEquals("${!selectedItems || selectedItems.length !== 1}", detail.get("disabledOn"));
assertEquals("primary", handle.get("level"));
Map<String, Object> detailAction = (Map<String, Object>) ((List<Object>) ((Map<String, Object>)
((Map<String, Object>) detail.get("onEvent")).get("click")).get("actions")).get(0);
Map<String, Object> detailArgs = (Map<String, Object>) detailAction.get("args");
assertEquals("openApprovalDrawer", detailAction.get("actionType"));
assertEquals("${selectedItems[0].PM_DEMO_ID}", detailArgs.get("taskId"));
assertEquals("${selectedItems[0].processInstanceId || selectedItems[0].PROCESSINSTANCEID || ''}",
detailArgs.get("processInstanceId"));
assertEquals("${selectedItems[0].businessKey || selectedItems[0].BUSINESSKEY || ''}",
detailArgs.get("businessKey"));
assertEquals("${selectedItems[0].businessTable || selectedItems[0].BUSINESSTABLE || ''}",
detailArgs.get("businessTable"));
assertEquals(true, detailArgs.get("readOnly"));
Map<String, Object> handleAction = (Map<String, Object>) ((List<Object>) ((Map<String, Object>)
((Map<String, Object>) handle.get("onEvent")).get("click")).get("actions")).get(0);
Map<String, Object> handleArgs = (Map<String, Object>) handleAction.get("args");
assertEquals("openApprovalDrawer", handleAction.get("actionType"));
assertEquals("${selectedItems[0].PM_DEMO_ID}", handleArgs.get("taskId"));
assertEquals(false, handleArgs.get("readOnly"));
}
/** engineclass=FinishTaskComponentNew → 只注入只读「查看详细」,不暴露办理。 */
@Test
@SuppressWarnings("unchecked")
void engineclass_FinishTaskComponentNew_仅注入只读查看详细() {
String xml = "<crud entityid='e1'><display/></crud>";
ConversionResult r = converter.convertGraded(xml, null,
"com.dsasp.client.wf.task.component.FinishTaskComponentNew", "已办任务", 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);
boolean hasHandle = toolbar.stream()
.anyMatch(o -> o instanceof Map && "处理".equals(((Map<String, Object>) o).get("label")));
assertNotNull(detail, "已办任务应注入「查看详细」");
assertFalse(hasHandle, "已办任务不应注入「处理」");
assertEquals("/api/workflow/tasks/done-amis", body(r.getSchema()).get("api"),
"FinishTaskComponentNew 应改走 Flowable 聚合 amis 数据源,避免老 VIEW_ACT_TASK_COMPLETE 服务流不可用");
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("openApprovalDrawer", action.get("actionType"));
assertEquals("${selectedItems[0].PM_DEMO_ID}", args.get("taskId"));
assertEquals(true, args.get("readOnly"));
assertEquals("read", args.get("mode"));
}
/**
* engineclass=FuncDownloadComponent(功能模板下载模板管理/设置,type=3 树页)→ 整页改写器(机制① MUTATORS):
* 移除右表单「添加」按钮(空 toolbar 整条移除)+ 右表单标题改「编辑模板附件」。复刻 refreshRightLayout。