Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
pentaLiker
DolphinScheduler
提交
54fc458e
DolphinScheduler
项目概览
pentaLiker
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
1
Star
1
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,发现更多精彩内容 >>
未验证
提交
54fc458e
编写于
3月 01, 2021
作者:
S
Shiwen Cheng
提交者:
GitHub
3月 01, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Fix-4908][UI] Fix dependent task item cannot delete and select (#4909)
上级
a25c3974
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
19 addition
and
18 deletion
+19
-18
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
...es/dag/_source/formModel/tasks/_source/dependItemList.vue
+17
-17
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/nodeStatus.vue
.../pages/dag/_source/formModel/tasks/_source/nodeStatus.vue
+2
-0
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/conditions.vue
...onf/home/pages/dag/_source/formModel/tasks/conditions.vue
+0
-1
未找到文件。
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
浏览文件 @
54fc458e
...
...
@@ -16,17 +16,17 @@
*/
<
template
>
<div
class=
"dep-list-model"
>
<div
v-for=
"(el,$index) in dependItemList"
:key=
'$index'
@
click=
"itemIndex = $index"
>
<el-select
filterable
:disabled=
"isDetails"
style=
"width: 450px"
v-model=
"el.projectId"
@
change=
"
_onChangeProjectId
"
size=
"small"
>
<div
v-for=
"(el,$index) in dependItemList"
:key=
'$index'
>
<el-select
filterable
:disabled=
"isDetails"
style=
"width: 450px"
v-model=
"el.projectId"
@
change=
"
v => _onChangeProjectId(v, $index)
"
size=
"small"
>
<el-option
v-for=
"item in projectList"
:key=
"item.value"
:value=
"item.value"
:label=
"item.label"
></el-option>
</el-select>
<el-select
filterable
:disabled=
"isDetails"
style=
"width: 450px"
v-model=
"el.definitionId"
@
change=
"
_onChangeDefinitionId
"
size=
"small"
>
<el-select
filterable
:disabled=
"isDetails"
style=
"width: 450px"
v-model=
"el.definitionId"
@
change=
"
v => _onChangeDefinitionId(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.depTasks"
size=
"small"
>
<el-option
v-for=
"item in el.depTasksList || []"
:key=
"item"
:value=
"item"
:label=
"item"
></el-option>
</el-select>
<el-select
v-model=
"el.cycle"
:disabled=
"isDetails"
@
change=
"
_onChangeCycle
"
size=
"small"
>
<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>
</el-select>
<el-select
v-model=
"el.dateValue"
:disabled=
"isDetails"
size=
"small"
>
...
...
@@ -62,8 +62,7 @@
list
:
[],
projectList
:
[],
cycleList
:
cycleList
,
isInstance
:
false
,
itemIndex
:
null
isInstance
:
false
}
},
mixins
:
[
disabledState
],
...
...
@@ -105,7 +104,8 @@
* remove task
*/
_remove
(
i
)
{
// this.dependTaskList[this.index].dependItemList.splice(i, 1)
// eslint-disable-next-line
this
.
dependTaskList
[
this
.
index
].
dependItemList
.
splice
(
i
,
1
)
this
.
_removeTip
()
if
(
!
this
.
dependItemList
.
length
||
this
.
dependItemList
.
length
===
0
)
{
this
.
$emit
(
'
on-delete-all
'
,
{
...
...
@@ -170,33 +170,33 @@
/**
* change process get dependItemList
*/
_onChangeProjectId
(
value
)
{
_onChangeProjectId
(
value
,
itemIndex
)
{
this
.
_getProcessByProjectId
(
value
).
then
(
definitionList
=>
{
/* this.$set(this.dependItemList,
this.
itemIndex, this._dlOldParams(value, definitionList, item)) */
/* this.$set(this.dependItemList, itemIndex, this._dlOldParams(value, definitionList, item)) */
let
definitionId
=
definitionList
[
0
].
value
this
.
_getDependItemList
(
definitionId
).
then
(
depTasksList
=>
{
let
item
=
this
.
dependItemList
[
this
.
itemIndex
]
let
item
=
this
.
dependItemList
[
itemIndex
]
// init set depTasks All
item
.
depTasks
=
'
ALL
'
// set dependItemList item data
this
.
$set
(
this
.
dependItemList
,
this
.
itemIndex
,
this
.
_cpOldParams
(
value
,
definitionId
,
definitionList
,
depTasksList
,
item
))
this
.
$set
(
this
.
dependItemList
,
itemIndex
,
this
.
_cpOldParams
(
value
,
definitionId
,
definitionList
,
depTasksList
,
item
))
})
})
},
_onChangeDefinitionId
(
value
)
{
_onChangeDefinitionId
(
value
,
itemIndex
)
{
// get depItem list data
this
.
_getDependItemList
(
value
).
then
(
depTasksList
=>
{
let
item
=
this
.
dependItemList
[
this
.
itemIndex
]
let
item
=
this
.
dependItemList
[
itemIndex
]
// init set depTasks All
item
.
depTasks
=
'
ALL
'
// set dependItemList item data
this
.
$set
(
this
.
dependItemList
,
this
.
itemIndex
,
this
.
_rtOldParams
(
value
,
item
.
definitionList
,
depTasksList
,
item
))
this
.
$set
(
this
.
dependItemList
,
itemIndex
,
this
.
_rtOldParams
(
value
,
item
.
definitionList
,
depTasksList
,
item
))
})
},
_onChangeCycle
(
value
)
{
_onChangeCycle
(
value
,
itemIndex
)
{
let
list
=
_
.
cloneDeep
(
dateValueList
[
value
])
this
.
$set
(
this
.
dependItemList
[
this
.
itemIndex
],
'
dateValue
'
,
list
[
0
].
value
)
this
.
$set
(
this
.
dependItemList
[
this
.
itemIndex
],
'
dateValueList
'
,
list
)
this
.
$set
(
this
.
dependItemList
[
itemIndex
],
'
dateValue
'
,
list
[
0
].
value
)
this
.
$set
(
this
.
dependItemList
[
itemIndex
],
'
dateValueList
'
,
list
)
},
_rtNewParams
(
value
,
definitionList
,
depTasksList
,
projectId
)
{
return
{
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/nodeStatus.vue
浏览文件 @
54fc458e
...
...
@@ -87,6 +87,8 @@
* remove task
*/
_remove
(
i
)
{
// eslint-disable-next-line
this
.
dependTaskList
[
this
.
index
].
dependItemList
.
splice
(
i
,
1
)
this
.
_removeTip
()
if
(
!
this
.
dependItemList
.
length
||
this
.
dependItemList
.
length
===
0
)
{
this
.
$emit
(
'
on-delete-all
'
,
{
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/conditions.vue
浏览文件 @
54fc458e
...
...
@@ -99,7 +99,6 @@
$
(
'
body
'
).
find
(
'
.tooltip.fade.top.in
'
).
remove
()
},
_onDeleteAll
(
i
)
{
this
.
dependTaskList
[
this
.
index
].
dependItemList
.
splice
(
i
,
1
)
this
.
dependTaskList
.
map
((
item
,
i
)
=>
{
if
(
item
.
dependItemList
.
length
===
0
)
{
this
.
dependTaskList
.
splice
(
i
,
1
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录