diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json index 9f1cebb97..6d583a23b 100644 --- a/src/i18n/langs/zh.json +++ b/src/i18n/langs/zh.json @@ -2008,6 +2008,7 @@ "AssetCount": "资产数量", "Auditor": "审计员", "Cloud": { + "AccountHelpText": "云账号是用来连接云服务商的账号,用于获取云服务商的资源信息", "UniqueError": "以下属性只能设置一个", "ExistError": "这个元素已经存在", "InstanceName": "实例名称", @@ -2038,7 +2039,7 @@ "HostnameStrategy": "用于生成资产主机名。例如:1. 实例名称 (instanceDemo);2. 实例名称和部分IP(后两位) (instanceDemo-250.1)", "IsAlwaysUpdate": "资产信息保持最新", "AccountCreate": "创建账户", - "AccountList": "账户列表", + "AccountList": "云账号", "AccountUpdate": "更新账户", "AccountDetail": "账户详情", "Cloud": "云管中心", @@ -2056,7 +2057,7 @@ "CloudSource": "同步源", "SaveSetting": "同步设置", "Name": "名称", - "Account": "账户", + "Account": "云账号", "Node": "节点", "WindowsAdminUser": "Windows 特权用户", "LinuxAdminUser": "Linux 特权用户", diff --git a/src/router/console/xpack.js b/src/router/console/xpack.js index dce42923c..99cf49af9 100644 --- a/src/router/console/xpack.js +++ b/src/router/console/xpack.js @@ -149,6 +149,7 @@ export default [ component: () => import('@/views/assets/Cloud/'), meta: { title: i18n.t('xpack.Cloud.StrategyList'), + activeMenu: activateMenu, permissions: ['xpack.view_strategy'] } }, @@ -160,6 +161,7 @@ export default [ meta: { title: i18n.t('common.StrategyCreate'), action: 'create', + activeMenu: activateMenu, permissions: ['xpack.add_strategy'] } }, @@ -170,6 +172,7 @@ export default [ hidden: true, meta: { title: i18n.t('common.StrategyUpdate'), + activeMenu: activateMenu, permissions: ['xpack.change_strategy'] } }, @@ -180,6 +183,7 @@ export default [ hidden: true, meta: { title: i18n.t('common.StrategyDetail'), + activeMenu: activateMenu, permissions: ['xpack.view_strategy'] } } diff --git a/src/views/assets/Cloud/Account/AccountList.vue b/src/views/assets/Cloud/Account/AccountList.vue index 03b3f2309..2c4d3c7ae 100644 --- a/src/views/assets/Cloud/Account/AccountList.vue +++ b/src/views/assets/Cloud/Account/AccountList.vue @@ -1,10 +1,14 @@ - diff --git a/src/views/assets/Cloud/Strategy/StrategyList.vue b/src/views/assets/Cloud/Strategy/StrategyList.vue index 052111c22..b58799b8c 100644 --- a/src/views/assets/Cloud/Strategy/StrategyList.vue +++ b/src/views/assets/Cloud/Strategy/StrategyList.vue @@ -58,6 +58,6 @@ export default { } - diff --git a/src/views/assets/Cloud/Strategy/components/ActionInput.vue b/src/views/assets/Cloud/Strategy/components/ActionInput.vue index d71866ac6..d1de302eb 100644 --- a/src/views/assets/Cloud/Strategy/components/ActionInput.vue +++ b/src/views/assets/Cloud/Strategy/components/ActionInput.vue @@ -1,8 +1,9 @@ diff --git a/src/views/assets/Cloud/Strategy/components/RuleInput.vue b/src/views/assets/Cloud/Strategy/components/RuleInput.vue index b0a0d1915..7b390fefc 100644 --- a/src/views/assets/Cloud/Strategy/components/RuleInput.vue +++ b/src/views/assets/Cloud/Strategy/components/RuleInput.vue @@ -2,6 +2,7 @@ diff --git a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskCreateUpdate.vue b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskCreateUpdate.vue index 693db2267..537b0dbcc 100644 --- a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskCreateUpdate.vue +++ b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskCreateUpdate.vue @@ -35,6 +35,7 @@ export default { url: '/api/v1/xpack/cloud/sync-instance-tasks/', fieldsMeta: { account: { + label: this.$t('xpack.Cloud.Account'), on: { change: ([event], updateForm) => { vm.fieldsMeta.regions.el.ajax.url = `/api/v1/xpack/cloud/regions/?account_id=${event?.pk}` @@ -45,7 +46,11 @@ export default { multiple: false, value: [], ajax: { - url: '/api/v1/xpack/cloud/accounts/' + url: '/api/v1/xpack/cloud/accounts/', + transformOption: (item) => { + const label = `${item.name}(${item.provider.label})` + return { label: label, value: item.id } + } } } },