Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_44739061
DolphinScheduler
提交
4387c8a3
DolphinScheduler
项目概览
weixin_44739061
/
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,发现更多精彩内容 >>
提交
4387c8a3
编写于
8月 27, 2020
作者:
Y
Yichao Yang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Fix][ui] Fix version control release process definition editable
上级
58880955
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
11 deletion
+27
-11
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/projects/pages/definition/pages/list/_source/versions.vue
...projects/pages/definition/pages/list/_source/versions.vue
+25
-10
未找到文件。
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
浏览文件 @
4387c8a3
...
@@ -790,7 +790,8 @@
...
@@ -790,7 +790,8 @@
props
:
{
props
:
{
processDefinition
:
{
processDefinition
:
{
id
:
self
.
urlParam
.
id
,
id
:
self
.
urlParam
.
id
,
version
:
self
.
$store
.
state
.
dag
.
version
version
:
self
.
$store
.
state
.
dag
.
version
,
state
:
self
.
releaseState
},
},
processDefinitionVersions
:
processDefinitionVersions
,
processDefinitionVersions
:
processDefinitionVersions
,
total
:
total
,
total
:
total
,
...
...
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/versions.vue
浏览文件 @
4387c8a3
...
@@ -67,8 +67,12 @@
...
@@ -67,8 +67,12 @@
width=
"90"
>
width=
"90"
>
<p>
{{
$t
(
'
Confirm Switch To This Version?
'
)
}}
</p>
<p>
{{
$t
(
'
Confirm Switch To This Version?
'
)
}}
</p>
<div
style=
"text-align: right; margin: 0;padding-top: 4px;"
>
<div
style=
"text-align: right; margin: 0;padding-top: 4px;"
>
<x-button
type=
"text"
size=
"xsmall"
shape=
"circle"
@
click=
"_closeSwitchVersion($index)"
>
{{
$t
(
'
Cancel
'
)
}}
</x-button>
<x-button
type=
"text"
size=
"xsmall"
shape=
"circle"
@
click=
"_closeSwitchVersion($index)"
>
<x-button
type=
"primary"
size=
"xsmall"
shape=
"circle"
@
click=
"_mVersionSwitchProcessDefinitionVersion(item)"
>
{{
$t
(
'
Confirm
'
)
}}
</x-button>
{{
$t
(
'
Cancel
'
)
}}
</x-button>
<x-button
type=
"primary"
size=
"xsmall"
shape=
"circle"
@
click=
"_mVersionSwitchProcessDefinitionVersion(item)"
>
{{
$t
(
'
Confirm
'
)
}}
</x-button>
</div>
</div>
<template
slot=
"reference"
>
<template
slot=
"reference"
>
<x-button
<x-button
...
@@ -76,7 +80,7 @@
...
@@ -76,7 +80,7 @@
type=
"primary"
type=
"primary"
shape=
"circle"
shape=
"circle"
size=
"xsmall"
size=
"xsmall"
:disabled=
"item.version === processDefinition.version"
:disabled=
"item.version === processDefinition.version
|| 'ONLINE' === processDefinition.state
"
data-toggle=
"tooltip"
data-toggle=
"tooltip"
:title=
"$t('Switch To This Version')"
>
:title=
"$t('Switch To This Version')"
>
</x-button>
</x-button>
...
@@ -88,8 +92,11 @@
...
@@ -88,8 +92,11 @@
width=
"90"
>
width=
"90"
>
<p>
{{$t('Delete?')}}
</p>
<p>
{{$t('Delete?')}}
</p>
<div
style=
"text-align: right; margin: 0;padding-top: 4px;"
>
<div
style=
"text-align: right; margin: 0;padding-top: 4px;"
>
<x-button
type=
"text"
size=
"xsmall"
shape=
"circle"
@
click=
"_closeDelete($index)"
>
{{$t('Cancel')}}
</x-button>
<x-button
type=
"text"
size=
"xsmall"
shape=
"circle"
@
click=
"_closeDelete($index)"
>
{{$t('Cancel')}}
<x-button
type=
"primary"
size=
"xsmall"
shape=
"circle"
@
click=
"_mVersionDeleteProcessDefinitionVersion(item,$index)"
>
{{$t('Confirm')}}
</x-button>
</x-button>
<x-button
type=
"primary"
size=
"xsmall"
shape=
"circle"
@
click=
"_mVersionDeleteProcessDefinitionVersion(item,$index)"
>
{{$t('Confirm')}}
</x-button>
</div>
</div>
<
template
slot=
"reference"
>
<
template
slot=
"reference"
>
<x-button
<x-button
...
@@ -97,7 +104,7 @@
...
@@ -97,7 +104,7 @@
type=
"error"
type=
"error"
shape=
"circle"
shape=
"circle"
size=
"xsmall"
size=
"xsmall"
:disabled=
"item.version === processDefinition.version"
:disabled=
"item.version === processDefinition.version
|| 'ONLINE' === processDefinition.state
"
data-toggle=
"tooltip"
data-toggle=
"tooltip"
:title=
"$t('delete')"
>
:title=
"$t('delete')"
>
</x-button>
</x-button>
...
@@ -114,8 +121,9 @@
...
@@ -114,8 +121,9 @@
<div
v-if=
"processDefinitionVersions.length > 0"
>
<div
v-if=
"processDefinitionVersions.length > 0"
>
<div
class=
"bottom-box"
>
<div
class=
"bottom-box"
>
<x-button
type=
"text"
@
click=
"_close()"
>
{{$t('Cancel')}}
</x-button>
<x-button
type=
"text"
@
click=
"_close()"
>
{{$t('Cancel')}}
</x-button>
<x-page
:current=
"pageNo"
:total=
"total"
@
on-change=
"_mVersionGetProcessDefinitionVersionsPage"
small
>
<!---->
</x-page>
<x-page
:current=
"pageNo"
:total=
"total"
@
on-change=
"_mVersionGetProcessDefinitionVersionsPage"
small
>
<!---->
</x-page>
</div>
</div>
</div>
</div>
...
@@ -211,8 +219,10 @@
...
@@ -211,8 +219,10 @@
})
})
}
}
},
},
created
()
{},
created
()
{
mounted
()
{},
},
mounted
()
{
},
components
:
{
mNoData
}
components
:
{
mNoData
}
}
}
</
script
>
</
script
>
...
@@ -221,10 +231,12 @@
...
@@ -221,10 +231,12 @@
.container
{
.container
{
width
:
500px
;
width
:
500px
;
position
:
relative
;
position
:
relative
;
.title-box
{
.title-box
{
height
:
61px
;
height
:
61px
;
border-bottom
:
1px
solid
#DCDEDC
;
border-bottom
:
1px
solid
#DCDEDC
;
position
:
relative
;
position
:
relative
;
.name
{
.name
{
position
:
absolute
;
position
:
absolute
;
left
:
24px
;
left
:
24px
;
...
@@ -232,6 +244,7 @@
...
@@ -232,6 +244,7 @@
font-size
:
16px
;
font-size
:
16px
;
}
}
}
}
.bottom-box
{
.bottom-box
{
position
:
absolute
;
position
:
absolute
;
bottom
:
0
;
bottom
:
0
;
...
@@ -242,10 +255,12 @@
...
@@ -242,10 +255,12 @@
line-height
:
60px
;
line-height
:
60px
;
border-top
:
1px
solid
#DCDEDC
;
border-top
:
1px
solid
#DCDEDC
;
background
:
#fff
;
background
:
#fff
;
.ans-page
{
.ans-page
{
display
:
inline-block
;
display
:
inline-block
;
}
}
}
}
.table-box
{
.table-box
{
overflow-y
:
scroll
;
overflow-y
:
scroll
;
height
:
calc
(
100vh
-
61px
);
height
:
calc
(
100vh
-
61px
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录