diff --git a/src/views/xpack/api.js b/src/api/interface.js
similarity index 100%
rename from src/views/xpack/api.js
rename to src/api/interface.js
diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 3e7147945..703e55dd0 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -1386,6 +1386,7 @@
"Reason": "原因"
},
"Cloud": {
+ "CloudImport": "云导入",
"ServerAccountKey": "服务账号密钥",
"IPNetworkSegment": "IP网段",
"Aliyun": "阿里云",
@@ -1464,7 +1465,7 @@
"ImportLicenseTip": "请导入许可证",
"InterfaceSettings": "界面设置",
"License": "许可证",
- "SystemMonitor": "系统监控",
+ "ComponentMonitor": "组件监控",
"ServiceRatio": "组件负载统计",
"LoadStatus":"组件状态",
"NormalLoad":"正常",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index a6c5a52b2..ffef5d66a 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -1335,6 +1335,7 @@
"Reason": "Reason"
},
"Cloud": {
+ "CloudImport": "Cloud import",
"ServerAccountKey": "Server Account Key",
"IPNetworkSegment": "Ip Network Segment",
"Aliyun": "Ali Cloud",
@@ -1411,7 +1412,7 @@
"InterfaceSettings": "Interface Setting",
"License": "License",
"LicenseDetail": "License detail",
- "SystemMonitor": "System Monitor",
+ "ComponentMonitor": "System Monitor",
"ServiceRatio": "Service ratio",
"LoadStatus":"Status",
"NormalLoad":"Normal",
diff --git a/src/router/console/assets.js b/src/router/console/assets.js
index 382e42a70..73c828ae8 100644
--- a/src/router/console/assets.js
+++ b/src/router/console/assets.js
@@ -1,5 +1,6 @@
import i18n from '@/i18n/i18n'
import empty from '@/layout/empty'
+import XPackRoutes from './xpack'
export default [
{
@@ -277,5 +278,6 @@ export default [
meta: { title: i18n.t('route.LabelUpdate') }
}
]
- }
+ },
+ ...XPackRoutes
]
diff --git a/src/router/console/index.js b/src/router/console/index.js
index 66cf45f91..ed41c127d 100644
--- a/src/router/console/index.js
+++ b/src/router/console/index.js
@@ -9,7 +9,6 @@ import PermsRoute from './perms'
import OpsRoutes from './ops'
import AclRoutes from './acls'
import AccountRoutes from './accounts'
-import XPackRoutes from './xpack'
export default {
path: '/console',
@@ -106,14 +105,6 @@ export default {
icon: 'coffee'
},
children: OpsRoutes
- },
- {
- path: '/console/xpack',
- component: empty,
- redirect: '/applications/remote-apps/',
- name: 'Xpack',
- meta: { title: 'X-Pack', icon: 'sitemap', licenseRequired: true },
- children: XPackRoutes
}
]
}
diff --git a/src/router/console/xpack.js b/src/router/console/xpack.js
index a7c5be693..01b2c72e1 100644
--- a/src/router/console/xpack.js
+++ b/src/router/console/xpack.js
@@ -7,16 +7,18 @@ export default [
component: empty,
redirect: '',
meta: {
- title: i18n.t('xpack.Cloud.Cloud'),
+ title: i18n.t('xpack.Cloud.CloudImport'),
permissions: ['xpack.view_account']
},
children: [
{
path: '',
- component: () => import('@/views/xpack/Cloud/index.vue'),
+ component: () => import('@/views/assets/Cloud'),
name: 'CloudCenter',
+ hidden: true,
meta: {
- title: i18n.t('xpack.Cloud.CloudCenter'),
+ title: i18n.t('xpack.Cloud.CloudImport'),
+ activeMenu: '/console/assets/assets',
permissions: ['xpack.view_account']
}
},
@@ -32,7 +34,7 @@ export default [
children: [
{
path: '',
- component: () => import('@/views/xpack/Cloud/Account/AccountList'),
+ component: () => import('@/views/assets/Cloud/Account/AccountList'),
name: 'AccountList',
hidden: true,
meta: {
@@ -42,7 +44,7 @@ export default [
},
{
path: 'create',
- component: () => import('@/views/xpack/Cloud/Account/AccountCreateUpdate'),
+ component: () => import('@/views/assets/Cloud/Account/AccountCreateUpdate'),
name: 'AccountCreate',
hidden: true,
meta: {
@@ -53,7 +55,7 @@ export default [
},
{
path: ':id/update',
- component: () => import('@/views/xpack/Cloud/Account/AccountCreateUpdate'),
+ component: () => import('@/views/assets/Cloud/Account/AccountCreateUpdate'),
name: 'AccountUpdate',
hidden: true,
meta: {
@@ -64,7 +66,7 @@ export default [
},
{
path: ':id/',
- component: () => import('@/views/xpack/Cloud/Account/AccountDetail/index'),
+ component: () => import('@/views/assets/Cloud/Account/AccountDetail/index'),
name: 'AccountDetail',
hidden: true,
meta: {
@@ -85,7 +87,7 @@ export default [
children: [
{
path: '',
- component: () => import('@/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskList'),
+ component: () => import('@/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskList'),
name: 'SyncInstanceTaskList',
hidden: true,
meta: {
@@ -95,7 +97,7 @@ export default [
},
{
path: 'create',
- component: () => import('@/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskCreateUpdate'),
+ component: () => import('@/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskCreateUpdate'),
name: 'SyncInstanceTaskCreate',
hidden: true,
meta: {
@@ -105,7 +107,7 @@ export default [
},
{
path: ':id/update',
- component: () => import('@/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskCreateUpdate'),
+ component: () => import('@/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskCreateUpdate'),
name: 'SyncInstanceTaskUpdate',
hidden: true,
meta: {
@@ -115,7 +117,7 @@ export default [
},
{
path: ':id',
- component: () => import('@/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/index'),
+ component: () => import('@/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/index'),
name: 'SyncInstanceTaskDetail',
hidden: true,
meta: {
@@ -125,69 +127,5 @@ export default [
]
}
]
- },
- {
- path: 'interface-setting',
- component: () => import('@/views/xpack/InterfaceSettings.vue'),
- name: 'InterfaceSetting',
- meta: {
- title: i18n.t('xpack.InterfaceSettings'),
- permissions: ['xpack.view_interface']
- }
- },
- {
- path: 'orgs',
- component: empty,
- redirect: '',
- meta: { permissions: ['orgs.view_organization'] },
- children: [
- {
- path: '',
- component: () => import('@/views/xpack/Org/OrganizationList'),
- name: 'OrganizationList',
- meta: {
- title: i18n.t('xpack.Organization.OrganizationList'),
- permissions: ['orgs.view_organization']
- }
- },
- {
- path: 'create',
- component: () => import('@/views/xpack/Org/OrganizationCreateUpdate'),
- name: 'OrganizationCreate',
- hidden: true,
- meta: {
- title: i18n.t('xpack.Organization.OrganizationCreate'),
- action: 'create',
- permissions: ['orgs.add_organization']
- }
- },
- {
- path: ':id/update',
- component: () => import('@/views/xpack/Org/OrganizationCreateUpdate'),
- name: 'OrganizationUpdate',
- hidden: true,
- meta: {
- title: i18n.t('xpack.Organization.OrganizationUpdate'),
- action: 'update',
- permissions: ['orgs.change_organization']
- }
- },
- {
- path: ':id',
- component: () => import('@/views/xpack/Org/OrganizationDetail/index'),
- name: 'OrganizationDetail',
- hidden: true,
- meta: {
- title: i18n.t('xpack.Organization.OrganizationDetail'),
- permissions: ['orgs.view_organization']
- }
- }
- ]
- },
- {
- path: 'system-monitor',
- component: () => import('@/views/xpack/SystemMonitor/index.vue'),
- name: 'SystemMonitor',
- meta: { title: i18n.t('xpack.SystemMonitor'), permissions: ['terminal.view_terminal'] }
}
]
diff --git a/src/router/settings/index.js b/src/router/settings/index.js
index 36e8d3479..4da194dae 100644
--- a/src/router/settings/index.js
+++ b/src/router/settings/index.js
@@ -202,6 +202,66 @@ export default {
permissions: ['settings.view_setting']
}
},
+ {
+ path: '/settings/interface',
+ name: 'Interface',
+ component: () => import('@/views/settings/Interface'),
+ meta: {
+ title: i18n.t('xpack.InterfaceSettings'),
+ icon: 'laptop',
+ permissions: ['xpack.view_interface']
+ }
+ },
+ {
+ path: '/settings/orgs',
+ component: empty,
+ redirect: '',
+ meta: { permissions: ['orgs.view_organization'] },
+ children: [
+ {
+ path: '',
+ component: () => import('@/views/settings/Org/OrganizationList'),
+ name: 'OrganizationList',
+ meta: {
+ title: i18n.t('xpack.Organization.OrganizationList'),
+ icon: 'sitemap',
+ permissions: ['orgs.view_organization']
+ }
+ },
+ {
+ path: 'create',
+ component: () => import('@/views/settings/Org/OrganizationCreateUpdate'),
+ name: 'OrganizationCreate',
+ hidden: true,
+ meta: {
+ title: i18n.t('xpack.Organization.OrganizationCreate'),
+ action: 'create',
+ permissions: ['orgs.add_organization']
+ }
+ },
+ {
+ path: ':id/update',
+ component: () => import('@/views/settings/Org/OrganizationCreateUpdate'),
+ name: 'OrganizationUpdate',
+ hidden: true,
+ meta: {
+ title: i18n.t('xpack.Organization.OrganizationUpdate'),
+ action: 'update',
+ permissions: ['orgs.change_organization']
+ }
+ },
+ {
+ path: ':id',
+ component: () => import('@/views/settings/Org/OrganizationDetail/index'),
+ name: 'OrganizationDetail',
+ hidden: true,
+ meta: {
+ title: i18n.t('xpack.Organization.OrganizationDetail'),
+ permissions: ['orgs.view_organization']
+ }
+ }
+ ]
+ },
{
path: '/settings/other',
name: 'Other',
diff --git a/src/views/assets/Asset/AssetList.vue b/src/views/assets/Asset/AssetList.vue
index 999339f19..2109f499a 100644
--- a/src/views/assets/Asset/AssetList.vue
+++ b/src/views/assets/Asset/AssetList.vue
@@ -171,6 +171,13 @@ export default {
{ label: this.$t('assets.Label'), value: 'label' }
]
},
+ extraActions: [
+ {
+ name: this.$t('xpack.Cloud.CloudImport'),
+ title: this.$t('xpack.Cloud.CloudImport'),
+ callback: () => this.$router.push({ name: 'CloudCenter' })
+ }
+ ],
extraMoreActions: [
{
name: 'DeactiveSelected',
diff --git a/src/views/xpack/Cloud/Account/AccountCreateUpdate.vue b/src/views/assets/Cloud/Account/AccountCreateUpdate.vue
similarity index 100%
rename from src/views/xpack/Cloud/Account/AccountCreateUpdate.vue
rename to src/views/assets/Cloud/Account/AccountCreateUpdate.vue
diff --git a/src/views/xpack/Cloud/Account/AccountDetail/AccountDetail.vue b/src/views/assets/Cloud/Account/AccountDetail/AccountDetail.vue
similarity index 100%
rename from src/views/xpack/Cloud/Account/AccountDetail/AccountDetail.vue
rename to src/views/assets/Cloud/Account/AccountDetail/AccountDetail.vue
diff --git a/src/views/xpack/Cloud/Account/AccountDetail/index.vue b/src/views/assets/Cloud/Account/AccountDetail/index.vue
similarity index 100%
rename from src/views/xpack/Cloud/Account/AccountDetail/index.vue
rename to src/views/assets/Cloud/Account/AccountDetail/index.vue
diff --git a/src/views/xpack/Cloud/Account/AccountList.vue b/src/views/assets/Cloud/Account/AccountList.vue
similarity index 100%
rename from src/views/xpack/Cloud/Account/AccountList.vue
rename to src/views/assets/Cloud/Account/AccountList.vue
diff --git a/src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskCreateUpdate.vue b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskCreateUpdate.vue
similarity index 100%
rename from src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskCreateUpdate.vue
rename to src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskCreateUpdate.vue
diff --git a/src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/AssetList.vue b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/AssetList.vue
similarity index 100%
rename from src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/AssetList.vue
rename to src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/AssetList.vue
diff --git a/src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/HistoryList.vue b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/HistoryList.vue
similarity index 100%
rename from src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/HistoryList.vue
rename to src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/HistoryList.vue
diff --git a/src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/detail.vue b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/detail.vue
similarity index 100%
rename from src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/detail.vue
rename to src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/detail.vue
diff --git a/src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/index.vue b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/index.vue
similarity index 100%
rename from src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/index.vue
rename to src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/index.vue
diff --git a/src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue
similarity index 100%
rename from src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue
rename to src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue
diff --git a/src/views/xpack/Cloud/const.js b/src/views/assets/Cloud/const.js
similarity index 100%
rename from src/views/xpack/Cloud/const.js
rename to src/views/assets/Cloud/const.js
diff --git a/src/views/xpack/Cloud/index.vue b/src/views/assets/Cloud/index.vue
similarity index 100%
rename from src/views/xpack/Cloud/index.vue
rename to src/views/assets/Cloud/index.vue
diff --git a/src/views/settings/Clean.vue b/src/views/settings/Clean.vue
index f12c26806..c901b545f 100644
--- a/src/views/settings/Clean.vue
+++ b/src/views/settings/Clean.vue
@@ -1,17 +1,20 @@
-
-
-
+
+
+
+
+
-
-
diff --git a/src/views/xpack/README.md b/src/views/xpack/README.md
deleted file mode 100644
index a9a01ade0..000000000
--- a/src/views/xpack/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# js-xpack-web
\ No newline at end of file
diff --git a/src/views/xpack/Vault/VaultList.vue b/src/views/xpack/Vault/VaultList.vue
deleted file mode 100644
index 2db4d2a80..000000000
--- a/src/views/xpack/Vault/VaultList.vue
+++ /dev/null
@@ -1,179 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/xpack/index.js b/src/views/xpack/index.js
deleted file mode 100644
index e69de29bb..000000000