Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
b8d0f06a
DolphinScheduler
项目概览
apache
/
DolphinScheduler
上一次同步 1 年多
通知
704
Star
9572
Fork
3514
代码
文件
提交
分支
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 搜索 >>
未验证
提交
b8d0f06a
编写于
11月 05, 2021
作者:
M
myangle1120
提交者:
GitHub
11月 05, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Feature-#6268][UI]Serial execte proces (#6267)
* serial * del ip
上级
d4d59b06
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
68 addition
and
3 deletion
+68
-3
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js
...scheduler-ui/src/js/conf/home/pages/dag/_source/config.js
+11
-0
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
...heduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
+28
-2
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
...pages/projects/pages/instance/pages/list/_source/list.vue
+1
-1
dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
+7
-0
dolphinscheduler-ui/src/js/conf/home/store/dag/mutations.js
dolphinscheduler-ui/src/js/conf/home/store/dag/mutations.js
+7
-0
dolphinscheduler-ui/src/js/conf/home/store/dag/state.js
dolphinscheduler-ui/src/js/conf/home/store/dag/state.js
+2
-0
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+6
-0
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+6
-0
未找到文件。
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js
浏览文件 @
b8d0f06a
...
...
@@ -133,6 +133,10 @@ const runningType = [
{
desc
:
`
${
i18n
.
$t
(
'
Recovery waiting thread
'
)}
`
,
code
:
'
RECOVER_WAITING_THREAD
'
},
{
desc
:
`
${
i18n
.
$t
(
'
Recover serial wait
'
)}
`
,
code
:
'
RECOVER_SERIAL_WAIT
'
}
]
...
...
@@ -243,6 +247,13 @@ const tasksState = {
color
:
'
#5102ce
'
,
icoUnicode
:
'
el-icon-success
'
,
isSpin
:
false
},
SERIAL_WAIT
:
{
id
:
14
,
desc
:
`
${
i18n
.
$t
(
'
Serial wait
'
)}
`
,
color
:
'
#5102ce
'
,
icoUnicode
:
'
el-icon-loading
'
,
isSpin
:
false
}
}
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
浏览文件 @
b8d0f06a
...
...
@@ -57,7 +57,23 @@
</el-input>
</span>
</div>
<div
class=
"title"
style=
"padding-top: 6px;"
>
<span
class=
"text-b"
>
{{$t('Process execute type')}}
</span>
<span
>
<el-select
:disabled=
"isDetails"
v-model=
"executionType"
size=
"small"
style=
"width: 180px"
>
<el-option
v-for=
"item in itemsList"
:key=
"item.key"
:value=
"item.key"
:label=
"$t(item.val)"
>
</el-option>
</el-select>
</span>
</div>
<div
class=
"title"
style=
"padding-top: 6px;"
>
<span>
{{$t('Set global')}}
</span>
</div>
...
...
@@ -120,7 +136,15 @@
// tenant code
tenantCode
:
'
default
'
,
// checked Timeout alarm
checkedTimeout
:
true
checkedTimeout
:
true
,
// process execute type
executionType
:
'
PARALLEL
'
,
itemsList
:
[
{
key
:
'
PARALLEL
'
,
val
:
'
parallel
'
},
{
key
:
'
SERIAL_WAIT
'
,
val
:
'
Serial wait
'
},
{
key
:
'
SERIAL_DISCARD
'
,
val
:
'
Serial discard
'
},
{
key
:
'
SERIAL_PRIORITY
'
,
val
:
'
Serial priority
'
}
]
}
},
mixins
:
[
disabledState
],
...
...
@@ -151,6 +175,7 @@
this
.
store
.
commit
(
'
dag/setName
'
,
_
.
cloneDeep
(
this
.
name
))
this
.
store
.
commit
(
'
dag/setTimeout
'
,
_
.
cloneDeep
(
this
.
timeout
))
this
.
store
.
commit
(
'
dag/setTenantCode
'
,
_
.
cloneDeep
(
this
.
tenantCode
))
this
.
store
.
commit
(
'
dag/setExecutionType
'
,
_
.
cloneDeep
(
this
.
executionType
))
this
.
store
.
commit
(
'
dag/setDesc
'
,
_
.
cloneDeep
(
this
.
description
))
this
.
store
.
commit
(
'
dag/setSyncDefine
'
,
this
.
syncDefine
)
this
.
store
.
commit
(
'
dag/setReleaseState
'
,
this
.
releaseState
)
...
...
@@ -263,6 +288,7 @@
this
.
tenantCode
=
this
.
store
.
state
.
user
.
userInfo
.
tenantCode
||
'
default
'
}
})
this
.
executionType
=
dag
.
executionType
},
mounted
()
{},
components
:
{
FormTenant
,
mLocalParams
}
...
...
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
浏览文件 @
b8d0f06a
...
...
@@ -266,7 +266,7 @@
* Return run type
*/
_rtRunningType
(
code
)
{
return
_
.
filter
(
runningType
,
v
=>
v
.
code
===
code
)[
0
]
.
desc
return
(
_
.
filter
(
runningType
,
v
=>
v
.
code
===
code
)[
0
]
||
{})
.
desc
},
/**
* Return status
...
...
dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
浏览文件 @
b8d0f06a
...
...
@@ -143,6 +143,9 @@ export default {
state
.
globalParams
=
res
.
data
.
processDefinition
.
globalParamList
// timeout
state
.
timeout
=
res
.
data
.
processDefinition
.
timeout
// executionType
state
.
executionType
=
res
.
data
.
processDefinition
.
executionType
// tenantId
// tenantCode
state
.
tenantCode
=
res
.
data
.
processDefinition
.
tenantCode
||
'
default
'
// tasks info
...
...
@@ -240,6 +243,8 @@ export default {
state
.
globalParams
=
processDefinition
.
globalParamList
// timeout
state
.
timeout
=
processDefinition
.
timeout
// executionType
state
.
executionType
=
processDefinition
.
executionType
// tenantCode
state
.
tenantCode
=
res
.
data
.
tenantCode
||
'
default
'
// tasks info
...
...
@@ -282,6 +287,7 @@ export default {
taskDefinitionJson
:
JSON
.
stringify
(
state
.
tasks
),
taskRelationJson
:
JSON
.
stringify
(
state
.
connects
),
tenantCode
:
state
.
tenantCode
,
executionType
:
state
.
executionType
,
description
:
_
.
trim
(
state
.
description
),
globalParams
:
JSON
.
stringify
(
state
.
globalParams
),
timeout
:
state
.
timeout
...
...
@@ -303,6 +309,7 @@ export default {
taskDefinitionJson
:
JSON
.
stringify
(
state
.
tasks
),
taskRelationJson
:
JSON
.
stringify
(
state
.
connects
),
tenantCode
:
state
.
tenantCode
,
executionType
:
state
.
executionType
,
description
:
_
.
trim
(
state
.
description
),
globalParams
:
JSON
.
stringify
(
state
.
globalParams
),
timeout
:
state
.
timeout
,
...
...
dolphinscheduler-ui/src/js/conf/home/store/dag/mutations.js
浏览文件 @
b8d0f06a
...
...
@@ -63,6 +63,12 @@ export default {
setTimeout
(
state
,
payload
)
{
state
.
timeout
=
payload
},
/**
* set executionType
*/
setExecutionType
(
state
,
payload
)
{
state
.
executionType
=
payload
},
/**
* set tenantCode
*/
...
...
@@ -113,6 +119,7 @@ export default {
state
.
name
=
(
payload
&&
payload
.
name
)
||
''
state
.
description
=
(
payload
&&
payload
.
description
)
||
''
state
.
timeout
=
(
payload
&&
payload
.
timeout
)
||
0
state
.
executionType
=
(
payload
&&
payload
.
executionType
)
||
'
PARALLEL
'
state
.
tenantCode
=
(
payload
&&
payload
.
tenantCode
)
||
'
default
'
state
.
processListS
=
(
payload
&&
payload
.
processListS
)
||
[]
state
.
resourcesListS
=
(
payload
&&
payload
.
resourcesListS
)
||
[]
...
...
dolphinscheduler-ui/src/js/conf/home/store/dag/state.js
浏览文件 @
b8d0f06a
...
...
@@ -37,6 +37,8 @@ export default {
tasks
:
[],
// Timeout alarm
timeout
:
0
,
// process execute type
executionType
:
'
PARALLEL
'
,
// tenant code
tenantCode
:
'
default
'
,
// Node location information
...
...
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
浏览文件 @
b8d0f06a
...
...
@@ -711,6 +711,12 @@ export default {
'
The condition content cannot be empty
'
:
'
The condition content cannot be empty
'
,
'
Reference from
'
:
'
Reference from
'
,
'
No more...
'
:
'
No more...
'
,
'
Process execute type
'
:
'
Process execute type
'
,
parallel
:
'
parallel
'
,
'
Serial wait
'
:
'
Serial wait
'
,
'
Serial discard
'
:
'
Serial discard
'
,
'
Serial priority
'
:
'
Serial priority
'
,
'
Recover serial wait
'
:
'
Recover serial wait
'
,
IsEnableProxy
:
'
Enable Proxy
'
,
WebHook
:
'
WebHook
'
,
Keyword
:
'
Keyword
'
,
...
...
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
浏览文件 @
b8d0f06a
...
...
@@ -711,6 +711,12 @@ export default {
'
The condition content cannot be empty
'
:
'
条件内容不能为空
'
,
'
Reference from
'
:
'
使用已有任务
'
,
'
No more...
'
:
'
没有更多了...
'
,
'
Process execute type
'
:
'
执行策略
'
,
parallel
:
'
并行
'
,
'
Serial wait
'
:
'
串行等待
'
,
'
Serial discard
'
:
'
串行抛弃
'
,
'
Serial priority
'
:
'
串行优先
'
,
'
Recover serial wait
'
:
'
串行恢复
'
,
IsEnableProxy
:
'
启用代理
'
,
WebHook
:
'
Web钩子
'
,
Keyword
:
'
密钥
'
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录