Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lhongjum2003
DolphinScheduler
提交
caafb1f9
DolphinScheduler
项目概览
lhongjum2003
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
2
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,发现更多精彩内容 >>
未验证
提交
caafb1f9
编写于
4月 15, 2019
作者:
millionfor
提交者:
GitHub
4月 15, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #60 from millionfor/dev-20190415
Dev 20190415
上级
f14f8866
b5188004
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
45 addition
and
43 deletion
+45
-43
escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
...ges/projects/pages/definition/pages/list/_source/list.vue
+1
-1
escheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue
...onf/home/pages/projects/pages/definition/timing/index.vue
+1
-1
escheduler-ui/src/js/conf/home/pages/projects/pages/timing/index.vue
...ui/src/js/conf/home/pages/projects/pages/timing/index.vue
+1
-1
escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
.../conf/home/pages/resource/pages/file/pages/list/index.vue
+1
-1
escheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue
.../src/js/conf/home/pages/security/pages/tenement/index.vue
+1
-1
escheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue
...-ui/src/js/conf/home/pages/security/pages/users/index.vue
+1
-1
escheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue
...js/conf/home/pages/security/pages/warningGroups/index.vue
+1
-1
escheduler-ui/src/js/conf/home/router/index.js
escheduler-ui/src/js/conf/home/router/index.js
+6
-6
escheduler-ui/src/js/conf/home/store/security/actions.js
escheduler-ui/src/js/conf/home/store/security/actions.js
+1
-1
escheduler-ui/src/js/module/components/nav/nav.vue
escheduler-ui/src/js/module/components/nav/nav.vue
+2
-2
escheduler-ui/src/js/module/components/secondaryMenu/menu.js
escheduler-ui/src/js/module/components/secondaryMenu/menu.js
+8
-8
escheduler-ui/src/js/module/i18n/locale/en_US.js
escheduler-ui/src/js/module/i18n/locale/en_US.js
+10
-9
escheduler-ui/src/js/module/i18n/locale/zh_CN.js
escheduler-ui/src/js/module/i18n/locale/zh_CN.js
+11
-10
未找到文件。
escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
浏览文件 @
caafb1f9
...
...
@@ -59,7 +59,7 @@
<x-button
type=
"info"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('Timing')"
@
click=
"_timing(item)"
:disabled=
"item.releaseState !== 'ONLINE' || item.scheduleReleaseState !== null"
v-ps=
"['GENERAL_USER']"
icon=
"iconfont icon-timer"
>
<!--
{{
$t
(
'
定时
'
)
}}
-->
</x-button>
<x-button
type=
"error"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('offline')"
@
click=
"_downline(item)"
v-if=
"item.releaseState === 'ONLINE'"
v-ps=
"['GENERAL_USER']"
icon=
"iconfont icon-erji-xiaxianjilu"
>
<!--
{{
$t
(
'
下线
'
)
}}
-->
</x-button>
<x-button
type=
"warning"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('online')"
@
click=
"_poponline(item)"
v-if=
"item.releaseState === 'OFFLINE'"
v-ps=
"['GENERAL_USER']"
icon=
"iconfont icon-erji-xiaxianjilu-copy"
>
<!--
{{
$t
(
'
上线
'
)
}}
-->
</x-button>
<x-button
type=
"info"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('Cron Manage
ment
')"
@
click=
"_timingManage(item)"
:disabled=
"item.releaseState !== 'ONLINE'"
v-ps=
"['GENERAL_USER']"
icon=
"iconfont icon-paibanguanli"
>
<!--
{{
$t
(
'
定时管理
'
)
}}
-->
</x-button>
<x-button
type=
"info"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('Cron Manage')"
@
click=
"_timingManage(item)"
:disabled=
"item.releaseState !== 'ONLINE'"
v-ps=
"['GENERAL_USER']"
icon=
"iconfont icon-paibanguanli"
>
<!--
{{
$t
(
'
定时管理
'
)
}}
-->
</x-button>
<x-button
type=
"info"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('TreeView')"
@
click=
"_treeView(item)"
icon=
"iconfont icon-juxingkaobei"
>
<!--
{{
$t
(
'
树形图
'
)
}}
-->
</x-button>
</td>
</tr>
...
...
escheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue
浏览文件 @
caafb1f9
<
template
>
<div
class=
"main-layout-box"
>
<m-secondary-menu
:type=
"'projects'"
></m-secondary-menu>
<m-list-construction
:title=
"$t('Cron Manage
ment
')"
>
<m-list-construction
:title=
"$t('Cron Manage')"
>
<template
slot=
"content"
>
<m-list></m-list>
</
template
>
...
...
escheduler-ui/src/js/conf/home/pages/projects/pages/timing/index.vue
浏览文件 @
caafb1f9
<
template
>
<m-list-construction
:title=
"$t('Cron Manage
ment
')"
>
<m-list-construction
:title=
"$t('Cron Manage')"
>
<template
slot=
"content"
>
<m-list></m-list>
</
template
>
...
...
escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
浏览文件 @
caafb1f9
<
template
>
<div
class=
"main-layout-box"
>
<m-secondary-menu
:type=
"'resource'"
></m-secondary-menu>
<m-list-construction
:title=
"$t('File Manage
ment
')"
>
<m-list-construction
:title=
"$t('File Manage')"
>
<template
slot=
"conditions"
>
<m-conditions
@
on-conditions=
"_onConditions"
>
<template
slot=
"button-group"
>
...
...
escheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue
浏览文件 @
caafb1f9
...
...
@@ -2,7 +2,7 @@
<div
class=
"main-layout-box"
>
<m-secondary-menu
:type=
"'security'"
></m-secondary-menu>
<template>
<m-list-construction
:title=
"$t('Tenant Manage
ment
')"
>
<m-list-construction
:title=
"$t('Tenant Manage')"
>
<template
slot=
"conditions"
>
<m-conditions
@
on-conditions=
"_onConditions"
>
<template
slot=
"button-group"
>
...
...
escheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue
浏览文件 @
caafb1f9
...
...
@@ -2,7 +2,7 @@
<div
class=
"main-layout-box"
>
<m-secondary-menu
:type=
"'security'"
></m-secondary-menu>
<template>
<m-list-construction
:title=
"$t('User Manage
ment
')"
>
<m-list-construction
:title=
"$t('User Manage')"
>
<template
slot=
"conditions"
>
<m-conditions
@
on-conditions=
"_onConditions"
>
<template
slot=
"button-group"
>
...
...
escheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue
浏览文件 @
caafb1f9
...
...
@@ -2,7 +2,7 @@
<div
class=
"main-layout-box"
>
<m-secondary-menu
:type=
"'security'"
></m-secondary-menu>
<template>
<m-list-construction
:title=
"'Warning group manage
ment
'"
>
<m-list-construction
:title=
"'Warning group manage'"
>
<template
slot=
"conditions"
>
<m-conditions
@
on-conditions=
"_onConditions"
>
<template
slot=
"button-group"
>
...
...
escheduler-ui/src/js/conf/home/router/index.js
浏览文件 @
caafb1f9
...
...
@@ -215,7 +215,7 @@ const router = new Router({
name
:
'
file
'
,
component
:
resolve
=>
require
([
'
../pages/resource/pages/file/pages/list/index
'
],
resolve
),
meta
:
{
title
:
`
${
i18n
.
$t
(
'
File Manage
ment
'
)}
`
title
:
`
${
i18n
.
$t
(
'
File Manage
'
)}
`
}
},
{
...
...
@@ -247,7 +247,7 @@ const router = new Router({
name
:
'
udf
'
,
component
:
resolve
=>
require
([
'
../pages/resource/pages/udf/index
'
],
resolve
),
meta
:
{
title
:
`
${
i18n
.
$t
(
'
UDF manage
ment
'
)}
`
title
:
`
${
i18n
.
$t
(
'
UDF manage
'
)}
`
},
children
:
[
{
...
...
@@ -307,7 +307,7 @@ const router = new Router({
name
:
'
tenement-manage
'
,
component
:
resolve
=>
require
([
'
../pages/security/pages/tenement/index
'
],
resolve
),
meta
:
{
title
:
`
${
i18n
.
$t
(
'
Tenant Manage
ment
'
)}
`
title
:
`
${
i18n
.
$t
(
'
Tenant Manage
'
)}
`
}
},
{
...
...
@@ -315,7 +315,7 @@ const router = new Router({
name
:
'
users-manage
'
,
component
:
resolve
=>
require
([
'
../pages/security/pages/users/index
'
],
resolve
),
meta
:
{
title
:
`
${
i18n
.
$t
(
'
User Manage
ment
'
)}
`
title
:
`
${
i18n
.
$t
(
'
User Manage
'
)}
`
}
},
{
...
...
@@ -323,7 +323,7 @@ const router = new Router({
name
:
'
warning-groups-manage
'
,
component
:
resolve
=>
require
([
'
../pages/security/pages/warningGroups/index
'
],
resolve
),
meta
:
{
title
:
`
${
i18n
.
$t
(
'
Warning group manage
ment
'
)}
`
title
:
`
${
i18n
.
$t
(
'
Warning group manage
'
)}
`
}
},
{
...
...
@@ -339,7 +339,7 @@ const router = new Router({
name
:
'
servers-manage
'
,
component
:
resolve
=>
require
([
'
../pages/security/pages/servers/index
'
],
resolve
),
meta
:
{
title
:
`
${
i18n
.
$t
(
'
Servers manage
ment
'
)}
`
title
:
`
${
i18n
.
$t
(
'
Servers manage
'
)}
`
},
redirect
:
{
name
:
'
servers-master
'
...
...
escheduler-ui/src/js/conf/home/store/security/actions.js
浏览文件 @
caafb1f9
...
...
@@ -140,7 +140,7 @@ export default {
}
let
param
=
{}
// Manage
ment
user
// Manage user
if
(
o
.
type
===
'
user
'
)
{
param
.
alertgroupId
=
payload
.
id
}
else
{
...
...
escheduler-ui/src/js/module/components/nav/nav.vue
浏览文件 @
caafb1f9
...
...
@@ -28,7 +28,7 @@
<div
class=
"clearfix list"
>
<div
class=
"nav-links"
>
<router-link
:to=
"
{ path: '/datasource'}" tag="a" active-class="active">
<span><i
class=
"iconfont"
>

</i>
{{
$t
(
'
Datasource
'
)
}}
</span><b></b>
<span><i
class=
"iconfont"
>

</i>
{{
$t
(
'
Datasource
manage
'
)
}}
</span><b></b>
</router-link>
</div>
</div>
...
...
@@ -121,7 +121,7 @@
</router-link>
<router-link
:to=
"
{ path: '/datasource'}" tag="li" active-class="active">
<i
class=
"iconfont"
>

</i>
<span>
{{
$t
(
'
Datasource
'
)
}}
</span>
<span>
{{
$t
(
'
Datasource
manage
'
)
}}
</span>
</router-link>
<router-link
:to=
"
{ path: '/security'}" tag="li" active-class="active" v-ps="['ADMIN_USER']">
<i
class=
"iconfont"
>

</i>
...
...
escheduler-ui/src/js/module/components/secondaryMenu/menu.js
浏览文件 @
caafb1f9
...
...
@@ -59,7 +59,7 @@ let menu = {
security
:
[
{
name
:
`
${
i18n
.
$t
(
'
Tenant Manage
ment
'
)}
`
,
name
:
`
${
i18n
.
$t
(
'
Tenant Manage
'
)}
`
,
id
:
1
,
path
:
'
tenement-manage
'
,
isOpen
:
true
,
...
...
@@ -67,7 +67,7 @@ let menu = {
children
:
[]
},
{
name
:
`
${
i18n
.
$t
(
'
User Manage
ment
'
)}
`
,
name
:
`
${
i18n
.
$t
(
'
User Manage
'
)}
`
,
id
:
1
,
path
:
'
users-manage
'
,
isOpen
:
true
,
...
...
@@ -75,7 +75,7 @@ let menu = {
children
:
[]
},
{
name
:
`
${
i18n
.
$t
(
'
Warning group manage
ment
'
)}
`
,
name
:
`
${
i18n
.
$t
(
'
Warning group manage
'
)}
`
,
id
:
1
,
path
:
'
warning-groups-manage
'
,
isOpen
:
true
,
...
...
@@ -91,7 +91,7 @@ let menu = {
children
:
[]
},
{
name
:
`
${
i18n
.
$t
(
'
Servers manage
ment
'
)}
`
,
name
:
`
${
i18n
.
$t
(
'
Servers manage
'
)}
`
,
id
:
1
,
path
:
''
,
isOpen
:
true
,
...
...
@@ -112,7 +112,7 @@ let menu = {
],
resource
:
[
{
name
:
`
${
i18n
.
$t
(
'
File Manage
ment
'
)}
`
,
name
:
`
${
i18n
.
$t
(
'
File Manage
'
)}
`
,
id
:
1
,
path
:
'
file
'
,
isOpen
:
true
,
...
...
@@ -121,7 +121,7 @@ let menu = {
disabled
:
false
},
{
name
:
`
${
i18n
.
$t
(
'
UDF manage
ment
'
)}
`
,
name
:
`
${
i18n
.
$t
(
'
UDF manage
'
)}
`
,
id
:
1
,
path
:
''
,
isOpen
:
true
,
...
...
@@ -129,12 +129,12 @@ let menu = {
disabled
:
false
,
children
:
[
{
name
:
`
${
i18n
.
$t
(
'
Resource manage
ment
'
)}
`
,
name
:
`
${
i18n
.
$t
(
'
Resource manage
'
)}
`
,
path
:
'
resource-udf-resource
'
,
id
:
1
},
{
name
:
`
${
i18n
.
$t
(
'
Function manage
ment
'
)}
`
,
name
:
`
${
i18n
.
$t
(
'
Function manage
'
)}
`
,
path
:
'
resource-udf-function
'
,
id
:
2
}
...
...
escheduler-ui/src/js/module/i18n/locale/en_US.js
浏览文件 @
caafb1f9
...
...
@@ -67,10 +67,10 @@ export default {
'
Project Home
'
:
'
Project Home
'
,
'
Project Manage
'
:
'
Project
'
,
'
Create Project
'
:
'
Create Project
'
,
'
Cron Manage
ment
'
:
'
Cron Management
'
,
'
Tenant Manage
ment
'
:
'
Tenant Management
'
,
'
Cron Manage
'
:
'
Cron Manage
'
,
'
Tenant Manage
'
:
'
Tenant Manage
'
,
'
Create Tenant
'
:
'
Create Tenant
'
,
'
User Manage
ment
'
:
'
User Management
'
,
'
User Manage
'
:
'
User Manage
'
,
'
Create User
'
:
'
Create User
'
,
'
User Information
'
:
'
User Information
'
,
'
Edit Password
'
:
'
Edit Password
'
,
...
...
@@ -220,7 +220,7 @@ export default {
'
Download Details
'
:
'
Download Details
'
,
'
Return
'
:
'
Return
'
,
'
Save
'
:
'
Save
'
,
'
File Manage
ment
'
:
'
File Management
'
,
'
File Manage
'
:
'
File Manage
'
,
'
Upload Files
'
:
'
Upload Files
'
,
'
Create UDF Function
'
:
'
Create UDF Function
'
,
'
Upload UDF Resources
'
:
'
Upload UDF Resources
'
,
...
...
@@ -316,11 +316,11 @@ export default {
'
Process
'
:
'
Process
'
,
'
Process definition
'
:
'
Process definition
'
,
'
Task record
'
:
'
Task record
'
,
'
Warning group manage
ment
'
:
'
Warning group management
'
,
'
Servers manage
ment
'
:
'
Servers management
'
,
'
UDF manage
ment
'
:
'
UDF management
'
,
'
Resource manage
ment
'
:
'
Resource management
'
,
'
Function manage
ment
'
:
'
Function management
'
,
'
Warning group manage
'
:
'
Warning group manage
'
,
'
Servers manage
'
:
'
Servers manage
'
,
'
UDF manage
'
:
'
UDF manage
'
,
'
Resource manage
'
:
'
Resource manage
'
,
'
Function manage
'
:
'
Function manage
'
,
'
Edit password
'
:
'
Edit password
'
,
'
Ordinary users
'
:
'
Ordinary users
'
,
'
Create process
'
:
'
Create process
'
,
...
...
@@ -409,4 +409,5 @@ export default {
'
Queue manage
'
:
'
Queue manage
'
,
'
Create queue
'
:
'
Create queue
'
,
'
Edit queue
'
:
'
Edit queue
'
,
'
Datasource manage
'
:
'
Datasource
'
,
}
\ No newline at end of file
escheduler-ui/src/js/module/i18n/locale/zh_CN.js
浏览文件 @
caafb1f9
...
...
@@ -67,10 +67,10 @@ export default {
'
Project Home
'
:
'
项目首页
'
,
'
Project Manage
'
:
'
项目管理
'
,
'
Create Project
'
:
'
创建项目
'
,
'
Cron Manage
ment
'
:
'
定时管理
'
,
'
Tenant Manage
ment
'
:
'
租户管理
'
,
'
Cron Manage
'
:
'
定时管理
'
,
'
Tenant Manage
'
:
'
租户管理
'
,
'
Create Tenant
'
:
'
创建租户
'
,
'
User Manage
ment
'
:
'
用户管理
'
,
'
User Manage
'
:
'
用户管理
'
,
'
Create User
'
:
'
创建用户
'
,
'
User Information
'
:
'
用户信息
'
,
'
Edit Password
'
:
'
密码修改
'
,
...
...
@@ -220,7 +220,7 @@ export default {
'
Download Details
'
:
'
下载详情
'
,
'
Return
'
:
'
返回
'
,
'
Save
'
:
'
保存
'
,
'
File Manage
ment
'
:
'
文件管理
'
,
'
File Manage
'
:
'
文件管理
'
,
'
Upload Files
'
:
'
上传文件
'
,
'
Create UDF Function
'
:
'
创建UDF函数
'
,
'
Upload UDF Resources
'
:
'
上传UDF资源
'
,
...
...
@@ -315,11 +315,11 @@ export default {
'
Process
'
:
'
工作流
'
,
'
Process definition
'
:
'
工作流定义
'
,
'
Task record
'
:
'
任务记录
'
,
'
Warning group manage
ment
'
:
'
告警组管理
'
,
'
Servers manage
ment
'
:
'
服务管理
'
,
'
UDF manage
ment
'
:
'
UDF管理
'
,
'
Resource manage
ment
'
:
'
资源管理
'
,
'
Function manage
ment
'
:
'
函数管理
'
,
'
Warning group manage
'
:
'
告警组管理
'
,
'
Servers manage
'
:
'
服务管理
'
,
'
UDF manage
'
:
'
UDF管理
'
,
'
Resource manage
'
:
'
资源管理
'
,
'
Function manage
'
:
'
函数管理
'
,
'
Edit password
'
:
'
修改密码
'
,
'
Ordinary users
'
:
'
普通用户
'
,
'
Create process
'
:
'
创建工作流
'
,
...
...
@@ -366,7 +366,7 @@ export default {
'
User Center
'
:
'
用户中心
'
,
'
Please enter method
'
:
'
请输入方法
'
,
'
none
'
:
'
无
'
,
'
name
'
:
'
按
名称
'
,
'
name
'
:
'
名称
'
,
'
Process priority
'
:
'
流程优先级
'
,
'
Task priority
'
:
'
任务优先级
'
,
'
Task timeout alarm
'
:
'
任务超时告警
'
,
...
...
@@ -408,4 +408,5 @@ export default {
'
Queue manage
'
:
'
队列管理
'
,
'
Create queue
'
:
'
创建队列
'
,
'
Edit queue
'
:
'
编辑队列
'
,
'
Datasource manage
'
:
'
数据源中心
'
,
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录