Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
liyuanzhong001
DolphinScheduler
提交
a5c5f8a3
DolphinScheduler
项目概览
liyuanzhong001
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
11
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,发现更多精彩内容 >>
提交
a5c5f8a3
编写于
4月 22, 2019
作者:
G
gongzijian
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
worker分组
上级
ef76a868
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
113 addition
and
67 deletion
+113
-67
escheduler-ui/.env
escheduler-ui/.env
+1
-1
escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/workerGroups.vue
...home/pages/dag/_source/formModel/_source/workerGroups.vue
+13
-4
escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
...rc/js/conf/home/pages/dag/_source/formModel/formModel.vue
+1
-1
escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue
...i/src/js/conf/home/pages/monitor/pages/servers/master.vue
+7
-7
escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/zookeeper.vue
...rc/js/conf/home/pages/monitor/pages/servers/zookeeper.vue
+35
-26
escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
...es/projects/pages/definition/pages/list/_source/start.vue
+16
-5
escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue
...s/projects/pages/definition/pages/list/_source/timing.vue
+15
-3
escheduler-ui/src/js/conf/home/store/security/actions.js
escheduler-ui/src/js/conf/home/store/security/actions.js
+7
-2
escheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js
...ui/src/js/module/components/secondaryMenu/_source/menu.js
+18
-18
未找到文件。
escheduler-ui/.env
浏览文件 @
a5c5f8a3
# 后端接口地址
API_BASE = http://192.168.220.
247
:12345
API_BASE = http://192.168.220.
154
:12345
# 本地开发如需ip访问项目把"#"号去掉
#DEV_HOST = 192.168.xx.xx
escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/workerGroups.vue
浏览文件 @
a5c5f8a3
...
...
@@ -22,7 +22,10 @@
},
mixins
:
[
disabledState
],
props
:
{
value
:
Number
value
:
{
type
:
Number
,
default
:
-
1
}
},
model
:
{
prop
:
'
value
'
,
...
...
@@ -37,9 +40,15 @@
watch
:
{
},
created
()
{
this
.
workerGroupsList
=
this
.
store
.
state
.
security
.
workerGroupsListAll
||
[]
if
(
!
this
.
value
)
{
this
.
$emit
(
'
workerGroupsEvent
'
,
this
.
workerGroupsList
[
0
].
id
)
let
stateWorkerGroupsList
=
this
.
store
.
state
.
security
.
workerGroupsListAll
||
[]
if
(
stateWorkerGroupsList
.
length
)
{
this
.
workerGroupsList
=
stateWorkerGroupsList
}
else
{
this
.
store
.
dispatch
(
'
security/getWorkerGroupsAll
'
).
then
(
res
=>
{
this
.
$nextTick
(()
=>
{
this
.
workerGroupsList
=
res
})
})
}
}
}
...
...
escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
浏览文件 @
a5c5f8a3
...
...
@@ -221,7 +221,7 @@
// Task priority
taskInstancePriority
:
'
MEDIUM
'
,
// worker group id
workerGroupId
:
null
workerGroupId
:
-
1
}
},
/**
...
...
escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue
浏览文件 @
a5c5f8a3
<
template
>
<m-list-construction
:title=
"$t('Service-Master')"
>
<template
slot=
"content"
>
<
template
v-if=
"masterList.length
"
>
<
m-list
:list=
"masterList"
></m-list
>
</
template
>
<
template
v-if=
"!masterList.length"
>
<m-no-data></m-no-data
>
</
template
>
<
m-spin
:is-spin=
"isLoading"
></m-spin
>
<
div
class=
"servers-wrapper
"
>
<
div
class=
"row"
>
<div
class=
"col-md-4"
>
.col-md-8
</div
>
<div
class=
"col-md-4"
>
.col-md-4
</div
>
<div
class=
"col-md-4"
>
.col-md-4
</div
>
</div
>
<
/div
>
</
template
>
</m-list-construction>
</template>
...
...
escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/zookeeper.vue
浏览文件 @
a5c5f8a3
<
template
>
<div
class=
"zookeeper-model"
>
zookeeper
</div>
<m-list-construction
:title=
"$t('Service-Master')"
>
<template
slot=
"content"
>
<template
v-if=
"masterList.length"
>
<m-list
:list=
"masterList"
></m-list>
</
template
>
<
template
v-if=
"!masterList.length"
>
<m-no-data></m-no-data>
</
template
>
<m-spin
:is-spin=
"isLoading"
></m-spin>
</template>
</m-list-construction>
</template>
<
script
>
import
{
mapActions
}
from
'
vuex
'
import
mList
from
'
./_source/list
'
import
mSpin
from
'
@/module/components/spin/spin
'
import
mNoData
from
'
@/module/components/noData/noData
'
import
mListConstruction
from
'
@/module/components/listConstruction/listConstruction
'
export
default
{
name
:
'
zookeeper
'
,
name
:
'
servers-
zookeeper
'
,
data
()
{
return
{}
return
{
pageSize
:
10
,
pageNo
:
1
,
totalPage
:
null
,
searchVal
:
''
,
isLoading
:
false
,
masterList
:
[]
}
},
props
:
{},
methods
:
{},
watch
:
{},
beforeCreate
()
{
methods
:
{
...
mapActions
(
'
security
'
,
[
'
getProcessMasterList
'
])
},
watch
:
{},
created
()
{
},
beforeMount
()
{
this
.
isLoading
=
true
this
.
getProcessMasterList
().
then
(
res
=>
{
this
.
masterList
=
res
.
data
this
.
isLoading
=
false
})
},
mounted
()
{
},
beforeUpdate
()
{
},
updated
()
{
},
beforeDestroy
()
{
},
destroyed
()
{
},
computed
:
{},
components
:
{}
components
:
{
mList
,
mListConstruction
,
mSpin
,
mNoData
}
}
</
script
>
<
style
lang=
"scss"
rel=
"stylesheet/scss"
>
.zookeeper-model
{
}
</
style
>
escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
浏览文件 @
a5c5f8a3
...
...
@@ -14,11 +14,11 @@
</x-radio-group>
</div>
</div>
<div
class=
"clearfix list"
v-if=
"sourceType === 'contextmenu'"
>
<div
class=
"clearfix list"
v-if=
"sourceType === 'contextmenu'"
style=
"margin-top: -8px;"
>
<div
class=
"text"
>
{{
$t
(
'
Node execution
'
)
}}
</div>
<div
class=
"cont"
>
<div
class=
"cont"
style=
"padding-top: 6px;"
>
<x-radio-group
v-model=
"taskDependType"
>
<x-radio
:label=
"'TASK_POST'"
>
{{
$t
(
'
Backward execution
'
)
}}
</x-radio>
<x-radio
:label=
"'TASK_PRE'"
>
{{
$t
(
'
Forward execution
'
)
}}
</x-radio>
...
...
@@ -49,6 +49,14 @@
<m-priority
v-model=
"processInstancePriority"
></m-priority>
</div>
</div>
<div
class=
"clearfix list"
>
<div
class=
"text"
>
Worker分组
</div>
<div
class=
"cont"
>
<m-worker-groups
v-model=
"workerGroupId"
></m-worker-groups>
</div>
</div>
<div
class=
"clearfix list"
>
<div
class=
"text"
>
{{
$t
(
'
Notification group
'
)
}}
...
...
@@ -140,6 +148,7 @@
import
store
from
'
@/conf/home/store
'
import
{
warningTypeList
}
from
'
./util
'
import
mPriority
from
'
@/module/components/priority/priority
'
import
mWorkerGroups
from
'
@/conf/home/pages/dag/_source/formModel/_source/workerGroups
'
export
default
{
name
:
'
start-process
'
,
...
...
@@ -159,7 +168,8 @@
receivers
:
[],
receiversCc
:
[],
runMode
:
'
RUN_MODE_SERIAL
'
,
processInstancePriority
:
'
MEDIUM
'
processInstancePriority
:
'
MEDIUM
'
,
workerGroupId
:
-
1
}
},
props
:
{
...
...
@@ -188,7 +198,8 @@
runMode
:
this
.
runMode
,
processInstancePriority
:
this
.
processInstancePriority
,
receivers
:
this
.
receivers
.
join
(
'
,
'
)
||
''
,
receiversCc
:
this
.
receiversCc
.
join
(
'
,
'
)
||
''
receiversCc
:
this
.
receiversCc
.
join
(
'
,
'
)
||
''
,
workerGroupId
:
this
.
workerGroupId
}
// Executed from the specified node
if
(
this
.
sourceType
===
'
contextmenu
'
)
{
...
...
@@ -251,7 +262,7 @@
})
},
computed
:
{},
components
:
{
mEmail
,
mPriority
}
components
:
{
mEmail
,
mPriority
,
mWorkerGroups
}
}
</
script
>
...
...
escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue
浏览文件 @
a5c5f8a3
...
...
@@ -79,6 +79,14 @@
<m-priority
v-model=
"processInstancePriority"
></m-priority>
</div>
</div>
<div
class=
"clearfix list"
>
<div
class=
"text"
>
Worker分组
</div>
<div
class=
"cont"
>
<m-worker-groups
v-model=
"workerGroupId"
></m-worker-groups>
</div>
</div>
<div
class=
"clearfix list"
>
<div
class=
"text"
>
{{$t('Notification group')}}
...
...
@@ -133,6 +141,7 @@
import
{
vCrontab
}
from
'
~/@vue/crontab/dist
'
import
{
formatDate
}
from
'
@/module/filter/filter
'
import
mPriority
from
'
@/module/components/priority/priority
'
import
mWorkerGroups
from
'
@/conf/home/pages/dag/_source/formModel/_source/workerGroups
'
export
default
{
name
:
'
timing-process
'
,
...
...
@@ -152,7 +161,8 @@
receivers
:
[],
receiversCc
:
[],
i18n
:
i18n
.
globalScope
.
LOCALE
,
processInstancePriority
:
'
MEDIUM
'
processInstancePriority
:
'
MEDIUM
'
,
workerGroupId
:
-
1
}
},
props
:
{
...
...
@@ -190,7 +200,8 @@
processInstancePriority
:
this
.
processInstancePriority
,
warningGroupId
:
_
.
isEmpty
(
this
.
warningGroupId
)
?
0
:
this
.
warningGroupId
.
id
,
receivers
:
this
.
receivers
.
join
(
'
,
'
)
||
''
,
receiversCc
:
this
.
receiversCc
.
join
(
'
,
'
)
||
''
receiversCc
:
this
.
receiversCc
.
join
(
'
,
'
)
||
''
,
workerGroupId
:
this
.
workerGroupId
}
let
msg
=
''
...
...
@@ -255,6 +266,7 @@
this
.
failureStrategy
=
item
.
failureStrategy
this
.
warningType
=
item
.
warningType
this
.
processInstancePriority
=
item
.
processInstancePriority
this
.
workerGroupId
=
item
.
workerGroupId
||
-
1
this
.
_getNotifyGroupList
().
then
(()
=>
{
this
.
$nextTick
(()
=>
{
let
list
=
_
.
filter
(
this
.
notifyGroupList
,
v
=>
v
.
id
===
item
.
warningGroupId
)
...
...
@@ -269,7 +281,7 @@
}).
catch
(()
=>
this
.
warningGroupId
=
{
id
:
0
})
}
},
components
:
{
vCrontab
,
mEmail
,
mPriority
}
components
:
{
vCrontab
,
mEmail
,
mPriority
,
mWorkerGroups
}
}
</
script
>
...
...
escheduler-ui/src/js/conf/home/store/security/actions.js
浏览文件 @
a5c5f8a3
...
...
@@ -432,8 +432,13 @@ export default {
getWorkerGroupsAll
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`worker-group/all-groups`
,
payload
,
res
=>
{
state
.
workerGroupsListAll
=
res
.
data
resolve
(
res
.
data
)
let
list
=
res
.
data
list
.
unshift
({
id
:
-
1
,
name
:
'
All
'
})
state
.
workerGroupsListAll
=
list
resolve
(
list
)
}).
catch
(
e
=>
{
reject
(
e
)
})
...
...
escheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js
浏览文件 @
a5c5f8a3
...
...
@@ -202,30 +202,30 @@ let menu = {
id
:
1
,
disabled
:
true
},
{
name
:
'
Alert
'
,
path
:
'
servers-alert
'
,
id
:
2
,
disabled
:
true
},
{
name
:
'
RpcServer
'
,
path
:
'
servers-rpcserver
'
,
id
:
3
,
disabled
:
true
},
//
{
//
name: 'Alert',
//
path: 'servers-alert',
//
id: 2,
//
disabled: true
//
},
//
{
//
name: 'RpcServer',
//
path: 'servers-rpcserver',
//
id: 3,
//
disabled: true
//
},
{
name
:
'
Zookeeper
'
,
path
:
'
servers-zookeeper
'
,
id
:
4
,
disabled
:
true
},
{
name
:
'
ApiServer
'
,
path
:
'
servers-apiserver
'
,
id
:
5
,
disabled
:
true
},
//
{
//
name: 'ApiServer',
//
path: 'servers-apiserver',
//
id: 5,
//
disabled: true
//
},
{
name
:
'
Mysql
'
,
path
:
'
servers-mysql
'
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录