Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
liyuanzhong001
DolphinScheduler
提交
d4ef2293
DolphinScheduler
项目概览
liyuanzhong001
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
11
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,发现更多精彩内容 >>
提交
d4ef2293
编写于
5月 26, 2020
作者:
B
break60
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Modify process group workerGroup value display and filter child node duplicate values
上级
5b633cf4
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
19 addition
and
6 deletion
+19
-6
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
...inscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
+2
-1
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
...rc/js/conf/home/pages/dag/_source/formModel/formModel.vue
+10
-3
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sub_process.vue
...nf/home/pages/dag/_source/formModel/tasks/sub_process.vue
+6
-1
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
...pages/projects/pages/instance/pages/list/_source/list.vue
+1
-1
未找到文件。
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
浏览文件 @
d4ef2293
...
...
@@ -581,7 +581,8 @@
taskType
:
type
,
self
:
self
,
preNode
:
preNode
,
rearList
:
rearList
rearList
:
rearList
,
instanceId
:
this
.
$route
.
params
.
id
}
})
})
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
浏览文件 @
d4ef2293
...
...
@@ -268,6 +268,7 @@
</template>
<
script
>
import
_
from
'
lodash
'
import
{
mapActions
}
from
'
vuex
'
import
mLog
from
'
./log
'
import
mMr
from
'
./tasks/mr
'
import
mSql
from
'
./tasks/sql
'
...
...
@@ -356,9 +357,11 @@
taskType
:
String
,
self
:
Object
,
preNode
:
Array
,
rearList
:
Array
rearList
:
Array
,
instanceId
:
Number
},
methods
:
{
...
mapActions
(
'
dag
'
,
[
'
getTaskInstanceList
'
]),
/**
* depend
*/
...
...
@@ -633,8 +636,12 @@
break
;
}
}
if
(
!
hasMatch
&&
o
.
workerGroupId
!=
undefined
){
this
.
workerGroup
=
'
default
'
if
(
o
.
workerGroup
==
undefined
)
{
this
.
store
.
dispatch
(
'
dag/getTaskInstanceList
'
,{
pageSize
:
10
,
pageNo
:
1
,
processInstanceId
:
this
.
instanceId
,
name
:
o
.
name
}).
then
(
res
=>
{
this
.
workerGroup
=
res
.
totalList
[
0
].
workerGroup
})
}
else
{
this
.
workerGroup
=
o
.
workerGroup
}
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sub_process.vue
浏览文件 @
d4ef2293
...
...
@@ -95,7 +95,12 @@
},
created
()
{
let
processListS
=
_
.
cloneDeep
(
this
.
store
.
state
.
dag
.
processListS
)
let
id
=
this
.
router
.
history
.
current
.
params
.
id
||
null
let
id
=
null
if
(
this
.
router
.
history
.
current
.
name
===
'
projects-instance-details
'
)
{
id
=
this
.
router
.
history
.
current
.
query
.
id
||
null
}
else
{
id
=
this
.
router
.
history
.
current
.
params
.
id
||
null
}
this
.
processDefinitionList
=
(()
=>
{
let
a
=
_
.
map
(
processListS
,
v
=>
{
return
{
...
...
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
浏览文件 @
d4ef2293
...
...
@@ -70,7 +70,7 @@
<span>
{{
parseInt
(
pageNo
===
1
?
(
$index
+
1
)
:
((
$index
+
1
)
+
(
pageSize
*
(
pageNo
-
1
))))
}}
</span>
</td>
<td
style=
"min-width: 200px;max-width: 300px;padding-right: 10px;"
>
<span
class=
"ellipsis"
style=
"padding-left: 4px;"
><router-link
:to=
"
{ path: '/projects/instance/list/' + item.id}" tag="a" class="links" :title="item.name">
{{
item
.
name
}}
</router-link></span>
<span
class=
"ellipsis"
style=
"padding-left: 4px;"
><router-link
:to=
"
{ path: '/projects/instance/list/' + item.id
, query:{id: item.processDefinitionId}
}" tag="a" class="links" :title="item.name">
{{
item
.
name
}}
</router-link></span>
</td>
<td>
<span
v-html=
"_rtState(item.state)"
style=
"cursor: pointer;"
></span>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录