Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
禁878
DolphinScheduler
提交
31b809e8
DolphinScheduler
项目概览
禁878
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
3
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,体验更适合开发者的 AI 搜索 >>
提交
31b809e8
编写于
5月 25, 2019
作者:
B
baoliang
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'upstream/branch-1.0.2' into 102
上级
04e591c7
39a9a23f
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
129 addition
and
25 deletion
+129
-25
escheduler-ui/.env
escheduler-ui/.env
+1
-1
escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
+10
-10
escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
...ges/projects/pages/definition/pages/list/_source/list.vue
+34
-8
escheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/_source/list.vue
...e/pages/projects/pages/definition/timing/_source/list.vue
+45
-2
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/store/dag/actions.js
escheduler-ui/src/js/conf/home/store/dag/actions.js
+12
-0
install.sh
install.sh
+1
-2
未找到文件。
escheduler-ui/.env
浏览文件 @
31b809e8
...
...
@@ -2,4 +2,4 @@
API_BASE = http://192.168.xx.xx:12345
# 本地开发如需ip访问项目把"#"号去掉
#DEV_HOST = 192.168.xx.xx
\ No newline at end of file
#DEV_HOST = 192.168.xx.xx
escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
浏览文件 @
31b809e8
...
...
@@ -84,6 +84,8 @@
desc
:
''
,
// Global custom parameters
udpList
:
[],
// Global custom parameters
udpListCache
:
[],
// Whether to update the process definition
syncDefine
:
true
,
// Timeout alarm
...
...
@@ -159,11 +161,7 @@
* Close the popup
*/
close
()
{
// Storage global globalParams
this
.
_accuStore
()
setTimeout
(()
=>
{
this
.
$emit
(
'
close
'
)
})
this
.
$emit
(
'
close
'
)
}
},
watch
:
{
...
...
@@ -175,11 +173,13 @@
}
},
created
()
{
this
.
udpList
=
this
.
store
.
state
.
dag
.
globalParams
this
.
name
=
this
.
store
.
state
.
dag
.
name
this
.
desc
=
this
.
store
.
state
.
dag
.
desc
this
.
syncDefine
=
this
.
store
.
state
.
dag
.
syncDefine
this
.
timeout
=
this
.
store
.
state
.
dag
.
timeout
||
0
const
dag
=
_
.
cloneDeep
(
this
.
store
.
state
.
dag
)
this
.
udpList
=
dag
.
globalParams
this
.
udpListCache
=
dag
.
globalParams
this
.
name
=
dag
.
name
this
.
desc
=
dag
.
desc
this
.
syncDefine
=
dag
.
syncDefine
this
.
timeout
=
dag
.
timeout
||
0
this
.
checkedTimeout
=
this
.
timeout
!==
0
},
mounted
()
{},
...
...
escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
浏览文件 @
31b809e8
...
...
@@ -32,7 +32,7 @@
</th>
</tr>
<tr
v-for=
"(item, $index) in list"
:key=
"item.id"
>
<td
width=
"50"
><x-checkbox
v-model=
"item.isCheck"
@
on-change=
"_arrDelChange"
></x-checkbox></td>
<td
width=
"50"
><x-checkbox
v-model=
"item.isCheck"
:disabled=
"item.releaseState === 'ONLINE'"
@
on-change=
"_arrDelChange"
></x-checkbox></td>
<td
width=
"50"
>
<span>
{{
parseInt
(
pageNo
===
1
?
(
$index
+
1
)
:
((
$index
+
1
)
+
(
pageSize
*
(
pageNo
-
1
))))
}}
</span>
</td>
...
...
@@ -53,16 +53,16 @@
</td>
<td><span
class=
"ellipsis"
>
{{
item
.
desc
}}
</span></td>
<td>
<span
v-if=
"item.scheduleReleaseState === 'OFFLINE'"
>
{{
$t
(
'
o
ff
line
'
)
}}
</span>
<span
v-if=
"item.scheduleReleaseState === 'ONLINE'"
>
{{
$t
(
'
o
n
line
'
)
}}
</span>
<span
v-if=
"item.scheduleReleaseState === 'OFFLINE'"
>
{{
$t
(
'
o
n
line
'
)
}}
</span>
<span
v-if=
"item.scheduleReleaseState === 'ONLINE'"
>
{{
$t
(
'
o
ff
line
'
)
}}
</span>
<span
v-if=
"!item.scheduleReleaseState"
>
-
</span>
</td>
<td>
<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=
"_poponline(item)"
v-if=
"item.releaseState === 'OFFLINE'"
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=
"_downline(item)"
v-if=
"item.releaseState === 'ONLINE'"
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"
...
...
@@ -79,6 +79,7 @@
type=
"error"
shape=
"circle"
size=
"xsmall"
:disabled=
"item.releaseState === 'ONLINE'"
data-toggle=
"tooltip"
:title=
"$t('delete')"
v-ps=
"['GENERAL_USER']"
>
...
...
@@ -90,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
>
...
...
@@ -211,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
=>
{
...
...
@@ -272,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
()
},
...
...
@@ -295,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/definition/timing/_source/list.vue
浏览文件 @
31b809e8
...
...
@@ -35,7 +35,7 @@
<th>
<span>
{{
$t
(
'
Update Time
'
)
}}
</span>
</th>
<th
width=
"
8
0"
>
<th
width=
"
12
0"
>
<span>
{{
$t
(
'
Operation
'
)
}}
</span>
</th>
</tr>
...
...
@@ -98,6 +98,28 @@
@
click=
"_offline(item)"
v-if=
"item.releaseState === 'ONLINE'"
>
</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
icon=
"iconfont icon-shanchu"
type=
"error"
shape=
"circle"
size=
"xsmall"
:disabled=
"item.releaseState === 'ONLINE'"
data-toggle=
"tooltip"
:title=
"$t('delete')"
v-ps=
"['GENERAL_USER']"
>
</x-button>
</
template
>
</x-poptip>
</td>
</tr>
</table>
...
...
@@ -135,7 +157,28 @@
props
:
{
},
methods
:
{
...
mapActions
(
'
dag
'
,
[
'
getScheduleList
'
,
'
scheduleOffline
'
,
'
scheduleOnline
'
,
'
getReceiver
'
]),
...
mapActions
(
'
dag
'
,
[
'
getScheduleList
'
,
'
scheduleOffline
'
,
'
scheduleOnline
'
,
'
getReceiver
'
,
'
deleteTiming
'
]),
/**
* delete
*/
_delete
(
item
,
i
)
{
this
.
deleteTiming
({
scheduleId
:
item
.
id
}).
then
(
res
=>
{
this
.
$refs
[
`poptip-delete-
${
i
}
`
][
0
].
doClose
()
this
.
$message
.
success
(
res
.
msg
)
this
.
$router
.
push
({
name
:
'
projects-definition-list
'
})
}).
catch
(
e
=>
{
this
.
$refs
[
`poptip-delete-
${
i
}
`
][
0
].
doClose
()
this
.
$message
.
error
(
e
.
msg
||
''
)
})
},
/**
* Close the delete layer
*/
_closeDelete
(
i
)
{
this
.
$refs
[
`poptip-delete-
${
i
}
`
][
0
].
doClose
()
},
/**
* return state
*/
...
...
escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
浏览文件 @
31b809e8
...
...
@@ -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
=>
{
...
...
escheduler-ui/src/js/conf/home/store/dag/actions.js
浏览文件 @
31b809e8
...
...
@@ -589,5 +589,17 @@ export default {
reject
(
e
)
})
})
},
/**
* remove timing
*/
deleteTiming
({
state
},
payload
){
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`projects/
${
state
.
projectName
}
/schedule/delete`
,
payload
,
res
=>
{
resolve
(
res
)
}).
catch
(
e
=>
{
reject
(
e
)
})
})
}
}
install.sh
浏览文件 @
31b809e8
...
...
@@ -408,8 +408,7 @@ if [ "true" = $monitorServerState ];then
echo
"monitor server running as process
${
TARGET_PID
}
.Stopped success"
rm
-f
$monitor_pid
fi
nohup
python
-u
${
workDir
}
/script/monitor_server.py
$installPath
$zkQuorum
$zkMasters
$zkWorkers
>
${
workDir
}
/monitor_server
.log 2>&1 &
nohup
python
-u
${
workDir
}
/script/monitor_server.py
$installPath
$zkQuorum
$zkMasters
$zkWorkers
>
${
workDir
}
/monitor_server.log 2>&1 &
echo
$!
>
$monitor_pid
echo
"start monitor server success as process
`
cat
$monitor_pid
`
"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录