Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
老大叔也想要天天的爱情
DolphinScheduler
提交
dcd5727d
DolphinScheduler
项目概览
老大叔也想要天天的爱情
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
3
Star
0
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,发现更多精彩内容 >>
提交
dcd5727d
编写于
4月 19, 2019
作者:
G
gongzijian
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复dag无环bug,增加监控中心路由 文件目录等
上级
fdac47b3
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
36 addition
and
18 deletion
+36
-18
escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
...rc/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
+3
-9
escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js
...uler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js
+2
-2
escheduler-ui/src/js/conf/home/pages/dag/_source/variable/variablesView.vue
...js/conf/home/pages/dag/_source/variable/variablesView.vue
+31
-7
未找到文件。
escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
浏览文件 @
dcd5727d
...
...
@@ -668,26 +668,21 @@ JSP.prototype.saveStore = function () {
/**
* Event processing
*/
JSP
.
prototype
.
handleEvent
=
function
()
{
this
.
JspInstance
.
bind
(
'
beforeDrop
'
,
function
(
info
)
{
let
sourceId
=
info
[
'
sourceId
'
]
// 出
let
targetId
=
info
[
'
targetId
'
]
// 入
/**
* Recursive search for nodes
*/
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
...
...
@@ -700,7 +695,6 @@ JSP.prototype.handleEvent = function () {
// Recursive form to find if the target Targetarr has a sourceId
if
(
recursiveTargetarr
(
rtTargetarrArr
(
sourceId
),
targetId
))
{
// setRecursiveVal(null)
return
false
}
...
...
escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js
浏览文件 @
dcd5727d
...
...
@@ -24,8 +24,8 @@ import store from '@/conf/home/store'
* Node, to array
*/
const
rtTargetarrArr
=
(
id
)
=>
{
let
a
=
$
(
`#
${
id
}
`
).
attr
(
'
data-targetarr
'
)
return
a
?
a
.
split
(
'
,
'
)
:
[]
let
ids
=
$
(
`#
${
id
}
`
).
attr
(
'
data-targetarr
'
)
return
ids
?
ids
.
split
(
'
,
'
)
:
[]
}
/**
...
...
escheduler-ui/src/js/conf/home/pages/dag/_source/variable/variablesView.vue
浏览文件 @
dcd5727d
...
...
@@ -4,7 +4,16 @@
<div
class=
"list"
>
<div
class=
"name"
><i
class=
"fa fa-code"
></i><b
style=
"padding-top: 3px;display: inline-block"
>
{{
$t
(
'
Global parameters
'
)
}}
</b></div>
<div
class=
"var-cont"
>
<x-button
size=
"xsmall"
type=
"ghost"
v-for=
"(item,$index) in list.globalParams"
@
click=
"_copy('gbudp-' + $index)"
:data-clipboard-text=
"item.prop + ' = ' +item.value"
:class=
"'gbudp-' + $index"
><b
style=
"color: #2A455B;"
>
{{
item
.
prop
}}
</b>
=
{{
item
.
value
}}
</x-button>
<template
v-for=
"(item,$index) in list.globalParams"
>
<x-button
size=
"xsmall"
type=
"ghost"
@
click=
"_copy('gbudp-' + $index)"
:data-clipboard-text=
"item.prop + ' = ' +item.value"
:class=
"'gbudp-' + $index"
>
<b
style=
"color: #2A455B;"
>
{{
item
.
prop
}}
</b>
=
{{
item
.
value
}}
</x-button>
</
template
>
</div>
</div>
<div
class=
"list"
style=
"height: 30px;"
>
...
...
@@ -15,10 +24,19 @@
</div>
<div
class=
"list list-t"
v-for=
"(item,key,$index) in list.localParams"
>
<div
class=
"task-name"
>
Task({{$index}}):{{key}}
</div>
<div
class=
"var-cont"
v-if=
"item.length"
>
<template
v-for=
"(el,index) in item"
>
<x-button
size=
"xsmall"
type=
"ghost"
@
click=
"_copy('copy-part-' + index)"
:data-clipboard-text=
"_rtClipboard(el)"
:class=
"'copy-part-' + index"
>
<span
v-for=
"(e,k,i) in el"
><b
style=
"color: #2A455B;"
>
{{
k
}}
</b>
=
{{
e
}}
</span>
<div
class=
"var-cont"
v-if=
"item.localParamsList.length"
>
<
template
v-for=
"(el,index) in item.localParamsList"
>
<x-button
size=
"xsmall"
type=
"ghost"
@
click=
"_copy('copy-part-' + index)"
:data-clipboard-text=
"_rtClipboard(el,item.taskType)"
:class=
"'copy-part-' + index"
>
<span
v-for=
"(e,k,i) in el"
>
<template
v-if=
"item.taskType === 'SQL' || item.taskType === 'PROCEDURE'"
>
<template
v-if=
"(k !== 'direct' && k !== 'type')"
>
<b
style=
"color: #2A455B;"
>
{{
k
}}
</b>
=
{{
e
}}
</
template
>
</template>
<
template
v-else
>
<b
style=
"color: #2A455B;"
>
{{
k
}}
</b>
=
{{
e
}}
</
template
>
</span>
</x-button>
</template>
</div>
...
...
@@ -73,10 +91,16 @@
/**
* Copyed text processing
*/
_rtClipboard
(
el
)
{
_rtClipboard
(
el
,
taskType
)
{
let
arr
=
[]
Object
.
keys
(
el
).
forEach
((
key
)
=>
{
arr
.
push
(
`
${
key
}
=
${
el
[
key
]}
`
)
if
(
taskType
===
'
SQL
'
||
taskType
===
'
PROCEDURE
'
)
{
if
(
key
!==
'
direct
'
&&
key
!==
'
type
'
)
{
arr
.
push
(
`
${
key
}
=
${
el
[
key
]}
`
)
}
}
else
{
arr
.
push
(
`
${
key
}
=
${
el
[
key
]}
`
)
}
})
return
arr
.
join
(
'
'
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录