Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
pentaLiker
DolphinScheduler
提交
e2553e33
DolphinScheduler
项目概览
pentaLiker
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
e2553e33
编写于
8月 11, 2020
作者:
X
xingchun-chen
提交者:
GitHub
8月 11, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3464 from break60/1.3.2-release
[Fix-3058][ui]Method catches with variables
上级
46f05869
b6186bf3
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
20 addition
and
14 deletion
+20
-14
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
...rc/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
+19
-13
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js
...uler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js
+1
-1
未找到文件。
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
浏览文件 @
e2553e33
...
...
@@ -691,6 +691,9 @@ JSP.prototype.handleEvent = function () {
let
sourceId
=
info
[
'
sourceId
'
]
// 出
let
targetId
=
info
[
'
targetId
'
]
// 入
console
.
log
(
sourceId
,
targetId
)
let
rtTargetarr
=
rtTargetarrArr
(
targetId
)
let
rtSoucearr
=
rtTargetarrArr
(
sourceId
)
console
.
log
(
rtTargetarr
,
rtSoucearr
)
/**
* When connecting, connection is prohibited when the sourceId and target nodes are empty
*/
...
...
@@ -703,30 +706,33 @@ JSP.prototype.handleEvent = function () {
*/
let
recursiveVal
const
recursiveTargetarr
=
(
arr
,
targetId
)
=>
{
for
(
let
i
in
arr
)
{
if
(
arr
[
i
]
===
targetId
)
{
recursiveVal
=
targetId
}
else
{
recursiveTargetarr
(
rtTargetarrArr
(
arr
[
i
]),
targetId
)
for
(
let
i
in
arr
)
{
if
(
arr
[
i
]
===
targetId
)
{
recursiveVal
=
targetId
}
else
{
let
targetArr
=
rtTargetarrArr
(
arr
[
i
])
recursiveTargetarr
(
targetArr
,
targetId
)
}
}
}
return
recursiveVal
}
// Connection to connected nodes is not allowed
if
(
_
.
findIndex
(
rtTargetarrArr
(
targetId
),
v
=>
v
===
sourceId
)
!==
-
1
)
{
if
(
_
.
findIndex
(
rtTargetarr
,
v
=>
v
===
sourceId
)
!==
-
1
)
{
console
.
log
(
rtTargetarr
,
'
not allowed
'
)
return
false
}
// Recursive form to find if the target Targetarr has a sourceId
if
(
recursiveTargetarr
(
rtTargetarrArr
(
sourceId
),
targetId
))
{
if
(
recursiveTargetarr
(
rtSoucearr
,
targetId
))
{
console
.
log
(
'
has a sourceId
'
)
return
false
}
if
(
$
(
`#
${
sourceId
}
`
).
attr
(
'
data-tasks-type
'
)
===
'
CONDITIONS
'
&&
$
(
`#
${
sourceId
}
`
).
attr
(
'
data-nodenumber
'
)
===
2
)
{
if
(
$
(
`#
${
sourceId
}
`
).
attr
(
'
data-tasks-type
'
)
===
'
CONDITIONS
'
&&
parseInt
(
$
(
`#
${
sourceId
}
`
).
attr
(
'
data-nodenumber
'
))
===
2
)
{
return
false
}
else
{
$
(
`#
${
sourceId
}
`
).
attr
(
'
data-nodenumber
'
,
Number
(
$
(
`#
${
sourceId
}
`
).
attr
(
'
data-nodenumber
'
))
+
1
)
console
.
log
(
'
data-nodenumber
'
)
$
(
`#
${
sourceId
}
`
).
attr
(
'
data-nodenumber
'
,
parseInt
(
$
(
`#
${
sourceId
}
`
).
attr
(
'
data-nodenumber
'
))
+
1
)
}
// Storage node dependency information
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js
浏览文件 @
e2553e33
...
...
@@ -34,7 +34,7 @@ const saveTargetarr = (valId, domId) => {
let
$target
=
$
(
`#
${
domId
}
`
)
let
targetStr
=
$target
.
attr
(
'
data-targetarr
'
)
?
$target
.
attr
(
'
data-targetarr
'
)
+
`,
${
valId
}
`
:
`
${
valId
}
`
;
$target
.
attr
(
'
data-targetarr
'
,
targetStr
)
console
.
log
(
targetStr
)
console
.
log
(
'
Store node id to targetarr
'
,
targetStr
)
}
const
rtBantpl
=
()
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录