Compare commits

..

2 Commits

Author SHA1 Message Date
7192c2aaa6 docs: record process form removal status
Some checks failed
ci / build-test-parity (push) Has been cancelled
2026-06-18 08:56:10 +08:00
1d8a4fec60 feat: wire process form removal actions 2026-06-18 08:55:17 +08:00
9 changed files with 229 additions and 4 deletions

View File

@@ -1,6 +1,6 @@
# Framework 定制视图 TODO(活清单)
> 维护日期:2026-06-17
> 维护日期:2026-06-18
> 口径:以 `framework定制视图-engineclass移植backlog-2026-06-17.md` 为总 backlog;本文只记录当前可执行队列、已改清单、提交与验证。
> 使用规则:每次修功能后,把条目从 Pending/In Progress 移到 Done,并补 `commit`、`tests`、`deploy/import`。没有逐功能验收的页面不能标 Done;代码已提交但页面闭环未验的项只能放在 Needs Verification。
@@ -10,8 +10,8 @@
|---|---:|---|
| framework 定制视图总数 | 46 | README 总览口径;backlog 表格当前可解析出 45 行,需后续校正缺的 1 行。 |
| 已逐功能验收 / 可算 Done | 约 8 | 用户管理、功能模板下载、实体分类-枚举组、已办任务、消息查看/已读、短消息、查看审批、我的发起任务。功能模板下载/已办/消息查看各覆盖 2 个 templateId,但按 engineclass 各计 1 组。 |
| 代码已提交但待最终副作用验收 | 约 3 | 待办任务:列表、查看详细、处理抽屉已验;未点同意/拒绝。用户选择框全家已切标准 amis picker,并已覆盖单选查询、单选表单、多选弹窗层级与多选展示烟测;流程选择框已接线/页面烟测;两者都未覆盖所有真实业务保存和权限差异验收。 |
| 仍需修或逐功能验收 | 约 39 | 含上面的 3 个待验组;大多是通用页已产出,但 engineclass Java delta 未迁移。 |
| 代码已提交但待最终副作用验收 | 约 4 | 待办任务:列表、查看详细、处理抽屉已验;未点同意/拒绝。用户选择框全家已切标准 amis picker,并已覆盖单选查询、单选表单、多选弹窗层级与多选展示烟测;流程选择框已接线/页面烟测;审批表单删除已补查看/删除端点和按钮注入。上述项未覆盖所有真实业务保存、权限差异或页面副作用验收。 |
| 仍需修或逐功能验收 | 约 39 | 含上面的 4 个待验组;大多是通用页已产出,但 engineclass Java delta 未迁移。 |
| 剩余工程单元 | 约 28+ | 多视图可复用同一套组件/端点,如脚本编辑器、消息详情、工作流按钮。 |
## Done(已完成 / 已验收)
@@ -40,6 +40,7 @@
| 流程/审批:待办任务 `TaskComponentNew` | Needs side-effect verification | 浏览器已验 `4ebfc9ee`、`0f7531e2`:列表有数据、发起人显名、查看详细抽屉、处理抽屉、遮罩层级均正常;未点最终同意/拒绝,未验处理后刷新 | 准备专门测试流程实例,或经用户确认可消耗真实待办后,再验“同意/拒绝/退回后列表刷新” |
| 用户选择框全家 | Implemented / Needs business verification | 最新口径:用户单选 `SelectDialog`、多选 `MultiSelectDialog` 均使用标准 amis `picker`(单选不加 `multiple`;多选 `multiple:true` + `overflowConfig.maxTagCount=1`;数据源 `/api/picker/<dialogid>/list`),`eip4-web` 兼容过滤器继续把存量 `user-transfer-picker` 归一成标准 picker。本轮补丁补齐运行时默认值契约:转换器给编辑/查看弹窗 load 服务追加 `?__egtpl=<editFormViewPageId>`,`FlowController` 按该编辑表单 XML 将 load 返回的 `SelectDialog/MultiSelectDialog` 裸 id 解析为 `{_id,_label}`(多选为对象数组),避免默认值显示 UUID 或撑开布局。部署:`BatchConvertCli` 全量重转 2757 项(view_page 编辑表单 1241 个产物),`SchemaImportCli` 扫描 2727 个产物、入库/更新 1054 个,8093 已重启。自动化:`mvn -q -pl platform-converter -Dtest=TemplateToAmisConverterTest#read按钮接load服务_dialog用api加载本体数据,TemplateToAmisConverterTest#crud_用户单选框受控转标准Picker,TemplateToAmisConverterTest#crud_用户选择框组织与考勤模式接线,TemplateToAmisConverterTest#crud_multiSelectDialog转picker多选弹窗 test`、`mvn -q -pl platform-metadata -Dtest=FlowControllerTest#postLoadWithEditTemplateResolvesPickerDefaults test`、`npm test -- --run src/amis/registerUserTransferPicker.test.ts`。浏览器烟测:`5078945c`「用户组-分配用户」为标准多选 picker,默认值显示 `施继栋002[222222]`、无裸 UUID、控件 32px、二级弹窗含搜索/分页/checkbox;`919477da`「流程代理授权」代理人为标准单选 picker,控件与 label 对齐且二级弹窗实际 input 类型为 radio;短消息 `ae79a47b` 已覆盖多选 picker 选人并保存。 | 继续在设置定时任务、岗位设置等真实引用页验保存值、ALL 互斥、受控/全部权限差异和考勤排除挂靠 |
| 流程选择框 | Implemented / Needs business verification | `ProcessSelectController` 已提供 `/api/process-select/options|search`;转换器已把 `b3070157` 接到 amis `transfer-picker`;`919477da` 流程代理授权已重转重导并从 PARTIAL 转 SUCCESS;浏览器 smoke 可打开弹窗,显示「流程名称/已选流程」和流程名 | 继续验流程代理授权保存闭环:代理类型=指定流程时必填、保存后 `wf_agent_process` 写入/读取一致 |
| 审批表单删除 `91ccbba3` | Implemented / Needs page verification | `eip4-platform 1d8a4fe` 已补 `flowable-service` 历史流程删除端点 `/api/flow/process/{processInstanceId}/delete-history`(运行中流程 409)、网关 AMIS 端点 `/api/workflow/process/{processInstanceId}/delete-history`、`ProcessFormRemoveComponent` 查看/删除按钮注入与 CRUD reload 锚点。自动化已过:`FlowControllerTest`、`TodoControllerAmisTest,FlowableClientTest`、`TemplateToAmisConverterTest#engineclass_ProcessFormRemoveComponent_注入查看和删除历史流程按钮`;打包已过:`mvn -q -pl flowable-service package -DskipTests`、`mvn -q -pl platform-app -am package -DskipTests`。 | 重转/导入 `91ccbba3` 后浏览器验收:列表选中已结束流程 → 查看打开只读 ApprovalDrawer;删除成功后列表刷新;运行中流程删除返回 409 且不误删 |
| 菜单真入口 | Needs verification | 前端已去硬编码假入口;需确认所有需要的真菜单在 `sys_menu` 中可达 | 用 `/api/menu` 和页面侧栏核对 |
| 功能模板下载门控 | Pending | backlog 写了 `VIEW_TEMPLATEID` 非空才显示附件编辑;当前只做了去按钮/改标题 | 决定是否补门控,若补则在 `EngineclassDelta` mutator 中按行/上下文控制 |
@@ -48,7 +49,6 @@
| 优先级 | 范围 | 视图 / engineclass | 要补什么 | 复用机制 |
|---|---|---|---|---|
| P1 | 流程监控 | `9f3b5a8b` | 处理、高级处理、结束流程;高级处理涉及 Groovy 权限/审计 | 机制① + 流程端点,需权限守卫 |
| P1 | 审批表单删除 | `91ccbba3` | 查看只读表单、删除历史流程实例 | 复用只读审批抽屉 + 流程删除端点 |
## P2(中等 delta,可批量复用)

