diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json index 909c33bec..a758d1c38 100644 --- a/src/i18n/langs/en.json +++ b/src/i18n/langs/en.json @@ -418,7 +418,7 @@ "isValid": "Is valid", "nav": { "APIKey": "API Key", - "Workspace": "Workbench", + "Workbench": "Workbench", "Navigation": "Navigation", "Console": "Console", "Audits": "Audit", diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json index bca3ba812..74548f200 100644 --- a/src/i18n/langs/ja.json +++ b/src/i18n/langs/ja.json @@ -430,7 +430,7 @@ "isValid": "有効", "nav": { "APIKey": "APIキー", - "Workspace": "作業台", + "Workbench": "作業台", "Navigation": "ナビゲーション", "Console": "コンソール", "Audits": "監査台", diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json index 79c97a624..8178ff6de 100644 --- a/src/i18n/langs/zh.json +++ b/src/i18n/langs/zh.json @@ -431,7 +431,7 @@ "isValid": "有效", "nav": { "APIKey": "API Key", - "Workspace": "工作台", + "Workbench": "工作台", "Navigation": "导航", "Console": "控制台", "Audits": "审计台", diff --git a/src/router/index.js b/src/router/index.js index b45b79581..b655b9168 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -79,7 +79,7 @@ export const constantRoutes = [ // 权限路由 import consoleViewRoutes from './console' import auditViewRoutes from './audit' -import workspaceViewRoutes from './workspace' +import workbenchViewRoutes from './workbench' import ticketsRoutes from './tickets' import settingsRoutes from './settings' import profileRoutes from './profile' @@ -92,7 +92,7 @@ import { getPermedPreferView } from '@/utils/jms' export const viewRoutes = [ consoleViewRoutes, auditViewRoutes, - workspaceViewRoutes, + workbenchViewRoutes, ticketsRoutes, settingsRoutes, profileRoutes diff --git a/src/router/workspace/index.js b/src/router/workbench/index.js similarity index 91% rename from src/router/workspace/index.js rename to src/router/workbench/index.js index 558c33947..6bf12fd08 100644 --- a/src/router/workspace/index.js +++ b/src/router/workbench/index.js @@ -4,23 +4,23 @@ import { BASE_URL } from '@/utils/common' import empty from '@/layout/empty' export default { - path: '/workspace/', + path: '/workbench/', component: Layout, - name: 'workspace', - redirect: '/workspace/home', + name: 'workbench', + redirect: '/workbench/home', meta: { - title: i18n.t('common.nav.Workspace'), + title: i18n.t('common.nav.Workbench'), type: 'view', - view: 'workspace', + view: 'workbench', icon: 'el-icon-user-solid', showNavSwitcher: true, showOrganization: true, - permissions: ['rbac.view_workspace'] + permissions: ['rbac.view_workbench'] }, children: [ // 404 page must be placed at the end !!! { - path: '/workspace/home', + path: '/workbench/home', name: 'MyHome', component: () => import('@/views/myhome'), meta: { @@ -30,7 +30,7 @@ export default { } }, { - path: '/workspace/assets', + path: '/workbench/assets', name: 'MyAssets', component: () => import('@/views/myassets'), meta: { @@ -40,7 +40,7 @@ export default { } }, { - path: '/workspace/apps', + path: '/workbench/apps', name: 'Apps', component: empty, redirect: 'remoteapp', @@ -82,7 +82,7 @@ export default { ] }, { - path: '/workspace/ops', + path: '/workbench/ops', component: empty, meta: { permissions: ['ops.add_commandexecution'], diff --git a/src/utils/common.js b/src/utils/common.js index 3cb367929..18ec4678b 100644 --- a/src/utils/common.js +++ b/src/utils/common.js @@ -109,7 +109,7 @@ export function getApiPath(that) { // ticket ... pagePath = pagePathArray.slice(1, pagePathArray.length).join('/') } else { - // console,audit,workspace + // console,audit,workbench pagePath = pagePathArray.slice(2, pagePathArray.length).join('/') } return `/api/v1/${pagePath}/` diff --git a/src/utils/jms.js b/src/utils/jms.js index 8a4d5d0a2..b789e0b66 100644 --- a/src/utils/jms.js +++ b/src/utils/jms.js @@ -83,7 +83,7 @@ export function hasActionPerm(route, action) { const viewRequirePermsMapper = { console: 'rbac.view_console', audit: 'rbac.view_audit', - workspace: 'rbac.view_workspace' + workbench: 'rbac.view_workbench' } export function getViewRequirePerms(view) { diff --git a/src/views/assets/Asset/AssetList.vue b/src/views/assets/Asset/AssetList.vue index bf02aeda6..144ea924c 100644 --- a/src/views/assets/Asset/AssetList.vue +++ b/src/views/assets/Asset/AssetList.vue @@ -51,7 +51,11 @@