This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 91c29e6 [Improvement-5094][UI] Improve to add a main switch for
refresh_in_switched_tab (#5095)
91c29e6 is described below
commit 91c29e6ca35b6ca81172f8b8c4ce3191d094852f
Author: Shiwen Cheng <[email protected]>
AuthorDate: Fri Mar 19 11:58:33 2021 +0800
[Improvement-5094][UI] Improve to add a main switch for
refresh_in_switched_tab (#5095)
---
dolphinscheduler-ui/src/js/conf/home/App.vue | 2 +-
.../src/js/conf/home/router/index.js | 83 +++++++++++-----------
dolphinscheduler-ui/src/lib/external/config.js | 4 +-
3 files changed, 46 insertions(+), 43 deletions(-)
diff --git a/dolphinscheduler-ui/src/js/conf/home/App.vue
b/dolphinscheduler-ui/src/js/conf/home/App.vue
index 374be79..c510931 100644
--- a/dolphinscheduler-ui/src/js/conf/home/App.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/App.vue
@@ -42,7 +42,7 @@
},
mounted () {
visibility.change((evt, hidden) => {
- if (hidden === false && this.$route.meta.refresh_in_switched_tab) {
+ if (hidden === false && this.$route.meta.refreshInSwitchedTab) {
this.reload()
}
})
diff --git a/dolphinscheduler-ui/src/js/conf/home/router/index.js
b/dolphinscheduler-ui/src/js/conf/home/router/index.js
index d8bfc85..293a98c 100644
--- a/dolphinscheduler-ui/src/js/conf/home/router/index.js
+++ b/dolphinscheduler-ui/src/js/conf/home/router/index.js
@@ -17,6 +17,7 @@
import Vue from 'vue'
import i18n from '@/module/i18n/index.js'
+import config from '~/external/config'
import Router from 'vue-router'
Vue.use(Router)
@@ -36,7 +37,7 @@ const router = new Router({
component: resolve => require(['../pages/home/index'], resolve),
meta: {
title: `${i18n.$t('Home')} - DolphinScheduler`,
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
}
},
{
@@ -51,12 +52,21 @@ const router = new Router({
},
children: [
{
+ path: '/projects/list',
+ name: 'projects-list',
+ component: resolve =>
require(['../pages/projects/pages/list/index'], resolve),
+ meta: {
+ title: `${i18n.$t('Project')}`,
+ refreshInSwitchedTab: config.refreshInSwitchedTab
+ }
+ },
+ {
path: '/projects/index',
name: 'projects-index',
component: resolve =>
require(['../pages/projects/pages/index/index'], resolve),
meta: {
title: `${i18n.$t('Project Home')}`,
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
}
},
{
@@ -65,16 +75,7 @@ const router = new Router({
component: resolve =>
require(['../pages/projects/pages/kinship/index'], resolve),
meta: {
title: `${i18n.$t('Kinship')}`,
- refresh_in_switched_tab: true
- }
- },
- {
- path: '/projects/list',
- name: 'projects-list',
- component: resolve =>
require(['../pages/projects/pages/list/index'], resolve),
- meta: {
- title: `${i18n.$t('Project')}`,
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
}
},
{
@@ -83,7 +84,7 @@ const router = new Router({
component: resolve =>
require(['../pages/projects/pages/definition/index'], resolve),
meta: {
title: `${i18n.$t('Process definition')}`,
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
},
redirect: {
name: 'projects-definition-list'
@@ -95,7 +96,7 @@ const router = new Router({
component: resolve =>
require(['../pages/projects/pages/definition/pages/list/index'], resolve),
meta: {
title: `${i18n.$t('Process definition')}`,
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
}
},
{
@@ -104,7 +105,7 @@ const router = new Router({
component: resolve =>
require(['../pages/projects/pages/definition/pages/details/index'], resolve),
meta: {
title: `${i18n.$t('Process definition details')}`,
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
}
},
{
@@ -121,7 +122,7 @@ const router = new Router({
component: resolve =>
require(['../pages/projects/pages/definition/pages/tree/index'], resolve),
meta: {
title: `${i18n.$t('TreeView')}`,
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
}
},
{
@@ -130,7 +131,7 @@ const router = new Router({
component: resolve =>
require(['../pages/projects/pages/definition/timing/index'], resolve),
meta: {
title: `${i18n.$t('Scheduled task list')}`,
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
}
}
]
@@ -152,7 +153,7 @@ const router = new Router({
component: resolve =>
require(['../pages/projects/pages/instance/pages/list/index'], resolve),
meta: {
title: `${i18n.$t('Process Instance')}`,
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
}
},
{
@@ -161,7 +162,7 @@ const router = new Router({
component: resolve =>
require(['../pages/projects/pages/instance/pages/details/index'], resolve),
meta: {
title: `${i18n.$t('Process instance details')}`,
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
}
},
{
@@ -170,7 +171,7 @@ const router = new Router({
component: resolve =>
require(['../pages/projects/pages/instance/pages/gantt/index'], resolve),
meta: {
title: `${i18n.$t('Gantt')}`,
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
}
}
]
@@ -181,7 +182,7 @@ const router = new Router({
component: resolve =>
require(['../pages/projects/pages/taskInstance'], resolve),
meta: {
title: `${i18n.$t('Task Instance')}`,
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
}
},
@@ -191,7 +192,7 @@ const router = new Router({
component: resolve =>
require(['../pages/projects/pages/taskRecord'], resolve),
meta: {
title: `${i18n.$t('Task record')}`,
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
}
},
{
@@ -200,7 +201,7 @@ const router = new Router({
component: resolve =>
require(['../pages/projects/pages/historyTaskRecord'], resolve),
meta: {
title: `${i18n.$t('History task record')}`,
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
}
}
@@ -215,7 +216,7 @@ const router = new Router({
},
meta: {
title: `${i18n.$t('Resources')}`,
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
},
children: [
{
@@ -224,7 +225,7 @@ const router = new Router({
component: resolve =>
require(['../pages/resource/pages/file/pages/list/index'], resolve),
meta: {
title: `${i18n.$t('File Manage')}`,
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
}
},
{
@@ -249,7 +250,7 @@ const router = new Router({
component: resolve =>
require(['../pages/resource/pages/file/pages/subFileFolder/index'], resolve),
meta: {
title: `${i18n.$t('Create Resource')}`,
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
}
},
{
@@ -258,7 +259,7 @@ const router = new Router({
component: resolve =>
require(['../pages/resource/pages/file/pages/subFile/index'], resolve),
meta: {
title: `${i18n.$t('Create Resource')}`,
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
}
},
{
@@ -267,7 +268,7 @@ const router = new Router({
component: resolve =>
require(['../pages/resource/pages/file/pages/details/index'], resolve),
meta: {
title: `${i18n.$t('File Details')}`,
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
}
},
{
@@ -276,7 +277,7 @@ const router = new Router({
component: resolve =>
require(['../pages/resource/pages/file/pages/subdirectory/index'], resolve),
meta: {
title: `${i18n.$t('File Manage')}`,
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
}
},
{
@@ -293,7 +294,7 @@ const router = new Router({
component: resolve => require(['../pages/resource/pages/udf/index'],
resolve),
meta: {
title: `${i18n.$t('UDF manage')}`,
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
},
children: [
{
@@ -302,7 +303,7 @@ const router = new Router({
component: resolve =>
require(['../pages/resource/pages/udf/pages/resource/index'], resolve),
meta: {
title: `${i18n.$t('UDF Resources')}`,
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
}
},
{
@@ -311,7 +312,7 @@ const router = new Router({
component: resolve =>
require(['../pages/resource/pages/udf/pages/subUdfDirectory/index'], resolve),
meta: {
title: `${i18n.$t('UDF Resources')}`,
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
}
},
{
@@ -388,7 +389,7 @@ const router = new Router({
component: resolve =>
require(['../pages/security/pages/users/index'], resolve),
meta: {
title: `${i18n.$t('User Manage')}`,
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
}
},
{
@@ -487,7 +488,7 @@ const router = new Router({
component: resolve =>
require(['../pages/monitor/pages/servers/master'], resolve),
meta: {
title: `${i18n.$t('Service-Master')}`,
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
}
},
{
@@ -496,7 +497,7 @@ const router = new Router({
component: resolve =>
require(['../pages/monitor/pages/servers/worker'], resolve),
meta: {
title: `${i18n.$t('Service-Worker')}`,
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
}
},
{
@@ -505,7 +506,7 @@ const router = new Router({
component: resolve =>
require(['../pages/monitor/pages/servers/alert'], resolve),
meta: {
title: 'Alert',
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
}
},
{
@@ -514,7 +515,7 @@ const router = new Router({
component: resolve =>
require(['../pages/monitor/pages/servers/rpcserver'], resolve),
meta: {
title: 'Rpcserver',
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
}
},
{
@@ -523,7 +524,7 @@ const router = new Router({
component: resolve =>
require(['../pages/monitor/pages/servers/zookeeper'], resolve),
meta: {
title: 'Zookeeper',
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
}
},
{
@@ -532,7 +533,7 @@ const router = new Router({
component: resolve =>
require(['../pages/monitor/pages/servers/apiserver'], resolve),
meta: {
title: 'Apiserver',
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
}
},
{
@@ -541,7 +542,7 @@ const router = new Router({
component: resolve => require(['../pages/monitor/pages/servers/db'],
resolve),
meta: {
title: 'DB',
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
}
},
{
@@ -550,7 +551,7 @@ const router = new Router({
component: resolve =>
require(['../pages/monitor/pages/servers/statistics'], resolve),
meta: {
title: 'statistics',
- refresh_in_switched_tab: true
+ refreshInSwitchedTab: config.refreshInSwitchedTab
}
}
]
diff --git a/dolphinscheduler-ui/src/lib/external/config.js
b/dolphinscheduler-ui/src/lib/external/config.js
index 161bbee..79ed234 100644
--- a/dolphinscheduler-ui/src/lib/external/config.js
+++ b/dolphinscheduler-ui/src/lib/external/config.js
@@ -19,5 +19,7 @@
*/
export default {
// task record switch
- recordSwitch: false
+ recordSwitch: false,
+ // refresh in switched tab
+ refreshInSwitchedTab: false
}
