Skip to content

Branch 1.0.0 fix graphHasCycle #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgcareer merged 9 commits into from
Apr 26, 2019
+7 −10
Merged

Branch 1.0.0 fix graphHasCycle #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3d43869
Merge pull request #61 from qiaozhanwei/branch-1.0.0
qiaozhanwei Apr 16, 2019
45e8295
Merge pull request #63 from qiaozhanwei/branch-1.0.0
qiaozhanwei Apr 16, 2019
7cb5890
Merge pull request #65 from qiaozhanwei/branch-1.0.0
qiaozhanwei Apr 16, 2019
222c7ca
Merge pull request #68 from qiaozhanwei/branch-1.0.0
qiaozhanwei Apr 16, 2019
de27d9d
fix graphHasCycle
Apr 19, 2019
794cfd1
Merge pull request #87 from lgcareer/branch-1.0.0
lgcareer Apr 19, 2019
6871af2
修改无环bug
Apr 19, 2019
b332c70
Merge remote-tracking branch 'upstream/branch-1.0.0' into branch-1.0.0
Apr 19, 2019
f1e6e69
Merge pull request #89 from millionfor/branch-1.0.0
millionfor Apr 19, 2019
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
8 changes: 5 additions & 3 deletions escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public Map<String, Object> createProcessDefinition(User loginUser, String projec
ProcessData processData = JSONUtils.parseObject(processDefinitionJson, ProcessData.class);
Map<String, Object> checkProcessJson = checkProcessNodeList(processData, processDefinitionJson);
if (checkProcessJson.get(Constants.STATUS) != Status.SUCCESS) {
return result;
return checkProcessJson;
}

processDefine.setName(name);
Expand Down Expand Up @@ -262,7 +262,7 @@ public Map<String, Object> updateProcessDefinition(User loginUser, String projec
ProcessData processData = JSONUtils.parseObject(processDefinitionJson, ProcessData.class);
Map<String, Object> checkProcessJson = checkProcessNodeList(processData, processDefinitionJson);
if ((checkProcessJson.get(Constants.STATUS) != Status.SUCCESS)) {
return result;
return checkProcessJson;
}
ProcessDefinition processDefinition = processDao.findProcessDefineById(id);
if (processDefinition == null) {
Expand Down Expand Up @@ -717,7 +717,9 @@ private boolean graphHasCycle(List<TaskNode> taskNodeResponseList) {
List<String> preTasks = JSONUtils.toList(taskNodeResponse.getPreTasks(),String.class);
if (CollectionUtils.isNotEmpty(preTasks)) {
for (String preTask : preTasks) {
graph.addEdge(preTask, taskNodeResponse.getName());
if (!graph.addEdge(preTask, taskNodeResponse.getName())) {
return true;
}
}
}
}
Expand Down
9 changes: 2 additions & 7 deletions escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,16 +678,11 @@ JSP.prototype.handleEvent = function () {
*/
let recursiveVal
const recursiveTargetarr = (arr, targetId) => {
for (var i in arr) {
for (let i in arr) {
if (arr[i] === targetId) {
recursiveVal = targetId
} else {
let recTargetarrArr = rtTargetarrArr(arr[i])
if (recTargetarrArr.length) {
recursiveTargetarr(recTargetarrArr, targetId)
} else {
return recursiveTargetarr(targetId)
}
recursiveTargetarr(rtTargetarrArr(arr[i]), targetId)
}
}
return recursiveVal
Expand Down