Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
de3d9423
DolphinScheduler
项目概览
apache
/
DolphinScheduler
上一次同步 接近 2 年
通知
707
Star
9572
Fork
3514
代码
文件
提交
分支
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,发现更多精彩内容 >>
未验证
提交
de3d9423
编写于
7月 08, 2022
作者:
R
rockfang
提交者:
GitHub
7月 08, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Fix-10829][UI] display real workflow relation in `WorkFlow Relation` page (#10836)
上级
ae6aa53f
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
33 addition
and
7 deletion
+33
-7
dolphinscheduler-ui/src/components/result/index.tsx
dolphinscheduler-ui/src/components/result/index.tsx
+1
-1
dolphinscheduler-ui/src/views/projects/workflow/relation/components/Graph.tsx
...src/views/projects/workflow/relation/components/Graph.tsx
+17
-1
dolphinscheduler-ui/src/views/projects/workflow/relation/index.tsx
...heduler-ui/src/views/projects/workflow/relation/index.tsx
+1
-0
dolphinscheduler-ui/src/views/projects/workflow/relation/use-relation.ts
...r-ui/src/views/projects/workflow/relation/use-relation.ts
+14
-5
未找到文件。
dolphinscheduler-ui/src/components/result/index.tsx
浏览文件 @
de3d9423
...
...
@@ -43,7 +43,7 @@ const props = {
},
contentStyle
:
{
type
:
String
as
PropType
<
string
|
CSSProperties
>
,
default
:
defaultContentStyle
default
:
JSON
.
stringify
(
defaultContentStyle
)
}
}
...
...
dolphinscheduler-ui/src/views/projects/workflow/relation/components/Graph.tsx
浏览文件 @
de3d9423
...
...
@@ -33,6 +33,9 @@ const props = {
type
:
Array
as
PropType
<
Array
<
any
>>
,
default
:
()
=>
[]
},
links
:
{
default
:
()
=>
[]
},
labelShow
:
{
type
:
Boolean
as
PropType
<
boolean
>
,
default
:
true
...
...
@@ -117,7 +120,7 @@ const GraphChart = defineComponent({
draggable
:
true
,
force
:
{
repulsion
:
300
,
edgeLength
:
1
00
edgeLength
:
2
00
},
symbol
:
'
roundRect
'
,
symbolSize
:
70
,
...
...
@@ -136,6 +139,11 @@ const GraphChart = defineComponent({
return
newStr
.
length
>
60
?
newStr
.
slice
(
0
,
60
)
+
'
...
'
:
newStr
}
},
edgeSymbol
:
[
'
circle
'
,
'
arrow
'
],
edgeSymbolSize
:
[
4
,
10
],
edgeLabel
:
{
fontSize
:
20
},
data
:
props
.
seriesData
.
map
((
item
)
=>
{
const
category
=
getCategory
(
Number
(
item
.
schedulePublishStatus
),
...
...
@@ -175,6 +183,14 @@ const GraphChart = defineComponent({
itemStyle
}
}),
links
:
props
.
links
,
lineStyle
:
{
opacity
:
0.9
,
width
:
2
,
curveness
:
0
},
nodeScaleRatio
:
0
,
zoom
:
1
,
categories
:
legendData
}
]
...
...
dolphinscheduler-ui/src/views/projects/workflow/relation/index.tsx
浏览文件 @
de3d9423
...
...
@@ -79,6 +79,7 @@ const workflowRelation = defineComponent({
<
Graph
seriesData
=
{
this
.
seriesData
}
labelShow
=
{
this
.
labelShow
}
links
=
{
this
.
links
}
/>
),
'
header-extra
'
:
()
=>
(
...
...
dolphinscheduler-ui/src/views/projects/workflow/relation/use-relation.ts
浏览文件 @
de3d9423
...
...
@@ -32,19 +32,28 @@ export function useRelation() {
workflowOptions
:
[],
workflow
:
ref
(
null
),
seriesData
:
[],
labelShow
:
ref
(
true
)
labelShow
:
ref
(
true
),
links
:
[]
})
const
formatWorkflow
=
(
obj
:
Array
<
WorkFlowListRes
>
)
=>
{
const
formatWorkflow
=
(
obj
:
WorkflowRes
)
=>
{
variables
.
seriesData
=
[]
variables
.
links
=
[]
variables
.
seriesData
=
obj
.
map
((
item
)
=>
{
variables
.
seriesData
=
obj
.
workFlowList
.
map
((
item
)
=>
{
return
{
name
:
item
.
workFlowName
,
id
:
item
.
workFlowCode
,
...
item
}
})
as
any
variables
.
links
=
obj
.
workFlowRelationList
.
map
((
item
)
=>
{
return
{
source
:
String
(
item
.
sourceWorkFlowCode
),
target
:
String
(
item
.
targetWorkFlowCode
)
}
})
as
any
}
const
getWorkflowName
=
(
projectCode
:
number
)
=>
{
...
...
@@ -71,7 +80,7 @@ export function useRelation() {
{
workFlowCode
:
workflowCode
},
{
projectCode
}
).
then
((
res
:
WorkflowRes
)
=>
{
formatWorkflow
(
res
.
workFlowList
)
formatWorkflow
(
res
)
}),
{}
)
...
...
@@ -84,7 +93,7 @@ export function useRelation() {
queryWorkFlowList
({
projectCode
}).
then
((
res
:
WorkflowRes
)
=>
{
formatWorkflow
(
res
.
workFlowList
)
formatWorkflow
(
res
)
}),
{}
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录