yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/apps_dev' into apps_dev

Browse Source
This commit is contained in:
Mr-wang 2023-07-26 11:10:40 +08:00
commit 045b1cc173
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
com.actionsoft.apps.coe.method.process.subprocess/lib/com.actionsoft.apps.coe.method.process.subprocess.jar
View File

Binary file not shown.

8
com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/GraphNodeCloseHandle.java
View File

@ -287,7 +287,9 @@ class NodeCloseAdjMatrix extends AbstractAdjMatrix {
if (leadNodeArr.size() > 0){
for (Object o : leadNodeArr) {
String leadNodeId = (String) o;
addEdge(nodeIds.indexOf(leadNodeId), nodeIds.indexOf(currentNodeId));
if (nodeIds.indexOf(leadNodeId) != -1){
addEdge(nodeIds.indexOf(leadNodeId), nodeIds.indexOf(currentNodeId));
}
}
}
// 当前节点的后置节点
@ -295,7 +297,9 @@ class NodeCloseAdjMatrix extends AbstractAdjMatrix {
if (rearNodeArr.size() > 0){
for (Object o : rearNodeArr) {
String rearNodeId = (String) o;
addEdge(nodeIds.indexOf(currentNodeId), nodeIds.indexOf(rearNodeId));
if (nodeIds.indexOf(rearNodeId) != -1){
addEdge(nodeIds.indexOf(currentNodeId), nodeIds.indexOf(rearNodeId));
}
}
}
}

8
com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/GraphNodeExpandHandle.java
View File

@ -399,7 +399,9 @@ class NodeExpandAdjMatrix extends AbstractAdjMatrix {
if (leadNodeArr.size() > 0){
for (Object o : leadNodeArr) {
String leadNodeId = (String) o;
addEdge(nodeIds.indexOf(leadNodeId), nodeIds.indexOf(currentNodeId));
if (nodeIds.indexOf(leadNodeId) != -1){
addEdge(nodeIds.indexOf(leadNodeId), nodeIds.indexOf(currentNodeId));
}
}
}
// 当前节点的后置节点
@ -407,7 +409,9 @@ class NodeExpandAdjMatrix extends AbstractAdjMatrix {
if (rearNodeArr.size() > 0){
for (Object o : rearNodeArr) {
String rearNodeId = (String) o;
addEdge(nodeIds.indexOf(currentNodeId), nodeIds.indexOf(rearNodeId));
if (nodeIds.indexOf(rearNodeId) != -1){
addEdge(nodeIds.indexOf(currentNodeId), nodeIds.indexOf(rearNodeId));
}
}
}
}