Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yanghaoyuan.sh
DolphinScheduler
提交
4d70e3ce
DolphinScheduler
项目概览
yanghaoyuan.sh
/
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,发现更多精彩内容 >>
提交
4d70e3ce
编写于
5月 07, 2020
作者:
B
break60
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of
https://github.com/apache/incubator-dolphinscheduler
into dev
上级
c49825db
fadfb281
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
4 addition
and
2 deletion
+4
-2
dolphinscheduler-common/src/main/resources/common.properties
dolphinscheduler-common/src/main/resources/common.properties
+1
-1
dolphinscheduler-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
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+1
-0
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+1
-0
未找到文件。
dolphinscheduler-common/src/main/resources/common.properties
浏览文件 @
4d70e3ce
...
@@ -62,5 +62,5 @@ yarn.application.status.address=http://ark1:8088/ws/v1/cluster/apps/%s
...
@@ -62,5 +62,5 @@ yarn.application.status.address=http://ark1:8088/ws/v1/cluster/apps/%s
# system env path
# system env path
#dolphinscheduler.env.path=env/dolphinscheduler_env.sh
#dolphinscheduler.env.path=env/dolphinscheduler_env.sh
development.state
=
false
kerberos.expire.time
=
7
kerberos.expire.time
=
7
\ No newline at end of file
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
浏览文件 @
4d70e3ce
...
@@ -92,7 +92,7 @@
...
@@ -92,7 +92,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"
icon=
"ans-icon-timer"
>
<!--
{{
$t
(
'
定时
'
)
}}
-->
</x-button>
<x-button
type=
"info"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('Timing')"
@
click=
"_timing(item)"
:disabled=
"item.releaseState !== 'ONLINE' || item.scheduleReleaseState !== null"
icon=
"ans-icon-timer"
>
<!--
{{
$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'"
icon=
"ans-icon-upward"
>
<!--
{{
$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'"
icon=
"ans-icon-upward"
>
<!--
{{
$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'"
icon=
"ans-icon-downward"
>
<!--
{{
$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'"
icon=
"ans-icon-downward"
>
<!--
{{
$t
(
'
上线
'
)
}}
-->
</x-button>
<x-button
type=
"info"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('Copy')"
@
click=
"_copyProcess(item)"
:disabled=
"item.releaseState === 'ONLINE'"
icon=
"ans-icon-copy"
>
<!--
{{
$t
(
'
复制
'
)
}}
-->
</x-button>
<x-button
type=
"info"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('Copy
Workflow
')"
@
click=
"_copyProcess(item)"
:disabled=
"item.releaseState === 'ONLINE'"
icon=
"ans-icon-copy"
>
<!--
{{
$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'"
icon=
"ans-icon-datetime"
>
<!--
{{
$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'"
icon=
"ans-icon-datetime"
>
<!--
{{
$t
(
'
定时管理
'
)
}}
-->
</x-button>
<x-poptip
<x-poptip
:ref=
"'poptip-delete-' + $index"
:ref=
"'poptip-delete-' + $index"
...
...
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
浏览文件 @
4d70e3ce
...
@@ -69,6 +69,7 @@ export default {
...
@@ -69,6 +69,7 @@ export default {
'
Project Manage
'
:
'
Project
'
,
'
Project Manage
'
:
'
Project
'
,
'
Create Project
'
:
'
Create Project
'
,
'
Create Project
'
:
'
Create Project
'
,
'
Cron Manage
'
:
'
Cron Manage
'
,
'
Cron Manage
'
:
'
Cron Manage
'
,
'
Copy Workflow
'
:
'
Copy Workflow
'
,
'
Tenant Manage
'
:
'
Tenant Manage
'
,
'
Tenant Manage
'
:
'
Tenant Manage
'
,
'
Create Tenant
'
:
'
Create Tenant
'
,
'
Create Tenant
'
:
'
Create Tenant
'
,
'
User Manage
'
:
'
User Manage
'
,
'
User Manage
'
:
'
User Manage
'
,
...
...
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
浏览文件 @
4d70e3ce
...
@@ -69,6 +69,7 @@ export default {
...
@@ -69,6 +69,7 @@ export default {
'
Project Manage
'
:
'
项目管理
'
,
'
Project Manage
'
:
'
项目管理
'
,
'
Create Project
'
:
'
创建项目
'
,
'
Create Project
'
:
'
创建项目
'
,
'
Cron Manage
'
:
'
定时管理
'
,
'
Cron Manage
'
:
'
定时管理
'
,
'
Copy Workflow
'
:
'
复制工作流
'
,
'
Tenant Manage
'
:
'
租户管理
'
,
'
Tenant Manage
'
:
'
租户管理
'
,
'
Create Tenant
'
:
'
创建租户
'
,
'
Create Tenant
'
:
'
创建租户
'
,
'
User Manage
'
:
'
用户管理
'
,
'
User Manage
'
:
'
用户管理
'
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录