Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_44739061
DolphinScheduler
提交
d10d10e9
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,发现更多精彩内容 >>
未验证
提交
d10d10e9
编写于
5月 25, 2019
作者:
millionfor
提交者:
GitHub
5月 25, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #360 from millionfor/branch-1.0.2
Branch 1.0.2
上级
98130014
c663f58c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
56 addition
and
7 deletion
+56
-7
escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
...ges/projects/pages/definition/pages/list/_source/list.vue
+30
-5
escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
...pages/projects/pages/instance/pages/list/_source/list.vue
+26
-2
未找到文件。
escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
浏览文件 @
d10d10e9
...
...
@@ -61,8 +61,8 @@
<x-button
type=
"info"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('Edit')"
@
click=
"_edit(item)"
:disabled=
"item.releaseState === 'ONLINE'"
v-ps=
"['GENERAL_USER']"
icon=
"iconfont icon-bianji"
>
<!--
{{
$t
(
'
编辑
'
)
}}
-->
</x-button>
<x-button
type=
"success"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('Start')"
@
click=
"_start(item)"
:disabled=
"item.releaseState !== 'ONLINE'"
v-ps=
"['GENERAL_USER']"
icon=
"iconfont icon-qidong"
>
<!--
{{
$t
(
'
启动
'
)
}}
-->
</x-button>
<x-button
type=
"info"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('Timing')"
@
click=
"_timing(item)"
:disabled=
"item.releaseState !== 'ONLINE' || item.scheduleReleaseState !== null"
v-ps=
"['GENERAL_USER']"
icon=
"iconfont icon-timer"
>
<!--
{{
$t
(
'
定时
'
)
}}
-->
</x-button>
<x-button
type=
"
error"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('offline')"
@
click=
"_downline(item)"
v-if=
"item.releaseState === 'ONLINE'"
v-ps=
"['GENERAL_USER']"
icon=
"iconfont icon-erji-xiaxianjilu
"
>
<!--
{{
$t
(
'
下线
'
)
}}
-->
</x-button>
<x-button
type=
"
warning"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('online')"
@
click=
"_poponline(item)"
v-if=
"item.releaseState === 'OFFLINE'"
v-ps=
"['GENERAL_USER']"
icon=
"iconfont icon-erji-xiaxianjilu-copy
"
>
<!--
{{
$t
(
'
上线
'
)
}}
-->
</x-button>
<x-button
type=
"
warning"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('online')"
@
click=
"_downline(item)"
v-if=
"item.releaseState === 'ONLINE'"
v-ps=
"['GENERAL_USER']"
icon=
"iconfont icon-erji-xiaxianjilu-copy
"
>
<!--
{{
$t
(
'
下线
'
)
}}
-->
</x-button>
<x-button
type=
"
error"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('offline')"
@
click=
"_poponline(item)"
v-if=
"item.releaseState === 'OFFLINE'"
v-ps=
"['GENERAL_USER']"
icon=
"iconfont icon-erji-xiaxianjilu
"
>
<!--
{{
$t
(
'
上线
'
)
}}
-->
</x-button>
<x-button
type=
"info"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('Cron Manage')"
@
click=
"_timingManage(item)"
:disabled=
"item.releaseState !== 'ONLINE'"
v-ps=
"['GENERAL_USER']"
icon=
"iconfont icon-paibanguanli"
>
<!--
{{
$t
(
'
定时管理
'
)
}}
-->
</x-button>
<x-poptip
:ref=
"'poptip-delete-' + $index"
...
...
@@ -91,7 +91,21 @@
</tr>
</table>
</div>
<x-button
size=
"xsmall"
style=
"position: absolute; bottom: -48px; left: 22px;"
v-if=
"strDelete !== ''"
@
click=
"_batchDelete"
>
删除
</x-button>
<x-poptip
v-show=
"strDelete !== ''"
ref=
"poptipDeleteAll"
placement=
"bottom-start"
width=
"90"
>
<p>
{{$t('Delete?')}}
</p>
<div
style=
"text-align: right; margin: 0;padding-top: 4px;"
>
<x-button
type=
"text"
size=
"xsmall"
shape=
"circle"
@
click=
"_closeDelete(-1)"
>
{{$t('Cancel')}}
</x-button>
<x-button
type=
"primary"
size=
"xsmall"
shape=
"circle"
@
click=
"_delete({},-1)"
>
{{$t('Confirm')}}
</x-button>
</div>
<
template
slot=
"reference"
>
<x-button
size=
"xsmall"
style=
"position: absolute; bottom: -48px; left: 22px;"
>
删除
</x-button>
</
template
>
</x-poptip>
</div>
</template>
<
script
>
...
...
@@ -212,12 +226,22 @@
* Close the delete layer
*/
_closeDelete
(
i
)
{
this
.
$refs
[
`poptip-delete-
${
i
}
`
][
0
].
doClose
()
if
(
i
>
0
)
{
this
.
$refs
[
`poptip-delete-
${
i
}
`
][
0
].
doClose
()
}
else
{
this
.
$refs
[
'
poptipDeleteAll
'
].
doClose
()
}
},
/**
* delete
*/
_delete
(
item
,
i
)
{
// remove tow++
if
(
i
<
0
)
{
this
.
_batchDelete
()
return
}
// remove one
this
.
deleteDefinition
({
processDefinitionId
:
item
.
id
}).
then
(
res
=>
{
...
...
@@ -273,7 +297,7 @@
*/
_topCheckBoxClick
(
v
)
{
this
.
list
.
forEach
((
item
,
i
)
=>
{
this
.
$set
(
this
.
list
[
i
],
'
isCheck
'
,
v
)
this
.
$set
(
this
.
list
[
i
],
'
isCheck
'
,
item
.
releaseState
!==
'
OFFLINE
'
?
v
:
false
)
})
this
.
_arrDelChange
()
},
...
...
@@ -296,6 +320,7 @@
* batch delete
*/
_batchDelete
()
{
this
.
$refs
[
'
poptipDeleteAll
'
].
doClose
()
this
.
batchDeleteDefinition
({
processDefinitionIds
:
this
.
strDelete
}).
then
(
res
=>
{
...
...
escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
浏览文件 @
d10d10e9
...
...
@@ -249,7 +249,20 @@
</tr>
</table>
</div>
<x-button
size=
"xsmall"
style=
"position: absolute; bottom: -48px; left: 22px;"
v-if=
"strDelete !== ''"
@
click=
"_batchDelete"
>
删除
</x-button>
<x-poptip
v-show=
"strDelete !== ''"
ref=
"poptipDeleteAll"
placement=
"bottom-start"
width=
"90"
>
<p>
{{$t('Delete?')}}
</p>
<div
style=
"text-align: right; margin: 0;padding-top: 4px;"
>
<x-button
type=
"text"
size=
"xsmall"
shape=
"circle"
@
click=
"_closeDelete(-1)"
>
{{$t('Cancel')}}
</x-button>
<x-button
type=
"primary"
size=
"xsmall"
shape=
"circle"
@
click=
"_delete({},-1)"
>
{{$t('Confirm')}}
</x-button>
</div>
<
template
slot=
"reference"
>
<x-button
size=
"xsmall"
style=
"position: absolute; bottom: -48px; left: 22px;"
>
删除
</x-button>
</
template
>
</x-poptip>
</div>
</template>
<
script
>
...
...
@@ -293,12 +306,22 @@
* Close the delete layer
*/
_closeDelete
(
i
)
{
this
.
$refs
[
`poptip-delete-
${
i
}
`
][
0
].
doClose
()
if
(
i
>
0
)
{
this
.
$refs
[
`poptip-delete-
${
i
}
`
][
0
].
doClose
()
}
else
{
this
.
$refs
[
'
poptipDeleteAll
'
].
doClose
()
}
},
/**
* delete
*/
_delete
(
item
,
i
)
{
// remove tow++
if
(
i
<
0
)
{
this
.
_batchDelete
()
return
}
// remove one
this
.
deleteInstance
({
processInstanceId
:
item
.
id
}).
then
(
res
=>
{
...
...
@@ -467,6 +490,7 @@
}
},
_batchDelete
()
{
this
.
$refs
[
'
poptipDeleteAll
'
].
doClose
()
this
.
batchDeleteInstance
({
processInstanceIds
:
this
.
strDelete
}).
then
(
res
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录