Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DolphinScheduler社区
DolphinScheduler
提交
02d5c53a
DolphinScheduler
项目概览
DolphinScheduler社区
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
67
Star
1
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 搜索 >>
提交
02d5c53a
编写于
5月 20, 2019
作者:
H
huyuanming
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add taskInstance link, add email title input
上级
a8697961
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
28 addition
and
5 deletion
+28
-5
escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
...rc/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
+17
-0
escheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
...f/home/pages/projects/pages/taskInstance/_source/list.vue
+7
-5
escheduler-ui/src/js/module/i18n/locale/en_US.js
escheduler-ui/src/js/module/i18n/locale/en_US.js
+2
-0
escheduler-ui/src/js/module/i18n/locale/zh_CN.js
escheduler-ui/src/js/module/i18n/locale/zh_CN.js
+2
-0
未找到文件。
escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
浏览文件 @
02d5c53a
...
...
@@ -28,6 +28,17 @@
</div>
</m-list-box>
<template
v-if=
"!sqlType && showType.length"
>
<m-list-box>
<div
slot=
"text"
>
{{
$t
(
'
Title
'
)
}}
</div>
<div
slot=
"content"
>
<x-input
type=
"input"
v-model=
"title"
:placeholder=
"$t('Please enter the title of email')"
autocomplete=
"off"
>
</x-input>
</div>
</m-list-box>
<m-list-box>
<div
slot=
"text"
>
{{
$t
(
'
Recipient
'
)
}}
</div>
<div
slot=
"content"
>
...
...
@@ -141,6 +152,8 @@
udfs
:
''
,
// Sql type
sqlType
:
0
,
// Email title
title
:
''
,
// Form/attachment
showType
:
[
'
TABLE
'
],
// Sql parameter
...
...
@@ -241,6 +254,7 @@
sql
:
editor
.
getValue
(),
udfs
:
this
.
udfs
,
sqlType
:
this
.
sqlType
,
title
:
this
.
title
,
receivers
:
this
.
receivers
.
join
(
'
,
'
),
receiversCc
:
this
.
receiversCc
.
join
(
'
,
'
),
showType
:
(()
=>
{
...
...
@@ -308,6 +322,7 @@
this
.
showType
=
[]
}
if
(
val
!==
0
)
{
this
.
title
=
''
this
.
receivers
=
[]
this
.
receiversCc
=
[]
}
...
...
@@ -321,6 +336,7 @@
//
showType
(
val
)
{
if
(
!
val
.
length
)
{
this
.
title
=
''
this
.
receivers
=
[]
this
.
receiversCc
=
[]
}
...
...
@@ -342,6 +358,7 @@
this
.
showType
=
o
.
params
.
showType
.
split
(
'
,
'
)
||
[]
this
.
preStatements
=
o
.
params
.
preStatements
||
[]
this
.
postStatements
=
o
.
params
.
postStatements
||
[]
this
.
title
=
o
.
params
.
title
||
''
this
.
receivers
=
o
.
params
.
receivers
&&
o
.
params
.
receivers
.
split
(
'
,
'
)
||
[]
this
.
receiversCc
=
o
.
params
.
receiversCc
&&
o
.
params
.
receiversCc
.
split
(
'
,
'
)
||
[]
}
...
...
escheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
浏览文件 @
02d5c53a
...
...
@@ -45,10 +45,9 @@
<span>
{{
parseInt
(
pageNo
===
1
?
(
$index
+
1
)
:
((
$index
+
1
)
+
(
pageSize
*
(
pageNo
-
1
))))
}}
</span>
</td>
<td>
<span
v-if=
"isAuth"
class=
"ellipsis"
><a
href=
"javascript:"
class=
"links"
>
{{
item
.
name
}}
</a></span>
<span
v-if=
"!isAuth"
class=
"ellipsis"
><a
href=
"javascript:"
class=
"links"
>
{{
item
.
name
}}
</a></span>
<span
class=
"ellipsis"
><a
href=
"javascript:"
class=
"links"
>
{{
item
.
name
}}
</a></span>
</td>
<td><
span
class=
"ellipsis"
>
{{
item
.
processInstanceName
}}
</span
></td>
<td><
a
href=
"javascript:"
class=
"links"
@
click=
"_go(item)"
><span
class=
"ellipsis"
>
{{
item
.
processInstanceName
}}
</span></a
></td>
<td><span>
{{
item
.
taskType
}}
</span></td>
<td><span
v-html=
"_rtState(item.state)"
style=
"cursor: pointer;"
></span></td>
<td><span>
{{
item
.
submitTime
|
formatDate
}}
</span></td>
...
...
@@ -125,7 +124,10 @@
})
}
})
}
},
_go
(
item
)
{
this
.
$router
.
push
({
path
:
`/projects/instance/list/
${
item
.
processInstanceId
}
`
})
},
},
watch
:
{
taskInstanceList
(
a
)
{
...
...
@@ -142,4 +144,4 @@
},
components
:
{
}
}
</
script
>
\ No newline at end of file
</
script
>
escheduler-ui/src/js/module/i18n/locale/en_US.js
浏览文件 @
02d5c53a
...
...
@@ -111,6 +111,8 @@ export default {
'
Please enter ExecutorPlease enter Executor core number
'
:
'
Please enter ExecutorPlease enter Executor core number
'
,
'
Core number should be positive integer
'
:
'
Core number should be positive integer
'
,
'
SQL Type
'
:
'
SQL Type
'
,
'
Title
'
:
'
Title
'
,
'
Please enter the title of email
'
:
'
Please enter the title of email
'
,
'
Table
'
:
'
Table
'
,
'
Attachment
'
:
'
Attachment
'
,
'
SQL Parameter
'
:
'
SQL Parameter
'
,
...
...
escheduler-ui/src/js/module/i18n/locale/zh_CN.js
浏览文件 @
02d5c53a
...
...
@@ -111,6 +111,8 @@ export default {
'
Please enter ExecutorPlease enter Executor core number
'
:
'
请填写Executor内核数
'
,
'
Core number should be positive integer
'
:
'
内核数为正整数
'
,
'
SQL Type
'
:
'
sql类型
'
,
'
Title
'
:
'
主题
'
,
'
Please enter the title of email
'
:
'
请输入邮件主题
'
,
'
Table
'
:
'
表格
'
,
'
Attachment
'
:
'
附件
'
,
'
SQL Parameter
'
:
'
sql参数
'
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录