github
/
DolphinScheduler
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'upstream/dev' into json-split

pull/3/MERGE
lenboo 4 years ago
parent
95bbdfedfe 6429e8c1db
commit
a7d396fccc
2 changed files with 33 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      dolphinscheduler-ui/src/js/conf/home/App.vue
  2. 64
      dolphinscheduler-ui/src/js/conf/home/router/index.js

2
dolphinscheduler-ui/src/js/conf/home/App.vue
Unescape View File

@ -42,7 +42,7 @@
},
mounted () {
visibility.change((evt, hidden) => {
if (hidden === false && this.$route.meta.refesh_in_switched_tab) {
if (hidden === false && this.$route.meta.refresh_in_switched_tab) {
this.reload()
}
})

64
dolphinscheduler-ui/src/js/conf/home/router/index.js
Unescape View File

@ -36,7 +36,7 @@ const router = new Router({
component: resolve => require(['../pages/home/index'], resolve),
meta: {
title: `${i18n.$t('Home')} - DolphinScheduler`,
refesh_in_switched_tab: true
refresh_in_switched_tab: true
}
},
{
@ -56,7 +56,7 @@ const router = new Router({
component: resolve => require(['../pages/projects/pages/index/index'], resolve),
meta: {
title: `${i18n.$t('Project Home')}`,
refesh_in_switched_tab: true
refresh_in_switched_tab: true
}
},
{
@ -65,7 +65,7 @@ const router = new Router({
component: resolve => require(['../pages/projects/pages/kinship/index'], resolve),
meta: {
title: `${i18n.$t('Kinship')}`,
refesh_in_switched_tab: true
refresh_in_switched_tab: true
}
},
{
@ -74,7 +74,7 @@ const router = new Router({
component: resolve => require(['../pages/projects/pages/list/index'], resolve),
meta: {
title: `${i18n.$t('Project')}`,
refesh_in_switched_tab: true
refresh_in_switched_tab: true
}
},
{
@ -83,7 +83,7 @@ const router = new Router({
component: resolve => require(['../pages/projects/pages/definition/index'], resolve),
meta: {
title: `${i18n.$t('Process definition')}`,
refesh_in_switched_tab: true
refresh_in_switched_tab: true
},
redirect: {
name: 'projects-definition-list'
@ -95,7 +95,7 @@ const router = new Router({
component: resolve => require(['../pages/projects/pages/definition/pages/list/index'], resolve),
meta: {
title: `${i18n.$t('Process definition')}`,
refesh_in_switched_tab: true
refresh_in_switched_tab: true
}
},
{
@ -104,7 +104,7 @@ const router = new Router({
component: resolve => require(['../pages/projects/pages/definition/pages/details/index'], resolve),
meta: {
title: `${i18n.$t('Process definition details')}`,
refesh_in_switched_tab: true
refresh_in_switched_tab: true
}
},
{
@ -121,7 +121,7 @@ const router = new Router({
component: resolve => require(['../pages/projects/pages/definition/pages/tree/index'], resolve),
meta: {
title: `${i18n.$t('TreeView')}`,
refesh_in_switched_tab: true
refresh_in_switched_tab: true
}
},
{
@ -130,7 +130,7 @@ const router = new Router({
component: resolve => require(['../pages/projects/pages/definition/timing/index'], resolve),
meta: {
title: `${i18n.$t('Scheduled task list')}`,
refesh_in_switched_tab: true
refresh_in_switched_tab: true
}
}
]
@ -152,7 +152,7 @@ const router = new Router({
component: resolve => require(['../pages/projects/pages/instance/pages/list/index'], resolve),
meta: {
title: `${i18n.$t('Process Instance')}`,
refesh_in_switched_tab: true
refresh_in_switched_tab: true
}
},
{
@ -161,7 +161,7 @@ const router = new Router({
component: resolve => require(['../pages/projects/pages/instance/pages/details/index'], resolve),
meta: {
title: `${i18n.$t('Process instance details')}`,
refesh_in_switched_tab: true
refresh_in_switched_tab: true
}
},
{
@ -170,7 +170,7 @@ const router = new Router({
component: resolve => require(['../pages/projects/pages/instance/pages/gantt/index'], resolve),
meta: {
title: `${i18n.$t('Gantt')}`,
refesh_in_switched_tab: true
refresh_in_switched_tab: true
}
}
]
@ -181,7 +181,7 @@ const router = new Router({
component: resolve => require(['../pages/projects/pages/taskInstance'], resolve),
meta: {
title: `${i18n.$t('Task Instance')}`,
refesh_in_switched_tab: true
refresh_in_switched_tab: true
}
},
@ -191,7 +191,7 @@ const router = new Router({
component: resolve => require(['../pages/projects/pages/taskRecord'], resolve),
meta: {
title: `${i18n.$t('Task record')}`,
refesh_in_switched_tab: true
refresh_in_switched_tab: true
}
},
{
@ -200,7 +200,7 @@ const router = new Router({
component: resolve => require(['../pages/projects/pages/historyTaskRecord'], resolve),
meta: {
title: `${i18n.$t('History task record')}`,
refesh_in_switched_tab: true
refresh_in_switched_tab: true
}
}
@ -215,7 +215,7 @@ const router = new Router({
},
meta: {
title: `${i18n.$t('Resources')}`,
refesh_in_switched_tab: true
refresh_in_switched_tab: true
},
children: [
{
@ -224,7 +224,7 @@ const router = new Router({
component: resolve => require(['../pages/resource/pages/file/pages/list/index'], resolve),
meta: {
title: `${i18n.$t('File Manage')}`,
refesh_in_switched_tab: true
refresh_in_switched_tab: true
}
},
{
@ -249,7 +249,7 @@ const router = new Router({
component: resolve => require(['../pages/resource/pages/file/pages/subFileFolder/index'], resolve),
meta: {
title: `${i18n.$t('Create Resource')}`,
refesh_in_switched_tab: true
refresh_in_switched_tab: true
}
},
{
@ -258,7 +258,7 @@ const router = new Router({
component: resolve => require(['../pages/resource/pages/file/pages/subFile/index'], resolve),
meta: {
title: `${i18n.$t('Create Resource')}`,
refesh_in_switched_tab: true
refresh_in_switched_tab: true
}
},
{
@ -267,7 +267,7 @@ const router = new Router({
component: resolve => require(['../pages/resource/pages/file/pages/details/index'], resolve),
meta: {
title: `${i18n.$t('File Details')}`,
refesh_in_switched_tab: true
refresh_in_switched_tab: true
}
},
{
@ -276,7 +276,7 @@ const router = new Router({
component: resolve => require(['../pages/resource/pages/file/pages/subdirectory/index'], resolve),
meta: {
title: `${i18n.$t('File Manage')}`,
refesh_in_switched_tab: true
refresh_in_switched_tab: true
}
},
{
@ -293,7 +293,7 @@ const router = new Router({
component: resolve => require(['../pages/resource/pages/udf/index'], resolve),
meta: {
title: `${i18n.$t('UDF manage')}`,
refesh_in_switched_tab: true
refresh_in_switched_tab: true
},
children: [
{
@ -302,7 +302,7 @@ const router = new Router({
component: resolve => require(['../pages/resource/pages/udf/pages/resource/index'], resolve),
meta: {
title: `${i18n.$t('UDF Resources')}`,
refesh_in_switched_tab: true
refresh_in_switched_tab: true
}
},
{
@ -311,7 +311,7 @@ const router = new Router({
component: resolve => require(['../pages/resource/pages/udf/pages/subUdfDirectory/index'], resolve),
meta: {
title: `${i18n.$t('UDF Resources')}`,
refesh_in_switched_tab: true
refresh_in_switched_tab: true
}
},
{
@ -478,7 +478,7 @@ const router = new Router({
component: resolve => require(['../pages/monitor/pages/servers/master'], resolve),
meta: {
title: `${i18n.$t('Service-Master')}`,
refesh_in_switched_tab: true
refresh_in_switched_tab: true
}
},
{
@ -487,7 +487,7 @@ const router = new Router({
component: resolve => require(['../pages/monitor/pages/servers/worker'], resolve),
meta: {
title: `${i18n.$t('Service-Worker')}`,
refesh_in_switched_tab: true
refresh_in_switched_tab: true
}
},
{
@ -496,7 +496,7 @@ const router = new Router({
component: resolve => require(['../pages/monitor/pages/servers/alert'], resolve),
meta: {
title: 'Alert',
refesh_in_switched_tab: true
refresh_in_switched_tab: true
}
},
{
@ -505,7 +505,7 @@ const router = new Router({
component: resolve => require(['../pages/monitor/pages/servers/rpcserver'], resolve),
meta: {
title: 'Rpcserver',
refesh_in_switched_tab: true
refresh_in_switched_tab: true
}
},
{
@ -514,7 +514,7 @@ const router = new Router({
component: resolve => require(['../pages/monitor/pages/servers/zookeeper'], resolve),
meta: {
title: 'Zookeeper',
refesh_in_switched_tab: true
refresh_in_switched_tab: true
}
},
{
@ -523,7 +523,7 @@ const router = new Router({
component: resolve => require(['../pages/monitor/pages/servers/apiserver'], resolve),
meta: {
title: 'Apiserver',
refesh_in_switched_tab: true
refresh_in_switched_tab: true
}
},
{
@ -532,7 +532,7 @@ const router = new Router({
component: resolve => require(['../pages/monitor/pages/servers/db'], resolve),
meta: {
title: 'DB',
refesh_in_switched_tab: true
refresh_in_switched_tab: true
}
},
{
@ -541,7 +541,7 @@ const router = new Router({
component: resolve => require(['../pages/monitor/pages/servers/statistics'], resolve),
meta: {
title: 'statistics',
refesh_in_switched_tab: true
refresh_in_switched_tab: true
}
}
]

Write Preview
Loading…
Cancel
Save