diff --git a/src/components/Form/FormFields/AttrInput.vue b/src/components/Form/FormFields/AttrInput.vue index 9ddb335c2..3cbc47b6e 100644 --- a/src/components/Form/FormFields/AttrInput.vue +++ b/src/components/Form/FormFields/AttrInput.vue @@ -27,7 +27,9 @@ export default { }, beforeSubmit: { type: Function, - default: (val) => { return true } + default: (val) => { + return true + } } }, data() { @@ -50,14 +52,16 @@ export default { ::v-deep .el-select { width: 100%; } + ::v-deep .el-form-item__content { width: 100% !important; } + ::v-deep .form-buttons { margin: 0 !important; } + .attr-input { - margin-top: -10px; } diff --git a/src/router/console/xpack.js b/src/router/console/xpack.js index 8371ba049..9582485d6 100644 --- a/src/router/console/xpack.js +++ b/src/router/console/xpack.js @@ -9,7 +9,6 @@ const clouds = { }, hidden: true, meta: { - title: i18n.t('BaseCloudSync'), app: 'xpack', resource: 'account' }, @@ -41,32 +40,10 @@ const clouds = { hidden: true, redirect: '/console/assets/cloud', meta: { - title: i18n.t('CloudAccountList'), + title: i18n.t('CloudSync'), permissions: ['xpack.view_account'] } }, - { - path: 'create', - component: () => import('@/views/assets/Cloud/Account/AccountCreateUpdate'), - name: 'AccountCreate', - hidden: true, - meta: { - title: i18n.t('CloudAccountCreate'), - action: 'create', - permissions: ['xpack.add_account'] - } - }, - { - path: ':id/update', - component: () => import('@/views/assets/Cloud/Account/AccountCreateUpdate'), - name: 'AccountUpdate', - hidden: true, - meta: { - title: i18n.t('CloudAccountUpdate'), - action: 'update', - permissions: ['xpack.change_account'] - } - }, { path: ':id/', component: () => import('@/views/assets/Cloud/Account/AccountDetail/index'), diff --git a/src/views/assets/Cloud/Account/AccountCreateUpdate.vue b/src/views/assets/Cloud/Account/AccountCreateUpdate.vue deleted file mode 100644 index 9051020f8..000000000 --- a/src/views/assets/Cloud/Account/AccountCreateUpdate.vue +++ /dev/null @@ -1,292 +0,0 @@ - - - - - diff --git a/src/views/assets/Cloud/Account/AccountDetail/AccountDetail.vue b/src/views/assets/Cloud/Account/AccountDetail/AccountDetail.vue index b71d5381d..0bffd7aa2 100644 --- a/src/views/assets/Cloud/Account/AccountDetail/AccountDetail.vue +++ b/src/views/assets/Cloud/Account/AccountDetail/AccountDetail.vue @@ -11,7 +11,7 @@ + + diff --git a/src/views/assets/Cloud/Account/components/UpdateDialog.vue b/src/views/assets/Cloud/Account/components/UpdateDialog.vue index 4d1f1b44b..d1c487935 100644 --- a/src/views/assets/Cloud/Account/components/UpdateDialog.vue +++ b/src/views/assets/Cloud/Account/components/UpdateDialog.vue @@ -1,44 +1,69 @@ diff --git a/src/views/assets/Cloud/Strategy/StrategyList.vue b/src/views/assets/Cloud/Strategy/StrategyList.vue index 69f6613b6..1b5188dfb 100644 --- a/src/views/assets/Cloud/Strategy/StrategyList.vue +++ b/src/views/assets/Cloud/Strategy/StrategyList.vue @@ -1,18 +1,25 @@ diff --git a/src/views/assets/Cloud/Strategy/components/ActionInput.vue b/src/views/assets/Cloud/Strategy/components/ActionInput.vue index c3d55fce8..7d1d73e6a 100644 --- a/src/views/assets/Cloud/Strategy/components/ActionInput.vue +++ b/src/views/assets/Cloud/Strategy/components/ActionInput.vue @@ -39,7 +39,8 @@ export default { submitBtnSize: 'mini', submitBtnText: this.$t('Add'), hasReset: false, - onSubmit: () => {}, + onSubmit: () => { + }, submitMethod: () => 'post', getUrl: () => '', cleanFormValue(data) { @@ -247,7 +248,6 @@ export default { } .action-input { - margin-top: -10px; } diff --git a/src/views/assets/Cloud/Account/components/SyncInstanceTaskStrategy/AttrDialog.vue b/src/views/assets/Cloud/Strategy/components/SyncInstanceTaskStrategy/AttrDialog.vue similarity index 98% rename from src/views/assets/Cloud/Account/components/SyncInstanceTaskStrategy/AttrDialog.vue rename to src/views/assets/Cloud/Strategy/components/SyncInstanceTaskStrategy/AttrDialog.vue index 857ab755e..2947d15f2 100644 --- a/src/views/assets/Cloud/Account/components/SyncInstanceTaskStrategy/AttrDialog.vue +++ b/src/views/assets/Cloud/Strategy/components/SyncInstanceTaskStrategy/AttrDialog.vue @@ -15,10 +15,10 @@ - - diff --git a/src/views/assets/Cloud/const.js b/src/views/assets/Cloud/const.js index d3ec982d9..3254b6862 100644 --- a/src/views/assets/Cloud/const.js +++ b/src/views/assets/Cloud/const.js @@ -29,6 +29,18 @@ export const scp = 'scp' export const apsara_stack = 'apsara_stack' export const lan = 'lan' +export const publicCloudProviders = [ + aliyun, qcloud, qcloud_lighthouse, huaweicloud, + baiducloud, jdcloud, kingsoftcloud, aws_china, + aws_international, azure, azure_international, + gcp, ucloud, volcengine +] + +export const privateCloudProviders = [ + vmware, qingcloud_private, huaweicloud_private, state_private, + openstack, zstack, nutanix, fc, scp, apsara_stack +] + export const ACCOUNT_PROVIDER_ATTRS_MAP = { [aliyun]: { name: aliyun,