View File

@@ -349,6 +349,39 @@ public class FlowController {
return ResponseEntity.noContent().build();
}
@PostMapping("/process/{processInstanceId}/delete-history")
@Operation(summary = "删除已结束历史流程实例",
description = "对齐老 ProcessCoreService.dleteCompleteProcessInstance:仅允许删除已结束的历史流程实例;"
+ "运行中实例返回 409,避免审批表单删除页误删活动流程。")
public ResponseEntity<Map<String, Object>> deleteHistoricProcessInstance(@PathVariable String processInstanceId) {
String pid = trimToNull(processInstanceId);
if (pid == null) {
return ResponseEntity.badRequest().body(errorBody("processInstanceId 不能为空"));
}
ProcessInstance runtime = runtimeService.createProcessInstanceQuery()
.processInstanceId(pid).singleResult();
if (runtime != null) {
return ResponseEntity.status(org.springframework.http.HttpStatus.CONFLICT)
.body(errorBody("流程未结束,不能删除审批表单"));
}
var hpi = historyService.createHistoricProcessInstanceQuery()
.processInstanceId(pid).singleResult();
if (hpi == null) {
return ResponseEntity.notFound().build();
}
if (hpi.getEndTime() == null) {
return ResponseEntity.status(org.springframework.http.HttpStatus.CONFLICT)
.body(errorBody("流程未结束,不能删除审批表单"));
}
String businessKey = hpi.getBusinessKey();
historyService.deleteHistoricProcessInstance(pid);
Map<String, Object> resp = new java.util.LinkedHashMap<>();
resp.put("deleted", true);
resp.put("processInstanceId", pid);
resp.put("businessKey", businessKey);
return ResponseEntity.ok(resp);
}
@PostMapping("/tasks/{taskId}/delegate")
@Operation(summary = "委托任务", description = "委托给指定用户:assignee 变为受托人,owner 记原办理人")
public ResponseEntity<TaskDto> delegate(@PathVariable String taskId, @RequestBody Requests.DelegateRequest req) {

View File

@@ -11,6 +11,8 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import java.util.Date;
import org.flowable.engine.HistoryService;
import org.flowable.engine.IdentityService;
import org.flowable.engine.RepositoryService;
@@ -119,6 +121,41 @@ class FlowControllerTest {
verify(runtimeService).activateProcessInstanceById("pi-3");
}
@Test
void 删除已结束历史流程实例_转调historyDelete() throws Exception {
when(runtimeService.createProcessInstanceQuery()).thenReturn(processInstanceQuery);
when(processInstanceQuery.processInstanceId("PI-DONE")).thenReturn(processInstanceQuery);
when(processInstanceQuery.singleResult()).thenReturn(null);
HistoricProcessInstance hpi = org.mockito.Mockito.mock(HistoricProcessInstance.class);
when(hpi.getBusinessKey()).thenReturn("BK-DONE");
when(hpi.getEndTime()).thenReturn(new Date());
when(historyService.createHistoricProcessInstanceQuery()).thenReturn(historicProcessInstanceQuery);
when(historicProcessInstanceQuery.processInstanceId("PI-DONE")).thenReturn(historicProcessInstanceQuery);
when(historicProcessInstanceQuery.singleResult()).thenReturn(hpi);
mvc.perform(post("/api/flow/process/PI-DONE/delete-history"))
.andExpect(status().isOk())
.andExpect(jsonPath("$.deleted").value(true))
.andExpect(jsonPath("$.businessKey").value("BK-DONE"));
verify(historyService).deleteHistoricProcessInstance("PI-DONE");
}
@Test
void 删除运行中流程实例_拒绝且不删历史() throws Exception {
ProcessInstance pi = org.mockito.Mockito.mock(ProcessInstance.class);
when(runtimeService.createProcessInstanceQuery()).thenReturn(processInstanceQuery);
when(processInstanceQuery.processInstanceId("PI-RUN")).thenReturn(processInstanceQuery);
when(processInstanceQuery.singleResult()).thenReturn(pi);
mvc.perform(post("/api/flow/process/PI-RUN/delete-history"))
.andExpect(status().isConflict())
.andExpect(jsonPath("$.msg").value("流程未结束,不能删除审批表单"));
verify(historyService, never()).deleteHistoricProcessInstance(anyString());
}
@Test
void 撤回流程_移动回起始节点并挂起实例() throws Exception {
Task task = org.mockito.Mockito.mock(Task.class);

View File

@@ -86,6 +86,14 @@ public final class EngineclassDelta {
registerMutator("com.dsasp.client.wf.ui.process.monitor.MySendTaskComponent",
EngineclassDelta::startedProcessDataSource);
// 审批表单删除:ProcessFormRemoveComponent 在默认流程实例列表之上加「查看」「删除」。
// 查看复用只读 ApprovalDrawer;删除仅删除已结束的历史流程实例,后端守卫运行中流程 409。
register("com.dsasp.client.wf.ui.process.monitor.ProcessFormRemoveComponent",
EngineclassDelta::processFormRemoveDetailButton,
EngineclassDelta::processFormRemoveDeleteButton);
registerMutator("com.dsasp.client.wf.ui.process.monitor.ProcessFormRemoveComponent",
EngineclassDelta::processFormRemoveCrudAnchor);
// 消息查看:MessageReceiveView/MessageSendView 在默认 GridTemplateComponent 之上加「查看」按钮。
// 收到消息按 SYS_MESSAGEUSER_ID 打开并置已读;已发送消息按 SYS_MESSAGE_ID 打开只读详情。
register("com.dsasp.client.tools.message.MessageReceiveView",
@@ -354,6 +362,59 @@ public final class EngineclassDelta {
return btn;
}
/** 审批表单删除「查看」:按历史流程实例打开只读审批详情。 */
private static Map<String, Object> processFormRemoveDetailButton(String pkField) {
Map<String, Object> args = mapOf(
"taskName", "${selectedItems[0].TITLE || '审批表单查看'}",
"processInstanceId", selectedSingleFieldExpr(pkField),
"businessKey", "${selectedItems[0].businessKey || selectedItems[0].BUSINESSKEY || ''}",
"businessTable", "${selectedItems[0].businessTable || selectedItems[0].BUSINESSTABLE || ''}",
"businessSummary", "${selectedItems[0].businessSummary || {}}",
"readOnly", true,
"mode", "read");
Map<String, Object> action = mapOf(
"actionType", "openApprovalDrawer",
"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;
}
/** 审批表单删除「删除」:按历史流程实例物理删除流程历史。 */
private static Map<String, Object> processFormRemoveDeleteButton(String pkField) {
Map<String, Object> btn = new LinkedHashMap<>();
btn.put("type", "button");
btn.put("id", "删除");
btn.put("label", "删除");
btn.put("icon", "fa fa-trash");
btn.put("level", "danger");
btn.put("actionType", "ajax");
btn.put("disabledOn", "${!selectedItems || selectedItems.length !== 1}");
btn.put("confirmText", "确认删除选中的审批表单历史?");
btn.put("api", mapOf(
"method", "post",
"url", "/api/workflow/process/" + selectedSingleFieldExpr(pkField) + "/delete-history"));
btn.put("reload", "process-form-remove-crud");
return btn;
}
/** 审批表单删除 CRUD 刷新锚点,供删除后精准 reload。 */
@SuppressWarnings("unchecked")
private static void processFormRemoveCrudAnchor(Map<String, Object> schema, ConversionResult result) {
Object bodyObj = schema.get("body");
if (bodyObj instanceof Map<?, ?> body && "crud".equals(body.get("type"))) {
((Map<String, Object>) bodyObj).putIfAbsent("id", "process-form-remove-crud");
if (result != null) {
result.note("engineclass[ProcessFormRemoveComponent] 设置审批表单删除 CRUD 刷新锚点");
}
}
}
private static Map<String, Object> approvalDrawerButton(String label, String icon, String pkField,
boolean readOnly) {
Map<String, Object> args = mapOf(

View File

@@ -1112,6 +1112,44 @@ class TemplateToAmisConverterTest {
assertEquals("主动召回", data.get("comment"));
}
/** engineclass=ProcessFormRemoveComponent → 审批表单删除注入查看和历史删除按钮。 */
@Test
@SuppressWarnings("unchecked")
void engineclass_ProcessFormRemoveComponent_注入查看和删除历史流程按钮() {
String xml = "<crud entityid='e1'><display/></crud>";
ConversionResult r = converter.convertGraded(xml, null,
"com.dsasp.client.wf.ui.process.monitor.ProcessFormRemoveComponent",
"审批表单删除", new ArrayList<>(), noPage);
Map<String, Object> crud = body(r.getSchema());
List<Object> toolbar = (List<Object>) crud.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> delete = toolbar.stream()
.filter(o -> o instanceof Map && "删除".equals(((Map<String, Object>) o).get("label")))
.map(o -> (Map<String, Object>) o).findFirst().orElse(null);
assertEquals("process-form-remove-crud", crud.get("id"));
assertNotNull(detail, "审批表单删除应注入「查看」");
assertNotNull(delete, "审批表单删除应注入「删除」");
assertTrue(toolbar.indexOf(detail) < toolbar.indexOf("pagination"));
assertTrue(toolbar.indexOf(delete) < toolbar.indexOf("pagination"));
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("processInstanceId"));
assertEquals(true, args.get("readOnly"));
assertEquals("ajax", delete.get("actionType"));
assertEquals("danger", delete.get("level"));
assertEquals("process-form-remove-crud", delete.get("reload"));
Map<String, Object> api = (Map<String, Object>) delete.get("api");
assertEquals("post", api.get("method"));
assertEquals("/api/workflow/process/${selectedItems[0].PM_DEMO_ID}/delete-history", api.get("url"));
}
/** engineclass=MessageReceiveView → 注入「查看」,按 SYS_MESSAGEUSER 主键打开详情并置已读。 */
@Test
@SuppressWarnings("unchecked")

View File

@@ -206,6 +206,16 @@ public class FlowableClient {
comment == null ? Map.of() : Map.of("comment", comment), Map.class);
}
/**
* 删除已结束历史流程实例。对应 flowable-service
* {@code POST /api/flow/process/{processInstanceId}/delete-history}。
*/
@SuppressWarnings("unchecked")
public Map<String, Object> deleteHistoricProcessInstance(String processInstanceId) {
return post("删除历史流程", "/api/flow/process/" + processInstanceId + "/delete-history",
Map.of(), Map.class);
}
// ---------------------------------------------------------------- 内部:重试 + 异常分类
private List<FlowTaskDto> get(String op, java.util.function.Function<UriBuilder, java.net.URI> uriFn) {

View File

@@ -213,6 +213,20 @@ public class TodoController {
return ResponseEntity.ok(resp);
}
@Operation(summary = "删除已结束历史流程实例",
description = "审批表单删除页专用:透传 flowable-service delete-history。仅已结束流程允许删除,运行中流程由引擎返回 409。")
@PostMapping("/api/workflow/process/{processInstanceId}/delete-history")
public ResponseEntity<Map<String, Object>> deleteHistoricProcess(@PathVariable String processInstanceId) {
Map<String, Object> engine = flowableClient.deleteHistoricProcessInstance(processInstanceId);
Map<String, Object> resp = new LinkedHashMap<>();
resp.put("status", 0);
resp.put("msg", "删除成功");
resp.put("deleted", true);
resp.put("processInstanceId", processInstanceId);
resp.put("businessKey", rowString(engine, "businessKey", "BUSINESSKEY"));
return ResponseEntity.ok(resp);
}
@Operation(summary = "流程轨迹", description = "返回流程实例的历史任务节点(含当前活动节点),按开始时间升序;包含办理人姓名/审批意见/办理结果")
@GetMapping("/api/flow/process/{processInstanceId}/trace")
public ResponseEntity<List<TraceNodeDto>> trace(@PathVariable String processInstanceId) {

View File

@@ -164,4 +164,21 @@ class FlowableClientTest {
assertThat(result).containsEntry("businessKey", "BK-1");
server.verify();
}
@Test
void 删除历史流程_POST实例历史删除端点() {
FlowGatewayProperties p = props();
RestClient.Builder builder = RestClient.builder().baseUrl(p.getBaseUrl());
MockRestServiceServer server = MockRestServiceServer.bindTo(builder).build();
server.expect(requestTo("http://localhost:8089/api/flow/process/P1/delete-history"))
.andExpect(method(HttpMethod.POST))
.andRespond(withSuccess("{\"deleted\":true,\"businessKey\":\"BK-1\"}", MediaType.APPLICATION_JSON));
FlowableClient client = new FlowableClient(builder.build(), p);
Map<String, Object> result = client.deleteHistoricProcessInstance("P1");
assertThat(result).containsEntry("deleted", true);
assertThat(result).containsEntry("businessKey", "BK-1");
server.verify();
}
}

View File

@@ -192,6 +192,21 @@ class TodoControllerAmisTest {
assertThat(body.getValue().get("variables")).isEqualTo(Map.of("title", "会议通知"));
}
@Test
void deleteHistoricProcess_透传删除历史流程并返回amis成功契约() {
when(flowableClient.deleteHistoricProcessInstance("PI-1"))
.thenReturn(Map.of("deleted", true, "businessKey", "BK-1"));
Map<String, Object> resp = controller.deleteHistoricProcess("PI-1").getBody();
assertThat(resp).containsEntry("status", 0);
assertThat(resp).containsEntry("msg", "删除成功");
assertThat(resp).containsEntry("deleted", true);
assertThat(resp).containsEntry("processInstanceId", "PI-1");
assertThat(resp).containsEntry("businessKey", "BK-1");
verify(flowableClient).deleteHistoricProcessInstance("PI-1");
}
private static ProcessInstanceDto process(String id, String businessKey, boolean ended, long startMillis) {
ProcessInstanceDto dto = new ProcessInstanceDto();
dto.id = id;