Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yanghaoyuan.sh
DolphinScheduler
提交
257b76cc
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,体验更适合开发者的 AI 搜索 >>
提交
257b76cc
编写于
10月 20, 2021
作者:
W
wangyizhi
提交者:
lenboo
10月 21, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix switch node cannot get branch flow (#6565)
上级
986f8138
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
15 addition
and
8 deletion
+15
-8
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/switch.vue
...js/conf/home/pages/dag/_source/formModel/tasks/switch.vue
+5
-5
未找到文件。
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
浏览文件 @
257b76cc
...
...
@@ -383,6 +383,7 @@
@
on-switch-result=
"_onSwitchResult"
:backfill-item=
"backfillItem"
:nodeData=
"nodeData"
:postTasks=
"postTasks"
></m-switch>
<!-- waterdrop node -->
<m-waterdrop
...
...
@@ -517,7 +518,7 @@
label
:
`
${
i18n
.
$t
(
'
Failed
'
)}
`
}
],
// for CONDITIONS
// for CONDITIONS
and SWITCH
postTasks
:
[],
prevTasks
:
[],
// refresh part of the formModel, after set backfillItem outside
...
...
@@ -550,6 +551,7 @@
return
{
code
:
task
.
code
,
conditionResult
:
task
.
taskParams
.
conditionResult
,
switchResult
:
task
.
taskParams
.
switchResult
,
delayTime
:
task
.
delayTime
,
dependence
:
task
.
taskParams
.
dependence
,
desc
:
task
.
description
,
...
...
@@ -559,7 +561,8 @@
params
:
_
.
omit
(
task
.
taskParams
,
[
'
conditionResult
'
,
'
dependence
'
,
'
waitStartTimeout
'
'
waitStartTimeout
'
,
'
switchResult
'
]),
retryInterval
:
task
.
failRetryInterval
,
runFlag
:
task
.
flag
,
...
...
@@ -770,7 +773,8 @@
...
this
.
params
,
dependence
:
this
.
cacheDependence
,
conditionResult
:
this
.
conditionResult
,
waitStartTimeout
:
this
.
waitStartTimeout
waitStartTimeout
:
this
.
waitStartTimeout
,
switchResult
:
this
.
switchResult
},
flag
:
this
.
runFlag
,
taskPriority
:
this
.
taskInstancePriority
,
...
...
@@ -868,6 +872,9 @@
this
.
successBranch
=
o
.
conditionResult
.
successNode
[
0
]
this
.
failedBranch
=
o
.
conditionResult
.
failedNode
[
0
]
}
if
(
o
.
switchResult
)
{
this
.
switchResult
=
o
.
switchResult
}
// If the workergroup has been deleted, set the default workergroup
for
(
let
i
=
0
;
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/switch.vue
浏览文件 @
257b76cc
...
...
@@ -34,8 +34,8 @@
</textarea>
</label>
<span
class=
"text-b"
style=
"padding-left: 0"
>
{{
$t
(
'
Branch flow
'
)
}}
</span>
<el-select
style=
"width: 157px;"
size=
"small"
v-model=
"el.nextNode"
clearable
>
<el-option
v-for=
"item in
nodeData.rearList"
:key=
"item.value"
:value=
"item.value"
:label=
"item.label
"
></el-option>
<el-select
style=
"width: 157px;"
size=
"small"
v-model=
"el.nextNode"
clearable
:disabled=
"isDetails"
>
<el-option
v-for=
"item in
postTasks"
:key=
"item.code"
:value=
"item.name"
:label=
"item.name
"
></el-option>
</el-select>
<span
class=
"operation"
>
<a
href=
"javascript:"
class=
"delete"
@
click=
"!isDetails && _removeDep(index)"
v-if=
"index === (dependItemList.length - 1)"
>
...
...
@@ -53,7 +53,7 @@
<div
slot=
"text"
>
{{
$t
(
'
Branch flow
'
)
}}
</div>
<div
slot=
"content"
>
<el-select
style=
"width: 157px;"
size=
"small"
v-model=
"nextNode"
clearable
:disabled=
"isDetails"
>
<el-option
v-for=
"item in
nodeData.rearList"
:key=
"item.value"
:value=
"item.value"
:label=
"item.label
"
></el-option>
<el-option
v-for=
"item in
postTasks"
:key=
"item.code"
:value=
"item.name"
:label=
"item.name
"
></el-option>
</el-select>
</div>
</m-list-box>
...
...
@@ -82,7 +82,7 @@
props
:
{
nodeData
:
Object
,
backfillItem
:
Object
,
rearList
:
Array
postTasks
:
Array
},
methods
:
{
editList
(
index
)
{
...
...
@@ -90,7 +90,7 @@
const
self
=
this
const
editor
=
codemirror
(
`code-switch-mirror
${
index
}
`
,
{
mode
:
'
shell
'
,
readOnly
:
this
.
is
Instance
readOnly
:
this
.
is
Details
},
this
)
editor
.
on
(
'
change
'
,
function
()
{
const
outputList
=
_
.
cloneDeep
(
self
.
dependItemList
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录