Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
三久
DolphinScheduler
提交
7022b181
DolphinScheduler
项目概览
三久
/
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,发现更多精彩内容 >>
未验证
提交
7022b181
编写于
3月 23, 2022
作者:
A
Amy0104
提交者:
GitHub
3月 23, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Fix][UI Next][V1.0.0-Alpha] Fix the send email and the log not shown (#9112)
上级
8d1974b9
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
173 addition
and
54 deletion
+173
-54
dolphinscheduler-ui-next/src/locales/modules/en_US.ts
dolphinscheduler-ui-next/src/locales/modules/en_US.ts
+9
-1
dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts
dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts
+9
-1
dolphinscheduler-ui-next/src/utils/column-width-config.ts
dolphinscheduler-ui-next/src/utils/column-width-config.ts
+1
-1
dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-datasource.ts
...ws/projects/task/components/node/fields/use-datasource.ts
+9
-7
dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-sql-type.ts
...iews/projects/task/components/node/fields/use-sql-type.ts
+126
-31
dolphinscheduler-ui-next/src/views/projects/task/components/node/format-data.ts
...xt/src/views/projects/task/components/node/format-data.ts
+4
-1
dolphinscheduler-ui-next/src/views/projects/task/components/node/index.module.scss
...src/views/projects/task/components/node/index.module.scss
+3
-0
dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-sql.ts
.../src/views/projects/task/components/node/tasks/use-sql.ts
+7
-11
dolphinscheduler-ui-next/src/views/projects/task/components/node/types.ts
...-ui-next/src/views/projects/task/components/node/types.ts
+4
-0
dolphinscheduler-ui-next/src/views/projects/task/definition/use-table.ts
...r-ui-next/src/views/projects/task/definition/use-table.ts
+1
-1
未找到文件。
dolphinscheduler-ui-next/src/locales/modules/en_US.ts
浏览文件 @
7022b181
...
...
@@ -906,7 +906,15 @@ const project = {
fix_value
:
'
FixValue
'
,
required
:
'
required
'
,
emr_flow_define_json
:
'
jobFlowDefineJson
'
,
emr_flow_define_json_tips
:
'
Please enter the definition of the job flow.
'
emr_flow_define_json_tips
:
'
Please enter the definition of the job flow.
'
,
send_email
:
'
Send Email
'
,
log_display
:
'
Log display
'
,
rows_of_result
:
'
rows of result
'
,
title
:
'
Title
'
,
title_tips
:
'
Please enter the title of email
'
,
alarm_group
:
'
Alarm group
'
,
alarm_group_tips
:
'
Alarm group required
'
,
integer_tips
:
'
Please enter a positive integer
'
}
}
...
...
dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts
浏览文件 @
7022b181
...
...
@@ -896,7 +896,15 @@ const project = {
fix_value
:
'
固定值
'
,
required
:
'
必填
'
,
emr_flow_define_json
:
'
jobFlowDefineJson
'
,
emr_flow_define_json_tips
:
'
请输入工作流定义
'
emr_flow_define_json_tips
:
'
请输入工作流定义
'
,
send_email
:
'
发送邮件
'
,
log_display
:
'
日志显示
'
,
rows_of_result
:
'
行查询结果
'
,
title
:
'
主题
'
,
title_tips
:
'
请输入邮件主题
'
,
alarm_group
:
'
告警组
'
,
alarm_group_tips
:
'
告警组必填
'
,
integer_tips
:
'
请输入一个正整数
'
}
}
...
...
dolphinscheduler-ui-next/src/utils/column-width-config.ts
浏览文件 @
7022b181
...
...
@@ -38,7 +38,7 @@ export const COLUMN_WIDTH_CONFIG = {
width
:
120
},
type
:
{
width
:
1
2
0
width
:
1
3
0
},
version
:
{
width
:
80
...
...
dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-datasource.ts
浏览文件 @
7022b181
...
...
@@ -28,7 +28,7 @@ export function useDatasource(
):
IJsonItem
{
const
{
t
}
=
useI18n
()
const
options
=
ref
([]
as
{
label
:
string
;
value
:
string
}[])
const
options
=
ref
([]
as
{
label
:
string
;
value
:
number
}[])
const
loading
=
ref
(
false
)
const
defaultValue
=
ref
(
null
)
...
...
@@ -45,11 +45,12 @@ export function useDatasource(
defaultValue
.
value
=
null
options
.
value
=
[]
res
.
map
((
item
:
any
)
=>
{
options
.
value
.
push
({
label
:
item
.
name
,
value
:
String
(
item
.
id
)
})
})
if
(
options
.
value
&&
model
.
datasource
)
{
const
item
=
find
(
options
.
value
,
{
value
:
String
(
model
.
datasource
)
})
options
.
value
=
res
.
map
((
item
:
any
)
=>
({
label
:
item
.
name
,
value
:
item
.
id
}))
if
(
options
.
value
.
length
&&
model
.
datasource
)
{
const
item
=
find
(
options
.
value
,
{
value
:
model
.
datasource
})
if
(
!
item
)
{
model
.
datasource
=
null
}
...
...
@@ -70,7 +71,7 @@ export function useDatasource(
})
return
{
type
:
'
select
'
,
field
:
field
?
field
:
'
datasource
'
,
field
:
field
||
'
datasource
'
,
span
:
12
,
name
:
t
(
'
project.node.datasource_instances
'
),
props
:
{
...
...
@@ -79,6 +80,7 @@ export function useDatasource(
options
:
options
,
validate
:
{
trigger
:
[
'
input
'
,
'
blur
'
],
type
:
'
number
'
,
required
:
true
}
}
...
...
dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-sql-type.ts
浏览文件 @
7022b181
...
...
@@ -15,54 +15,149 @@
* limitations under the License.
*/
import
{
ref
,
onMounted
}
from
'
vue
'
import
{
ref
,
onMounted
,
computed
,
h
}
from
'
vue
'
import
{
useI18n
}
from
'
vue-i18n
'
import
{
listAlertGroupById
}
from
'
@/service/modules/alert-group
'
import
styles
from
'
../index.module.scss
'
import
type
{
IJsonItem
}
from
'
../types
'
export
function
useSqlType
(
unusedModel
:
{
[
field
:
string
]:
any
}):
IJsonItem
{
export
function
useSqlType
(
model
:
{
[
field
:
string
]:
any
}):
IJsonItem
[]
{
const
{
t
}
=
useI18n
()
const
options
=
ref
([]
as
{
label
:
string
;
value
:
string
}[]
)
const
loading
=
ref
(
false
)
const
sqlTypes
=
[
const
querySpan
=
computed
(()
=>
(
model
.
sqlType
===
'
0
'
?
6
:
0
))
const
emailSpan
=
computed
(()
=>
(
model
.
sendEmail
?
24
:
0
)
)
const
groups
=
ref
([]
)
const
groupsLoading
=
ref
(
false
)
const
SQL_TYPES
=
[
{
id
:
'
0
'
,
code
:
t
(
'
project.node.sql_type_query
'
)
value
:
'
0
'
,
label
:
t
(
'
project.node.sql_type_query
'
)
},
{
id
:
'
1
'
,
code
:
t
(
'
project.node.sql_type_non_query
'
)
value
:
'
1
'
,
label
:
t
(
'
project.node.sql_type_non_query
'
)
}
]
const
getSqlTypes
=
async
()
=>
{
if
(
loading
.
value
)
return
loading
.
value
=
true
options
.
value
=
sqlTypes
.
map
((
item
)
=>
({
label
:
item
.
code
,
const
getGroups
=
async
()
=>
{
if
(
groupsLoading
.
value
)
return
groupsLoading
.
value
=
true
const
res
=
await
listAlertGroupById
()
groups
.
value
=
res
.
map
((
item
:
{
id
:
number
;
groupName
:
string
})
=>
({
label
:
item
.
groupName
,
value
:
item
.
id
}))
l
oading
.
value
=
false
groupsL
oading
.
value
=
false
}
onMounted
(()
=>
{
get
SqlType
s
()
get
Group
s
()
})
return
{
type
:
'
select
'
,
field
:
'
sqlType
'
,
span
:
12
,
name
:
t
(
'
project.node.sql_type
'
),
props
:
{
loading
:
loading
return
[
{
type
:
'
select
'
,
field
:
'
sqlType
'
,
span
:
6
,
name
:
t
(
'
project.node.sql_type
'
),
options
:
SQL_TYPES
,
validate
:
{
trigger
:
[
'
input
'
,
'
blur
'
],
required
:
true
}
},
{
type
:
'
switch
'
,
field
:
'
sendEmail
'
,
span
:
querySpan
,
name
:
t
(
'
project.node.send_email
'
)
},
options
:
options
,
validate
:
{
trigger
:
[
'
input
'
,
'
blur
'
],
required
:
true
{
type
:
'
select
'
,
field
:
'
displayRows
'
,
span
:
querySpan
,
name
:
t
(
'
project.node.log_display
'
),
options
:
DISPLAY_ROWS
,
props
:
{
filterable
:
true
,
tag
:
true
},
validate
:
{
trigger
:
[
'
input
'
,
'
blur
'
],
validator
(
unuse
,
value
)
{
if
(
!
/^
\+?[
1-9
][
0-9
]
*$/
.
test
(
value
))
{
return
new
Error
(
t
(
'
project.node.integer_tips
'
))
}
}
}
},
value
:
'
0
'
}
{
type
:
'
custom
'
,
field
:
'
displayRowsTips
'
,
span
:
querySpan
,
widget
:
h
(
'
div
'
,
{
class
:
styles
[
'
display-rows-tips
'
]
},
t
(
'
project.node.rows_of_result
'
)
)
},
{
type
:
'
input
'
,
field
:
'
title
'
,
name
:
t
(
'
project.node.title
'
),
props
:
{
placeholder
:
t
(
'
project.node.title_tips
'
)
},
span
:
emailSpan
,
validate
:
{
trigger
:
[
'
input
'
,
'
blur
'
],
required
:
true
,
validator
(
unuse
,
value
)
{
if
(
model
.
sendEmail
&&
!
value
)
return
new
Error
(
t
(
'
project.node.title_tips
'
))
}
}
},
{
type
:
'
select
'
,
field
:
'
groupId
'
,
name
:
t
(
'
project.node.alarm_group
'
),
options
:
groups
,
span
:
emailSpan
,
props
:
{
loading
:
groupsLoading
,
placeholder
:
t
(
'
project.node.alarm_group_tips
'
)
},
validate
:
{
trigger
:
[
'
input
'
,
'
blur
'
],
required
:
true
,
validator
(
unuse
,
value
)
{
if
(
model
.
sendEmail
&&
!
value
)
return
new
Error
(
t
(
'
project.node.alarm_group_tips
'
))
}
}
}
]
}
const
DISPLAY_ROWS
=
[
{
label
:
'
1
'
,
value
:
1
},
{
label
:
'
10
'
,
value
:
10
},
{
label
:
'
25
'
,
value
:
25
},
{
label
:
'
50
'
,
value
:
50
},
{
label
:
'
100
'
,
value
:
100
}
]
dolphinscheduler-ui-next/src/views/projects/task/components/node/format-data.ts
浏览文件 @
7022b181
...
...
@@ -179,6 +179,10 @@ export function formatParams(data: INodeData): {
taskParams
.
sqlType
=
data
.
sqlType
taskParams
.
preStatements
=
data
.
preStatements
taskParams
.
postStatements
=
data
.
postStatements
taskParams
.
sendEmail
=
data
.
sendEmail
taskParams
.
displayRows
=
data
.
displayRows
taskParams
.
title
=
data
.
title
taskParams
.
groupId
=
data
.
groupId
}
if
(
data
.
taskType
===
'
PROCEDURE
'
)
{
...
...
@@ -477,7 +481,6 @@ export function formatModel(data: ITaskData) {
if
(
data
.
taskParams
?.
conditionResult
?.
failedNode
?.
length
)
{
params
.
failedBranch
=
data
.
taskParams
?.
conditionResult
.
failedNode
[
0
]
}
return
params
}
...
...
dolphinscheduler-ui-next/src/views/projects/task/components/node/index.module.scss
浏览文件 @
7022b181
...
...
@@ -51,3 +51,6 @@
left
:
20px
;
}
}
.display-rows-tips
{
margin-top
:
32px
;
}
dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-sql.ts
浏览文件 @
7022b181
...
...
@@ -44,16 +44,12 @@ export function useSql({
workerGroup
:
'
default
'
,
delayTime
:
0
,
timeout
:
30
,
type
:
data
?.
taskParams
?.
type
?
data
?.
taskParams
?.
type
:
'
MYSQL
'
,
datasource
:
data
?.
taskParams
?.
datasource
,
sql
:
data
?.
taskParams
?.
sql
,
sqlType
:
data
?.
taskParams
?.
sqlType
,
preStatements
:
data
?.
taskParams
?.
preStatements
?
data
?.
taskParams
?.
preStatements
:
[],
postStatements
:
data
?.
taskParams
?.
postStatements
?
data
?.
taskParams
?.
postStatements
:
[]
type
:
'
MYSQL
'
,
displayRows
:
10
,
sql
:
''
,
sqlType
:
'
0
'
,
preStatements
:
[],
postStatements
:
[]
}
as
INodeData
)
let
extra
:
IJsonItem
[]
=
[]
...
...
@@ -85,7 +81,7 @@ export function useSql({
...
Fields
.
useTimeoutAlarm
(
model
),
Fields
.
useDatasourceType
(
model
),
Fields
.
useDatasource
(
model
),
Fields
.
useSqlType
(
model
),
...
Fields
.
useSqlType
(
model
),
...
Fields
.
useSql
(
model
),
Fields
.
usePreTasks
()
]
as
IJsonItem
[],
...
...
dolphinscheduler-ui-next/src/views/projects/task/components/node/types.ts
浏览文件 @
7022b181
...
...
@@ -237,6 +237,10 @@ interface ITaskParams {
datasource
?:
string
sql
?:
string
sqlType
?:
string
sendEmail
?:
boolean
displayRows
?:
number
title
?:
string
groupId
?:
string
preStatements
?:
string
[]
postStatements
?:
string
[]
method
?:
string
...
...
dolphinscheduler-ui-next/src/views/projects/task/definition/use-table.ts
浏览文件 @
7022b181
...
...
@@ -87,7 +87,7 @@ export function useTable(onEdit: Function) {
)
}
},
...
COLUMN_WIDTH_CONFIG
[
'
state
'
]
width
:
130
},
{
title
:
t
(
'
project.task.task_type
'
),
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录