Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yanghaoyuan.sh
DolphinScheduler
提交
54fc1479
DolphinScheduler
项目概览
yanghaoyuan.sh
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
1
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,发现更多精彩内容 >>
未验证
提交
54fc1479
编写于
4月 30, 2020
作者:
X
xingchun-chen
提交者:
GitHub
4月 30, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' into dev
上级
682fd7be
c94748a6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
18 addition
and
5 deletion
+18
-5
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
...inscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
+7
-0
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/nodeStatus.vue
.../pages/dag/_source/formModel/tasks/_source/nodeStatus.vue
+3
-4
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/conditions.vue
...onf/home/pages/dag/_source/formModel/tasks/conditions.vue
+8
-1
未找到文件。
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
浏览文件 @
54fc1479
...
...
@@ -259,8 +259,15 @@
if
(
v2
.
name
===
v1
.
name
)
{
let
dom
=
$
(
`#
${
v2
.
id
}
`
)
let
state
=
dom
.
find
(
'
.state-p
'
)
let
depState
=
''
taskList
.
forEach
(
item
=>
{
if
(
item
.
name
==
v1
.
name
)
{
depState
=
item
.
state
}
})
dom
.
attr
(
'
data-state-id
'
,
v1
.
stateId
)
dom
.
attr
(
'
data-dependent-result
'
,
v1
.
dependentResult
||
''
)
dom
.
attr
(
'
data-dependent-depState
'
,
depState
)
state
.
append
(
`<strong class="
${
v1
.
icoUnicode
}
${
v1
.
isSpin
?
'
as as-spin
'
:
''
}
" style="color:
${
v1
.
color
}
" data-toggle="tooltip" data-html="true" data-container="body"></strong>`
)
state
.
find
(
'
strong
'
).
attr
(
'
title
'
,
titleTpl
(
v2
,
v1
.
desc
))
}
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/nodeStatus.vue
浏览文件 @
54fc1479
...
...
@@ -28,8 +28,8 @@
<template
v-if=
"isInstance"
>
<span
class=
"instance-state"
>
<em
class=
"iconfont ans-icon-success-solid"
:class=
"'icon-' + el.state"
v-if=
"el.state === 'SUCCESS'"
data-toggle=
"tooltip"
data-container=
"body"
:title=
"$t('success')"
></em>
<em
class=
"iconfont ans-icon-clock"
:class=
"'icon-' + el.state"
v-if=
"el.state === '
WAITING
'"
data-toggle=
"tooltip"
data-container=
"body"
:title=
"$t('waiting')"
></em>
<em
class=
"iconfont ans-icon-fail-solid"
:class=
"'icon-' + el.state"
v-if=
"el.state === 'FAIL
ED
'"
data-toggle=
"tooltip"
data-container=
"body"
:title=
"$t('failed')"
></em>
<em
class=
"iconfont ans-icon-clock"
:class=
"'icon-' + el.state"
v-if=
"el.state === '
RUNNING_EXEUTION
'"
data-toggle=
"tooltip"
data-container=
"body"
:title=
"$t('waiting')"
></em>
<em
class=
"iconfont ans-icon-fail-solid"
:class=
"'icon-' + el.state"
v-if=
"el.state === 'FAIL
URE
'"
data-toggle=
"tooltip"
data-container=
"body"
:title=
"$t('failed')"
></em>
</span>
</
template
>
<span
class=
"operation"
>
...
...
@@ -176,8 +176,7 @@
}
})
},
mounted
()
{
},
mounted
()
{},
components
:
{}
}
</
script
>
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/conditions.vue
浏览文件 @
54fc1479
...
...
@@ -143,13 +143,20 @@
created
()
{
let
o
=
this
.
backfillItem
let
dependentResult
=
$
(
`#
${
o
.
id
}
`
).
data
(
'
dependent-result
'
)
||
{}
// Does not represent an empty object backfill
if
(
!
_
.
isEmpty
(
o
))
{
this
.
relation
=
_
.
cloneDeep
(
o
.
dependence
.
relation
)
||
'
AND
'
this
.
dependTaskList
=
_
.
cloneDeep
(
o
.
dependence
.
dependTaskList
)
||
[]
let
defaultState
=
this
.
isDetails
?
'
WAITING
'
:
''
// Process instance return status display matches by key
_
.
map
(
this
.
dependTaskList
,
v
=>
_
.
map
(
v
.
dependItemList
,
v1
=>
v1
.
state
=
dependentResult
[
`
${
v1
.
definitionId
}
-
${
v1
.
depTasks
}
-
${
v1
.
cycle
}
-
${
v1
.
dateValue
}
`
]
||
defaultState
))
_
.
map
(
this
.
dependTaskList
,
v
=>
_
.
map
(
v
.
dependItemList
,
v1
=>
{
$
(
`#
${
o
.
id
}
`
).
siblings
().
each
(
function
(){
if
(
v1
.
depTasks
==
$
(
this
).
text
())
{
v1
.
state
=
$
(
this
).
attr
(
'
data-dependent-depstate
'
)
}
});
}))
}
},
mounted
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录