Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yanghaoyuan.sh
DolphinScheduler
提交
1b5bec66
DolphinScheduler
项目概览
yanghaoyuan.sh
/
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,发现更多精彩内容 >>
提交
1b5bec66
编写于
4月 25, 2019
作者:
G
gongzijian
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
超时告警
上级
09bd894b
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
64 addition
and
5 deletion
+64
-5
escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/timeoutAlarm.vue
...home/pages/dag/_source/formModel/_source/timeoutAlarm.vue
+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
+44
-1
escheduler-ui/src/js/conf/home/store/dag/actions.js
escheduler-ui/src/js/conf/home/store/dag/actions.js
+10
-3
escheduler-ui/src/js/conf/home/store/dag/mutations.js
escheduler-ui/src/js/conf/home/store/dag/mutations.js
+7
-0
escheduler-ui/src/js/conf/home/store/dag/state.js
escheduler-ui/src/js/conf/home/store/dag/state.js
+2
-0
未找到文件。
escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/timeoutAlarm.vue
浏览文件 @
1b5bec66
...
...
@@ -33,7 +33,7 @@
</div>
<div
class=
"cont-box"
>
<label
class=
"label-box"
>
<x-input
v-model=
"interval"
style=
"width: 128px;"
:disabled=
"isDetails"
>
<x-input
v-model=
"interval"
style=
"width: 128px;"
:disabled=
"isDetails"
maxlength=
"9"
>
<span
slot=
"append"
>
{{
$t
(
'
Minute
'
)
}}
</span>
</x-input>
</label>
...
...
escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
浏览文件 @
1b5bec66
...
...
@@ -4,6 +4,7 @@
<div
class=
"title"
>
<span>
{{
$t
(
'
Set the DAG diagram name
'
)
}}
</span>
</div>
<div>
<x-input
type=
"text"
...
...
@@ -12,6 +13,7 @@
:placeholder=
"$t('Please enter name(required)')"
>
</x-input>
</div>
<template
v-if=
"router.history.current.name !== 'projects-instance-details'"
>
<div
style=
"padding-top: 12px;"
>
<x-input
...
...
@@ -23,6 +25,21 @@
</x-input>
</div>
</
template
>
<div
class=
"title"
style=
"padding-top: 6px;"
>
<span>
超时告警
</span>
<span
style=
"padding-left: 6px;"
>
<x-switch
v-model=
"checkedTimeout"
></x-switch>
</span>
</div>
<div
class=
"content"
style=
"padding-bottom: 10px;"
v-if=
"checkedTimeout"
>
<span>
<x-input
v-model=
"timeout"
style=
"width: 128px;"
maxlength=
"9"
>
<span
slot=
"append"
>
{{$t('Minute')}}
</span>
</x-input>
</span>
</div>
<div
class=
"title"
style=
"padding-top: 6px;"
>
<span>
{{$t('Set global')}}
</span>
</div>
...
...
@@ -68,7 +85,11 @@
// Global custom parameters
udpList
:
[],
// Whether to update the process definition
syncDefine
:
true
syncDefine
:
true
,
// Timeout alarm
timeout
:
0
,
// checked Timeout alarm
checkedTimeout
:
true
}
},
mixins
:
[
disabledState
],
...
...
@@ -81,6 +102,14 @@
_onLocalParams
(
a
)
{
this
.
udpList
=
a
},
_verifTimeout
()
{
const
reg
=
/^
[
1-9
]\d
*$/
if
(
!
reg
.
test
(
this
.
timeout
))
{
alert
(
1
)
return
false
}
return
true
},
/**
* submit
*/
...
...
@@ -95,9 +124,15 @@
if
(
!
this
.
$refs
.
refLocalParams
.
_verifProp
())
{
return
}
// verification timeout
if
(
!
this
.
_verifTimeout
())
{
return
}
// Storage global globalParams
this
.
store
.
commit
(
'
dag/setGlobalParams
'
,
_
.
cloneDeep
(
this
.
udpList
))
this
.
store
.
commit
(
'
dag/setName
'
,
_
.
cloneDeep
(
this
.
name
))
this
.
store
.
commit
(
'
dag/setTimeout
'
,
_
.
cloneDeep
(
this
.
timeout
))
this
.
store
.
commit
(
'
dag/setDesc
'
,
_
.
cloneDeep
(
this
.
desc
))
this
.
store
.
commit
(
'
dag/setSyncDefine
'
,
this
.
syncDefine
)
Affirm
.
setIsPop
(
false
)
...
...
@@ -124,12 +159,20 @@
}
},
watch
:
{
checkedTimeout
(
val
)
{
if
(
!
val
)
{
this
.
timeout
=
0
this
.
store
.
commit
(
'
dag/setTimeout
'
,
_
.
cloneDeep
(
this
.
timeout
))
}
}
},
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
this
.
checkedTimeout
=
this
.
timeout
!==
0
},
mounted
()
{},
components
:
{
mLocalParams
}
...
...
escheduler-ui/src/js/conf/home/store/dag/actions.js
浏览文件 @
1b5bec66
...
...
@@ -112,6 +112,8 @@ export default {
state
.
tasks
=
processDefinitionJson
.
tasks
// global params
state
.
globalParams
=
processDefinitionJson
.
globalParams
// timeout
state
.
timeout
=
processDefinitionJson
.
timeout
resolve
(
res
.
data
)
}).
catch
(
res
=>
{
...
...
@@ -141,6 +143,8 @@ export default {
state
.
tasks
=
processInstanceJson
.
tasks
// global params
state
.
globalParams
=
processInstanceJson
.
globalParams
// timeout
state
.
timeout
=
processInstanceJson
.
timeout
resolve
(
res
.
data
)
}).
catch
(
res
=>
{
...
...
@@ -155,7 +159,8 @@ export default {
return
new
Promise
((
resolve
,
reject
)
=>
{
let
data
=
{
globalParams
:
state
.
globalParams
,
tasks
:
state
.
tasks
tasks
:
state
.
tasks
,
timeout
:
state
.
timeout
}
io
.
post
(
`projects/
${
state
.
projectName
}
/process/save`
,
{
processDefinitionJson
:
JSON
.
stringify
(
data
),
...
...
@@ -177,7 +182,8 @@ export default {
return
new
Promise
((
resolve
,
reject
)
=>
{
let
data
=
{
globalParams
:
state
.
globalParams
,
tasks
:
state
.
tasks
tasks
:
state
.
tasks
,
timeout
:
state
.
timeout
}
io
.
post
(
`projects/
${
state
.
projectName
}
/process/update`
,
{
processDefinitionJson
:
JSON
.
stringify
(
data
),
...
...
@@ -200,7 +206,8 @@ export default {
return
new
Promise
((
resolve
,
reject
)
=>
{
let
data
=
{
globalParams
:
state
.
globalParams
,
tasks
:
state
.
tasks
tasks
:
state
.
tasks
,
timeout
:
state
.
timeout
}
io
.
post
(
`projects/
${
state
.
projectName
}
/instance/update`
,
{
processInstanceJson
:
JSON
.
stringify
(
data
),
...
...
escheduler-ui/src/js/conf/home/store/dag/mutations.js
浏览文件 @
1b5bec66
...
...
@@ -52,6 +52,12 @@ export default {
setName
(
state
,
payload
)
{
state
.
name
=
payload
},
/**
* set timeout
*/
setTimeout
(
state
,
payload
)
{
state
.
timeout
=
payload
},
/**
* set global params
*/
...
...
@@ -93,6 +99,7 @@ export default {
state
.
tasks
=
payload
&&
payload
.
tasks
||
[]
state
.
name
=
payload
&&
payload
.
name
||
''
state
.
desc
=
payload
&&
payload
.
desc
||
''
state
.
timeout
=
payload
&&
payload
.
timeout
||
0
state
.
processListS
=
payload
&&
payload
.
processListS
||
[]
state
.
resourcesListS
=
payload
&&
payload
.
resourcesListS
||
[]
state
.
isDetails
=
payload
&&
payload
.
isDetails
||
false
...
...
escheduler-ui/src/js/conf/home/store/dag/state.js
浏览文件 @
1b5bec66
...
...
@@ -29,6 +29,8 @@ export default {
globalParams
:
[],
// Node information
tasks
:
[],
// Timeout alarm
timeout
:
0
,
// Node location information
locations
:
{},
// Node-to-node connection
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录