Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_44739061
DolphinScheduler
提交
7477f9c9
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,发现更多精彩内容 >>
未验证
提交
7477f9c9
编写于
5月 08, 2020
作者:
X
xingchun-chen
提交者:
GitHub
5月 08, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2622 from break60/dev
Fix worker grouping
上级
6127f3a4
cff7b888
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
14 addition
and
32 deletion
+14
-32
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue
...f/home/pages/security/pages/workerGroups/_source/list.vue
+3
-25
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue
.../js/conf/home/pages/security/pages/workerGroups/index.vue
+2
-7
dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js
...ui/src/js/module/components/secondaryMenu/_source/menu.js
+9
-0
未找到文件。
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue
浏览文件 @
7477f9c9
...
...
@@ -34,9 +34,6 @@
<th>
<span>
{{
$t
(
'
Update Time
'
)
}}
</span>
</th>
<th
width=
"70"
>
<span>
{{
$t
(
'
Operation
'
)
}}
</span>
</th>
</tr>
<tr
v-for=
"(item, $index) in list"
:key=
"$index"
>
<td>
...
...
@@ -48,7 +45,7 @@
</span>
</td>
<td>
<span>
{{
item
.
ipList
}}
</span>
<span>
{{
item
.
ipList
.
join
(
'
,
'
)
}}
</span>
</td>
<td>
<span
v-if=
"item.createTime"
>
{{
item
.
createTime
|
formatDate
}}
</span>
...
...
@@ -58,24 +55,6 @@
<span
v-if=
"item.updateTime"
>
{{
item
.
updateTime
|
formatDate
}}
</span>
<span
v-else
>
-
</span>
</td>
<td>
<x-button
type=
"info"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
icon=
"ans-icon-edit"
:title=
"$t('Edit')"
@
click=
"_edit(item)"
>
</x-button>
<x-poptip
:ref=
"'poptip-delete-' + $index"
placement=
"bottom-end"
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($index)"
>
{{
$t
(
'
Cancel
'
)
}}
</x-button>
<x-button
type=
"primary"
size=
"xsmall"
shape=
"circle"
@
click=
"_delete(item,$index)"
>
{{
$t
(
'
Confirm
'
)
}}
</x-button>
</div>
<template
slot=
"reference"
>
<x-button
type=
"error"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
icon=
"ans-icon-trash"
:title=
"$t('delete')"
>
</x-button>
</
template
>
</x-poptip>
</td>
</tr>
</table>
</div>
...
...
@@ -128,8 +107,7 @@
created
()
{
this
.
list
=
this
.
workerGroupList
},
mounted
()
{
},
components
:
{
}
mounted
()
{},
components
:
{},
}
</
script
>
\ No newline at end of file
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue
浏览文件 @
7477f9c9
...
...
@@ -17,11 +17,7 @@
<
template
>
<m-list-construction
:title=
"$t('Worker group manage')"
>
<template
slot=
"conditions"
>
<m-conditions
@
on-conditions=
"_onConditions"
>
<template
slot=
"button-group"
v-if=
"isADMIN"
>
<x-button
type=
"ghost"
size=
"small"
@
click=
"_create('')"
>
{{
$t
(
'
Create worker group
'
)
}}
</x-button>
</
template
>
</m-conditions>
<m-conditions
@
on-conditions=
"_onConditions"
></m-conditions>
</
template
>
<
template
slot=
"content"
>
<template
v-if=
"workerGroupList.length || total>0"
>
...
...
@@ -141,8 +137,7 @@
this
.
searchParams
.
pageNo
=
_
.
isEmpty
(
a
.
query
)
?
1
:
a
.
query
.
pageNo
}
},
created
()
{
},
created
()
{},
mounted
()
{
this
.
$modal
.
destroy
()
},
...
...
dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js
浏览文件 @
7477f9c9
...
...
@@ -100,6 +100,15 @@ const menu = {
icon
:
'
ans-icon-danger-solid
'
,
children
:
[]
},
{
name
:
`
${
i18n
.
$t
(
'
Worker group manage
'
)}
`
,
id
:
4
,
path
:
'
worker-groups-manage
'
,
isOpen
:
true
,
disabled
:
true
,
icon
:
'
ans-icon-diary
'
,
children
:
[]
},
{
name
:
`
${
i18n
.
$t
(
'
Queue manage
'
)}
`
,
id
:
3
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录