Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
6ae18371
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 搜索 >>
提交
6ae18371
编写于
8月 18, 2020
作者:
Q
qiaozhanwei
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'remotes/upstream/1.3.2-release' into 1.3.2-release
上级
94e453cb
cc208279
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
27 addition
and
18 deletion
+27
-18
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/datax.vue
.../js/conf/home/pages/dag/_source/formModel/tasks/datax.vue
+3
-3
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue
...js/conf/home/pages/dag/_source/formModel/tasks/python.vue
+6
-3
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
...rc/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
+6
-3
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue
.../js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue
+6
-3
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
...rc/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
+1
-1
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue
...nf/home/pages/resource/pages/file/pages/details/index.vue
+1
-1
dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue
.../conf/home/pages/user/pages/token/_source/createToken.vue
+1
-1
dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/list.vue
.../src/js/conf/home/pages/user/pages/token/_source/list.vue
+1
-1
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+1
-1
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+1
-1
未找到文件。
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/datax.vue
浏览文件 @
6ae18371
...
...
@@ -207,7 +207,7 @@
this
.
customConfig
=
0
setTimeout
(()
=>
{
this
.
_handlerEditor
()
},
20
0
)
},
35
0
)
}
},
/**
...
...
@@ -431,11 +431,11 @@
if
(
this
.
customConfig
)
{
setTimeout
(()
=>
{
this
.
_handlerJsonEditor
()
},
20
0
)
},
35
0
)
}
else
{
setTimeout
(()
=>
{
this
.
_handlerEditor
()
},
20
0
)
},
35
0
)
}
},
destroyed
()
{
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue
浏览文件 @
6ae18371
...
...
@@ -321,9 +321,12 @@
}
},
mounted
()
{
setTimeout
(()
=>
{
this
.
_handlerEditor
()
},
200
)
// Added delay loading in script input box
this
.
$nextTick
(()
=>
{
setTimeout
(()
=>
{
this
.
_handlerEditor
()
},
350
)
})
},
destroyed
()
{
editor
.
toTextArea
()
// Uninstall
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
浏览文件 @
6ae18371
...
...
@@ -447,9 +447,12 @@
}
},
mounted
()
{
setTimeout
(()
=>
{
this
.
_handlerEditor
()
},
200
)
// Added delay loading in script input box
this
.
$nextTick
(()
=>
{
setTimeout
(()
=>
{
this
.
_handlerEditor
()
},
350
)
})
},
destroyed
()
{
/**
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue
浏览文件 @
6ae18371
...
...
@@ -982,9 +982,12 @@
},
mounted
()
{
setTimeout
(()
=>
{
this
.
_handlerEditor
()
},
200
)
// Added delay loading in script input box
this
.
$nextTick
(()
=>
{
setTimeout
(()
=>
{
this
.
_handlerEditor
()
},
350
)
})
setTimeout
(()
=>
{
this
.
srcQueryType
=
this
.
sourceMysqlParams
.
srcQueryType
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
浏览文件 @
6ae18371
...
...
@@ -677,7 +677,7 @@ JSP.prototype.saveStore = function () {
Vue
.
$message
.
warning
(
`
${
i18n
.
$t
(
'
The workflow canvas is abnormal and cannot be saved, please recreate
'
)}
`
)
return
false
}
// return false
// Storage node
store
.
commit
(
'
dag/setTasks
'
,
tasks
)
// Store coordinate information
...
...
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue
浏览文件 @
6ae18371
...
...
@@ -232,7 +232,7 @@
position
:
absolute
;
right
:
0
;
top
:
0
;
>
i
{
>
em
{
font-size
:
20px
;
color
:
#2d8cf0
;
cursor
:
pointer
;
...
...
dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue
浏览文件 @
6ae18371
...
...
@@ -23,7 +23,7 @@
<template
slot=
"content"
>
<div
class=
"create-token-model"
>
<m-list-box-f>
<template
slot=
"name"
><strong>
*
</strong>
{{
$t
(
'
Failure
time
'
)
}}
</
template
>
<template
slot=
"name"
><strong>
*
</strong>
{{
$t
(
'
Expiration
time
'
)
}}
</
template
>
<
template
slot=
"content"
>
<x-datepicker
:disabled-date=
"disabledDate"
...
...
dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/list.vue
浏览文件 @
6ae18371
...
...
@@ -29,7 +29,7 @@
<span>
Token
</span>
</th>
<th>
<span>
{{
$t
(
'
Failure
time
'
)
}}
</span>
<span>
{{
$t
(
'
Expiration
time
'
)
}}
</span>
</th>
<th>
<span>
{{
$t
(
'
Create Time
'
)
}}
</span>
...
...
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
浏览文件 @
6ae18371
...
...
@@ -466,7 +466,7 @@ export default {
'
Edit token
'
:
'
Edit token
'
,
'
Please enter the IP address separated by commas
'
:
'
Please enter the IP address separated by commas
'
,
'
Note: Multiple IP addresses have been comma separated
'
:
'
Note: Multiple IP addresses have been comma separated
'
,
'
Failure time
'
:
'
Failure
time
'
,
'
Expiration time
'
:
'
Expiration
time
'
,
User
:
'
User
'
,
'
Please enter token
'
:
'
Please enter token
'
,
'
Generate token
'
:
'
Generate token
'
,
...
...
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
浏览文件 @
6ae18371
...
...
@@ -461,7 +461,7 @@ export default {
'
Edit token
'
:
'
编辑令牌
'
,
'
Please enter the IP address separated by commas
'
:
'
请输入IP地址多个用英文逗号隔开
'
,
'
Note: Multiple IP addresses have been comma separated
'
:
'
注意:多个IP地址以英文逗号分割
'
,
'
Failure
time
'
:
'
失效时间
'
,
'
Expiration
time
'
:
'
失效时间
'
,
User
:
'
用户
'
,
'
Please enter token
'
:
'
请输入令牌
'
,
'
Generate token
'
:
'
生成令牌
'
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录