Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
e93a08ef
DolphinScheduler
项目概览
apache
/
DolphinScheduler
上一次同步 1 年多
通知
704
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,体验更适合开发者的 AI 搜索 >>
提交
e93a08ef
编写于
11月 07, 2021
作者:
W
wangyizhi
提交者:
lenboo
11月 08, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Replace taskName with taskCode (#6719)
上级
f375be7a
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
41 addition
and
30 deletion
+41
-30
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
...rc/js/conf/home/pages/dag/_source/formModel/formModel.vue
+5
-6
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
...es/dag/_source/formModel/tasks/_source/dependItemList.vue
+28
-16
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/nodeStatus.vue
.../pages/dag/_source/formModel/tasks/_source/nodeStatus.vue
+4
-4
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/conditions.vue
...onf/home/pages/dag/_source/formModel/tasks/conditions.vue
+1
-1
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue
...conf/home/pages/dag/_source/formModel/tasks/dependent.vue
+1
-1
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/switch.vue
...js/conf/home/pages/dag/_source/formModel/tasks/switch.vue
+2
-2
未找到文件。
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
浏览文件 @
e93a08ef
...
...
@@ -193,7 +193,7 @@
<el-option
v-for=
"item in postTasks"
:key=
"item.code"
:value=
"item.
nam
e"
:value=
"item.
cod
e"
:label=
"item.name"
></el-option>
</el-select>
...
...
@@ -230,7 +230,7 @@
<el-option
v-for=
"item in postTasks"
:key=
"item.code"
:value=
"item.
nam
e"
:value=
"item.
cod
e"
:label=
"item.name"
></el-option>
</el-select>
...
...
@@ -694,8 +694,7 @@
return
false
}
if
(
this
.
successBranch
!==
''
&&
this
.
successBranch
!==
null
&&
this
.
successBranch
&&
this
.
successBranch
===
this
.
failedBranch
)
{
this
.
$message
.
warning
(
...
...
@@ -754,8 +753,8 @@
if
(
this
.
$refs
.
preTasks
)
{
this
.
$refs
.
preTasks
.
setPreNodes
()
}
this
.
conditionResult
.
successNode
[
0
]
=
this
.
successBranch
this
.
conditionResult
.
failedNode
[
0
]
=
this
.
failedBranch
this
.
successBranch
&&
(
this
.
conditionResult
.
successNode
[
0
]
=
this
.
successBranch
)
this
.
failedBranch
&&
(
this
.
conditionResult
.
failedNode
[
0
]
=
this
.
failedBranch
)
this
.
$emit
(
'
addTaskInfo
'
,
{
item
:
{
code
:
this
.
nodeData
.
id
,
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
浏览文件 @
e93a08ef
...
...
@@ -23,8 +23,8 @@
<el-select
filterable
:disabled=
"isDetails"
style=
"width: 450px"
v-model=
"el.definitionCode"
@
change=
"v => _onChangeDefinitionCode(v, $index)"
size=
"small"
>
<el-option
v-for=
"item in el.definitionList"
:key=
"item.value"
:value=
"item.value"
:label=
"item.label"
></el-option>
</el-select>
<el-select
filterable
:disabled=
"isDetails"
style=
"width: 450px"
v-model=
"el.depTask
s
"
size=
"small"
>
<el-option
v-for=
"item in el.depTasksList || []"
:key=
"item
"
:value=
"item"
:label=
"item
"
></el-option>
<el-select
filterable
:disabled=
"isDetails"
style=
"width: 450px"
v-model=
"el.depTask
Code
"
size=
"small"
>
<el-option
v-for=
"item in el.depTasksList || []"
:key=
"item
.code"
:value=
"item.code"
:label=
"item.name
"
></el-option>
</el-select>
<el-select
v-model=
"el.cycle"
:disabled=
"isDetails"
@
change=
"v => _onChangeCycle(v, $index)"
size=
"small"
>
<el-option
v-for=
"item in cycleList"
:key=
"item.value"
:value=
"item.value"
:label=
"item.label"
></el-option>
...
...
@@ -55,6 +55,13 @@
import
_
from
'
lodash
'
import
{
cycleList
,
dateValueList
}
from
'
./commcon
'
import
disabledState
from
'
@/module/mixin/disabledState
'
// Depend on all tasks
const
DEP_ALL_TASK
=
{
code
:
0
,
name
:
'
ALL
'
}
export
default
{
name
:
'
dep-list
'
,
data
()
{
...
...
@@ -87,7 +94,7 @@
let
projectCode
=
this
.
projectList
[
0
].
value
this
.
_getProcessByProjectCode
(
projectCode
).
then
(
definitionList
=>
{
if
(
!
definitionList
||
definitionList
.
length
===
0
)
{
this
.
$emit
(
'
dependItemListEvent
'
,
_
.
concat
(
this
.
dependItemList
,
this
.
_rtNewParams
(
''
,
[],
[
'
ALL
'
],
projectCode
)))
this
.
$emit
(
'
dependItemListEvent
'
,
_
.
concat
(
this
.
dependItemList
,
this
.
_rtNewParams
(
''
,
[],
[
_
.
cloneDeep
(
DEP_ALL_TASK
)
],
projectCode
)))
return
}
// dependItemList index
...
...
@@ -148,7 +155,12 @@
return
new
Promise
((
resolve
,
reject
)
=>
{
if
(
is
)
{
this
.
store
.
dispatch
(
'
dag/getProcessTasksList
'
,
{
code
:
codes
}).
then
(
res
=>
{
resolve
([
'
ALL
'
].
concat
(
_
.
map
(
res
,
v
=>
v
.
name
)))
resolve
([{
...
DEP_ALL_TASK
}].
concat
(
_
.
map
(
res
,
v
=>
{
return
{
code
:
v
.
code
,
name
:
v
.
name
}
})))
})
}
else
{
this
.
store
.
dispatch
(
'
dag/getTaskListDefIdAll
'
,
{
codes
:
codes
}).
then
(
res
=>
{
...
...
@@ -163,11 +175,11 @@
_onChangeProjectCode
(
value
,
itemIndex
)
{
this
.
_getProcessByProjectCode
(
value
).
then
(
definitionList
=>
{
if
(
!
definitionList
||
definitionList
.
length
===
0
)
{
this
.
$set
(
this
.
dependItemList
,
itemIndex
,
this
.
_cpOldParams
(
value
,
''
,
[],
[
'
ALL
'
],
{
this
.
$set
(
this
.
dependItemList
,
itemIndex
,
this
.
_cpOldParams
(
value
,
''
,
[],
[
_
.
cloneDeep
(
DEP_ALL_TASK
)
],
{
cycle
:
'
day
'
,
dateValue
:
'
today
'
,
state
:
''
,
depTask
s
:
'
ALL
'
depTask
Code
:
DEP_ALL_TASK
.
code
}))
return
}
...
...
@@ -175,8 +187,8 @@
let
definitionCode
=
definitionList
[
0
].
value
this
.
_getDependItemList
(
definitionCode
).
then
(
depTasksList
=>
{
let
item
=
this
.
dependItemList
[
itemIndex
]
// init set depTask
s
All
item
.
depTask
s
=
'
ALL
'
// init set depTask
Code
All
item
.
depTask
Code
=
DEP_ALL_TASK
.
code
// set dependItemList item data
this
.
$set
(
this
.
dependItemList
,
itemIndex
,
this
.
_cpOldParams
(
value
,
definitionCode
,
definitionList
,
depTasksList
,
item
))
})
...
...
@@ -186,8 +198,8 @@
// get depItem list data
this
.
_getDependItemList
(
value
).
then
(
depTasksList
=>
{
let
item
=
this
.
dependItemList
[
itemIndex
]
// init set depTask
s
All
item
.
depTask
s
=
'
ALL
'
// init set depTask
Code
All
item
.
depTask
Code
=
DEP_ALL_TASK
.
code
// set dependItemList item data
this
.
$set
(
this
.
dependItemList
,
itemIndex
,
this
.
_rtOldParams
(
value
,
item
.
definitionList
,
depTasksList
,
item
))
})
...
...
@@ -203,7 +215,7 @@
definitionCode
:
value
,
// dependItem need private definitionList
definitionList
:
definitionList
,
depTask
s
:
'
ALL
'
,
depTask
Code
:
DEP_ALL_TASK
.
code
,
depTasksList
:
depTasksList
,
cycle
:
'
day
'
,
dateValue
:
'
today
'
,
...
...
@@ -217,7 +229,7 @@
definitionCode
:
value
,
// dependItem need private definitionList
definitionList
:
definitionList
,
depTask
s
:
item
.
depTasks
||
'
ALL
'
,
depTask
Code
:
item
.
depTaskCode
||
DEP_ALL_TASK
.
code
,
depTasksList
:
depTasksList
,
cycle
:
item
.
cycle
,
dateValue
:
item
.
dateValue
,
...
...
@@ -231,7 +243,7 @@
projectCode
:
value
,
definitionList
:
definitionList
,
definitionCode
:
definitionCode
,
depTask
s
:
item
.
depTasks
||
'
ALL
'
,
depTask
Code
:
item
.
depTaskCode
||
DEP_ALL_TASK
.
code
,
depTasksList
:
depTasksList
,
cycle
:
item
.
cycle
,
dateValue
:
item
.
dateValue
,
...
...
@@ -262,10 +274,10 @@
if
(
definitionList
&&
definitionList
.
length
>
0
)
{
let
definitionCode
=
definitionList
[
0
].
value
this
.
_getDependItemList
(
definitionCode
).
then
(
depTasksList
=>
{
this
.
$emit
(
'
dependItemListEvent
'
,
_
.
concat
(
this
.
dependItemList
,
this
.
_rtNewParams
(
definitionCode
,
definitionList
,
depTasksList
||
[
'
ALL
'
],
projectCode
)))
this
.
$emit
(
'
dependItemListEvent
'
,
_
.
concat
(
this
.
dependItemList
,
this
.
_rtNewParams
(
definitionCode
,
definitionList
,
depTasksList
||
[
_
.
cloneDeep
(
DEP_ALL_TASK
)
],
projectCode
)))
})
}
else
{
this
.
$emit
(
'
dependItemListEvent
'
,
_
.
concat
(
this
.
dependItemList
,
this
.
_rtNewParams
(
''
,
[],
[
'
ALL
'
],
projectCode
)))
this
.
$emit
(
'
dependItemListEvent
'
,
_
.
concat
(
this
.
dependItemList
,
this
.
_rtNewParams
(
''
,
[],
[
_
.
cloneDeep
(
DEP_ALL_TASK
)
],
projectCode
)))
}
})
}
else
{
...
...
@@ -275,7 +287,7 @@
this
.
_getDependItemList
(
codes
,
false
).
then
(
res
=>
{
_
.
map
(
this
.
dependItemList
,
(
v
,
i
)
=>
{
this
.
_getProcessByProjectCode
(
v
.
projectCode
).
then
(
definitionList
=>
{
this
.
$set
(
this
.
dependItemList
,
i
,
this
.
_rtOldParams
(
v
.
definitionCode
,
definitionList
,
[
'
ALL
'
].
concat
(
_
.
map
(
res
[
v
.
definitionCode
]
||
[],
v
=>
v
.
name
)),
v
))
this
.
$set
(
this
.
dependItemList
,
i
,
this
.
_rtOldParams
(
v
.
definitionCode
,
definitionList
,
[
_
.
cloneDeep
(
DEP_ALL_TASK
)].
concat
(
_
.
map
(
res
[
v
.
definitionCode
]
||
[],
v
=>
({
code
:
v
.
code
,
name
:
v
.
name
})
)),
v
))
})
})
})
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/nodeStatus.vue
浏览文件 @
e93a08ef
...
...
@@ -17,8 +17,8 @@
<
template
>
<div
class=
"dep-list-model"
>
<div
v-for=
"(el,$index) in dependItemList"
:key=
'$index'
class=
"list"
@
click=
"itemIndex = $index"
>
<el-select
style=
"width: 150px;"
size=
"small"
v-model=
"el.depTasks
"
:disabled=
"isDetails"
>
<el-option
v-for=
"item in prevTasks"
:key=
"item.code"
:value=
"item.
nam
e"
:label=
"item.name"
>
<el-select
style=
"width: 150px;"
size=
"small"
:value=
"el.depTaskCode || ''"
@
change=
"(val) =>
{ el.depTaskCode = val }
" :disabled="isDetails">
<el-option
v-for=
"item in prevTasks"
:key=
"item.code"
:value=
"item.
cod
e"
:label=
"item.name"
>
</el-option>
</el-select>
<el-select
style=
"width: 116px;"
size=
"small"
v-model=
"el.status"
:disabled=
"isDetails"
>
...
...
@@ -134,13 +134,13 @@
},
_rtNewParams
()
{
return
{
depTask
s
:
''
,
depTask
Code
:
0
,
status
:
''
}
},
_rtOldParams
(
value
,
depTasksList
,
item
)
{
return
{
depTask
s
:
''
,
depTask
Code
:
0
,
status
:
''
}
},
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/conditions.vue
浏览文件 @
e93a08ef
...
...
@@ -147,7 +147,7 @@
// Process instance return status display matches by key
_
.
map
(
this
.
dependTaskList
,
v
=>
_
.
map
(
v
.
dependItemList
,
v1
=>
{
$
(
`#
${
o
.
id
}
`
).
siblings
().
each
(
function
()
{
if
(
v1
.
depTask
s
===
$
(
this
).
text
())
{
if
(
v1
.
depTask
Code
===
$
(
this
).
text
())
{
v1
.
state
=
$
(
this
).
attr
(
'
data-dependent-depstate
'
)
}
})
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue
浏览文件 @
e93a08ef
...
...
@@ -148,7 +148,7 @@
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
.
depTask
s
}
-
${
v1
.
cycle
}
-
${
v1
.
dateValue
}
`
]
||
defaultState
v1
.
state
=
dependentResult
[
`
${
v1
.
definitionId
}
-
${
v1
.
depTask
Code
}
-
${
v1
.
cycle
}
-
${
v1
.
dateValue
}
`
]
||
defaultState
}))
}
},
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/switch.vue
浏览文件 @
e93a08ef
...
...
@@ -35,7 +35,7 @@
</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
:disabled=
"isDetails"
>
<el-option
v-for=
"item in postTasks"
:key=
"item.code"
:value=
"item.
nam
e"
:label=
"item.name"
></el-option>
<el-option
v-for=
"item in postTasks"
:key=
"item.code"
:value=
"item.
cod
e"
: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 postTasks"
:key=
"item.code"
:value=
"item.
nam
e"
:label=
"item.name"
></el-option>
<el-option
v-for=
"item in postTasks"
:key=
"item.code"
:value=
"item.
cod
e"
:label=
"item.name"
></el-option>
</el-select>
</div>
</m-list-box>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录