Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ public ActionDisplay display() {

@Override
public boolean show(FlowSession flowSession) {
return this.display.show(flowSession);
// 兼容早期设计/导入的流程数据:动作缺少 display 配置时按默认展示处理,
// 与 ActionDisplay 未配置展示脚本即展示的口径一致,避免详情接口空指针
return this.display == null || this.display.show(flowSession);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,27 @@ public static FlowStateException nodeNotSupportRevoke() {
return new FlowStateException("node.notSupportRevoke", "Node not support revoke");
}


/**
* Node not support return (start node has no history node to return)
*
* @return exception
*/
public static FlowStateException nodeNotSupportReturn() {
return new FlowStateException("node.notSupportReturn", "Node not support return");
}

/**
* Return target node is not executed in current process
*
* @param nodeId node id
* @return exception
*/
public static FlowStateException backNodeNotInHistory(String nodeId) {
return new FlowStateException("node.backNode.notInHistory",
String.format("Return target node %s is not in the executed history", nodeId));
}

/**
* Record not support urge
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@

import com.codingapi.flow.action.IFlowAction;
import com.codingapi.flow.action.actions.*;
import com.codingapi.flow.exception.FlowStateException;
import com.codingapi.flow.exception.FlowValidationException;
import com.codingapi.flow.form.FlowForm;
import com.codingapi.flow.node.IFlowNode;
import com.codingapi.flow.node.nodes.ApprovalNode;
import com.codingapi.flow.node.nodes.EndNode;
import com.codingapi.flow.node.nodes.HandleNode;
import com.codingapi.flow.node.nodes.StartNode;
import com.codingapi.flow.record.FlowRecord;
import com.codingapi.flow.session.FlowAdvice;
import com.codingapi.flow.session.FlowSession;
import com.codingapi.flow.workflow.Workflow;
Expand Down Expand Up @@ -146,6 +148,10 @@ public void verifySession(FlowSession session) {
}
IFlowNode backNode = flowAdvice.getBackNode();
IFlowNode currentNode = session.getCurrentNode();
// 开始节点没有任何历史节点,不存在可退回目标,直接拒绝(issue #270)
if (StartNode.NODE_TYPE.equals(currentNode.getType())) {
throw FlowStateException.nodeNotSupportReturn();
}
if (currentNode.equals(backNode)) {
throw FlowValidationException.required("backNode");
}
Expand All @@ -159,10 +165,38 @@ public void verifySession(FlowSession session) {
|| backNode.getType().equals(HandleNode.NODE_TYPE))) {
throw FlowValidationException.required("backNode");
}
// 退回目标必须是当前记录真实执行过的历史节点:
// 并行、条件分支中"结构上不是下游但实际没走过"的节点同样不可退回(issue #270)
verifyBackNodeExecuted(session, backNode);
}

}

/**
* 校验退回目标是否为当前记录真实执行过的历史节点。
*
* <p>仅靠“目标不是当前节点的下游”不足以约束退回:并行、条件分支里存在“不是下游但从未执行”的节点,
* 跳转到此类节点会让流程进入未走过的路径。这里以当前记录之前的历史记录为唯一依据,
* 与详情接口输出的可退回节点({@code FlowContent.backNodes})保持同一口径(issue #270)。</p>
*
* @param session 当前会话
* @param backNode 退回目标节点
*/
private void verifyBackNodeExecuted(FlowSession session, IFlowNode backNode) {
FlowRecord currentRecord = session.getCurrentRecord();
if (currentRecord == null) {
throw FlowValidationException.required("backNode");
}
boolean executed = session.getRepositoryHolder()
.getFlowRecordService()
.findFlowRecordBeforeRecords(currentRecord.getProcessId(), currentRecord.getId())
.stream()
.anyMatch(record -> backNode.getId().equals(record.getNodeId()));
if (!executed) {
throw FlowStateException.backNodeNotInHistory(backNode.getId());
}
}

/**
* 校验审批意见是否必填。
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,39 @@
import com.codingapi.flow.node.nodes.ApprovalNode;
import com.codingapi.flow.node.nodes.HandleNode;
import com.codingapi.flow.node.nodes.StartNode;
import com.codingapi.flow.record.FlowRecord;
import com.codingapi.flow.workflow.Workflow;
import lombok.Getter;

import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Set;

public class BackNodeHelper {

/**
* 允许作为退回目标的节点类型:只有会产生真实审批记录的节点才可退回,
* 抄送、子流程、路由等节点退出时会静默停滞,不参与退回。
*/
private static final Set<String> BACK_NODE_TYPES = Set.of(
StartNode.NODE_TYPE,
ApprovalNode.NODE_TYPE,
HandleNode.NODE_TYPE);

private final Workflow workflow;
private final IFlowNode currentNode;

@Getter
private final List<IFlowNode> backNodes;

private final List<String> backNodeTypes = new ArrayList<>();

public BackNodeHelper(Workflow workflow, IFlowNode currentNode) {
this.workflow = workflow;
this.currentNode = currentNode;

this.backNodes = new ArrayList<>();

this.backNodeTypes.add(StartNode.NODE_TYPE);
this.backNodeTypes.add(ApprovalNode.NODE_TYPE);
this.backNodeTypes.add(HandleNode.NODE_TYPE);

IFlowNode startNode = workflow.getStartNode();
this.backNodes.add(startNode);

Expand All @@ -41,12 +48,58 @@ private void fetchBackNodes(IFlowNode targetNode) {
List<IFlowNode> nextNodes = workflow.nextNodes(targetNode);
if (!nextNodes.contains(currentNode)) {
for (IFlowNode nextNode : nextNodes) {
if (this.backNodeTypes.contains(nextNode.getType())) {
if (BACK_NODE_TYPES.contains(nextNode.getType())) {
this.backNodes.add(nextNode);
}
this.fetchBackNodes(nextNode);
}
}
}

/**
* 按真实执行历史计算可退回节点。
*
* <p>退回只能回到当前记录实际经过的节点,因此候选来源是当前记录之前的历史记录,
* 而不是流程定义的全量节点(issue #270):</p>
* <ul>
* <li>历史记录按记录 id 正序排列后<b>倒序</b>遍历,保证“最近经过的节点”排在第一位
* (例如停留在 C 节点时得到 B、A);</li>
* <li>同一节点多次执行(退回后重新提交)只保留最近一次,避免重复选项;</li>
* <li>当前节点自身不可作为退回目标,未执行过的分支节点自然不会出现。</li>
* </ul>
*
* @param workflow 当前流程定义
* @param beforeRecords 当前记录之前的历史记录(可乱序)
* @param currentNodeId 当前记录所在节点 id
* @return 可退回节点,最近优先
*/
public static List<IFlowNode> historyBackNodes(Workflow workflow,
List<FlowRecord> beforeRecords,
String currentNodeId) {
if (beforeRecords == null || beforeRecords.isEmpty()) {
return new ArrayList<>();
}
List<FlowRecord> sortedRecords = beforeRecords.stream()
.sorted(Comparator.comparingLong(FlowRecord::getId))
.toList();

List<IFlowNode> historyBackNodes = new ArrayList<>();
Set<String> visitedNodeIds = new HashSet<>();
for (int i = sortedRecords.size() - 1; i >= 0; i--) {
String nodeId = sortedRecords.get(i).getNodeId();
if (!visitedNodeIds.add(nodeId)) {
continue;
}
if (nodeId.equals(currentNodeId)) {
continue;
}
IFlowNode node = workflow.getFlowNode(nodeId);
if (node == null || !BACK_NODE_TYPES.contains(node.getType())) {
continue;
}
historyBackNodes.add(node);
}
return historyBackNodes;
}

}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.codingapi.flow.pojo.response;

import com.codingapi.flow.action.ActionType;
import com.codingapi.flow.action.IFlowAction;
import com.codingapi.flow.form.FlowForm;
import com.codingapi.flow.form.permission.FormFieldPermission;
Expand Down Expand Up @@ -176,6 +177,15 @@ public class FlowContent {
*/
private List<NodeOption> nodes;

/**
* 可退回节点。
*
* <p>只包含当前记录真实执行过的历史节点(剔除当前节点),并按“最近经过的节点”优先排序,
* 供退回弹框直接渲染候选列表;为空表示当前记录没有可退回的节点(如开始节点)。
* 与 {@link #nodes} 的全量流程定义节点区分,避免前端从定义节点中截取导致越界选择(issue #270)。</p>
*/
private List<NodeOption> backNodes;

/**
* 支持撤销
*/
Expand Down Expand Up @@ -227,7 +237,7 @@ public void pushCurrentNode(FlowSession flowSession) {
if (currentNode != null) {
ActionManager actionManager = currentNode.actionManager();
NodeStrategyManager strategyManager = currentNode.strategyManager();
this.actions = toActionMaps(actionManager.filterActions(flowSession));
this.actions = filterUnsupportedActions(toActionMaps(actionManager.filterActions(flowSession)));
this.actionList = toActionMaps(actionManager.getActions());
this.adviceRequired = strategyManager.isAdviceRequired();
this.signRequired = strategyManager.isSignRequired();
Expand All @@ -244,6 +254,25 @@ public void pushCurrentNode(FlowSession flowSession) {
}
}

/**
* 过滤当前不可执行的按钮。
*
* <p>没有任何可退回节点时(开始节点或流程首个节点),退回动作不应出现在展示按钮集合中,
* 否则会出现“按钮可点但提交必然失败”的错误交互(issue #270)。
* {@link #actionList} 仍保留节点配置的全部按钮,前端按展示集合自行隐藏。</p>
*
* @param actions 节点过滤后的展示动作
* @return 过滤后的展示动作
*/
private List<Map<String, Object>> filterUnsupportedActions(List<Map<String, Object>> actions) {
if (this.backNodes != null && !this.backNodes.isEmpty()) {
return actions;
}
return actions.stream()
.filter(action -> !ActionType.RETURN.name().equals(action.get("type")))
.toList();
}

/**
* 输出动作配置,并附加运行期能力标记。
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@
import com.codingapi.flow.form.FlowForm;
import com.codingapi.flow.form.FormData;
import com.codingapi.flow.node.IFlowNode;
import com.codingapi.flow.node.helper.BackNodeHelper;
import com.codingapi.flow.operator.IFlowOperator;
import com.codingapi.flow.pojo.request.FlowDetailRequest;
import com.codingapi.flow.pojo.response.FlowContent;
import com.codingapi.flow.pojo.response.NodeOption;
import com.codingapi.flow.record.FlowRecord;
import com.codingapi.flow.service.FlowRecordService;
import com.codingapi.flow.service.WorkflowService;
Expand Down Expand Up @@ -145,9 +147,29 @@ private void loadCurrentNode() {
this.flowContent.pushCurrentNode(this.flowSession);
}

/**
* 加载可退回节点。
*
* <p>候选来自当前记录真实执行过的历史记录(而不是流程定义的全量节点),
* 由 {@link BackNodeHelper#historyBackNodes} 按最近优先输出,供前端直接渲染退回候选列表。
* 必须在 {@link #loadCurrentNode()} 之前执行:没有可退回节点时,退回按钮不会下发到展示按钮集合。</p>
*/
private void loadBackNodes() {
if (this.flowRecord == null) {
this.flowContent.setBackNodes(List.of());
return;
}
List<FlowRecord> beforeRecords = flowRecordService.findFlowRecordBeforeRecords(
this.flowRecord.getProcessId(), this.flowRecord.getId());
List<IFlowNode> backNodes = BackNodeHelper.historyBackNodes(
this.workflow, beforeRecords, this.flowRecord.getNodeId());
this.flowContent.setBackNodes(backNodes.stream().map(NodeOption::new).toList());
}

public FlowContent create() {
this.loadCurrentOperator();
this.loadWorkflow();
this.loadBackNodes();
this.loadCurrentNode();
this.loadTodoFlowRecords();
this.loadHistoryRecords();
Expand Down
Loading
Loading