diff --git a/src/assets/img/cloud/ali.png b/src/assets/img/cloud/ali.png deleted file mode 100644 index c1075807e..000000000 Binary files a/src/assets/img/cloud/ali.png and /dev/null differ diff --git a/src/assets/img/cloud/ali.svg b/src/assets/img/cloud/ali.svg new file mode 100644 index 000000000..e360533b3 --- /dev/null +++ b/src/assets/img/cloud/ali.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/cloud/aws.png b/src/assets/img/cloud/aws.png deleted file mode 100644 index b75ca636c..000000000 Binary files a/src/assets/img/cloud/aws.png and /dev/null differ diff --git a/src/assets/img/cloud/aws_china.png b/src/assets/img/cloud/aws_china.png deleted file mode 100644 index 5e0017e15..000000000 Binary files a/src/assets/img/cloud/aws_china.png and /dev/null differ diff --git a/src/assets/img/cloud/aws_china.svg b/src/assets/img/cloud/aws_china.svg new file mode 100644 index 000000000..e843ece9f --- /dev/null +++ b/src/assets/img/cloud/aws_china.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/cloud/aws_international.png b/src/assets/img/cloud/aws_international.png deleted file mode 100644 index d1a582752..000000000 Binary files a/src/assets/img/cloud/aws_international.png and /dev/null differ diff --git a/src/assets/img/cloud/aws_international.svg b/src/assets/img/cloud/aws_international.svg new file mode 100644 index 000000000..e843ece9f --- /dev/null +++ b/src/assets/img/cloud/aws_international.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/cloud/azure_china.png b/src/assets/img/cloud/azure_china.png deleted file mode 100644 index 43d87a4fd..000000000 Binary files a/src/assets/img/cloud/azure_china.png and /dev/null differ diff --git a/src/assets/img/cloud/azure_china.svg b/src/assets/img/cloud/azure_china.svg new file mode 100644 index 000000000..3a0112255 --- /dev/null +++ b/src/assets/img/cloud/azure_china.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/cloud/azure_international.png b/src/assets/img/cloud/azure_international.png deleted file mode 100644 index e0f66cc39..000000000 Binary files a/src/assets/img/cloud/azure_international.png and /dev/null differ diff --git a/src/assets/img/cloud/azure_international.svg b/src/assets/img/cloud/azure_international.svg new file mode 100644 index 000000000..3a0112255 --- /dev/null +++ b/src/assets/img/cloud/azure_international.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/cloud/baidu.png b/src/assets/img/cloud/baidu.png deleted file mode 100644 index b47d22301..000000000 Binary files a/src/assets/img/cloud/baidu.png and /dev/null differ diff --git a/src/assets/img/cloud/baidu.svg b/src/assets/img/cloud/baidu.svg new file mode 100644 index 000000000..abe67b875 --- /dev/null +++ b/src/assets/img/cloud/baidu.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/cloud/gcp.png b/src/assets/img/cloud/gcp.png deleted file mode 100644 index c8c7e8cc2..000000000 Binary files a/src/assets/img/cloud/gcp.png and /dev/null differ diff --git a/src/assets/img/cloud/gcp.svg b/src/assets/img/cloud/gcp.svg new file mode 100644 index 000000000..db9707a0e --- /dev/null +++ b/src/assets/img/cloud/gcp.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/cloud/huawei.png b/src/assets/img/cloud/huawei.png deleted file mode 100644 index 9c9666ae8..000000000 Binary files a/src/assets/img/cloud/huawei.png and /dev/null differ diff --git a/src/assets/img/cloud/huawei.svg b/src/assets/img/cloud/huawei.svg new file mode 100644 index 000000000..c550ef979 --- /dev/null +++ b/src/assets/img/cloud/huawei.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/cloud/huawei_fc.png b/src/assets/img/cloud/huawei_fc.png deleted file mode 100644 index 3758c009c..000000000 Binary files a/src/assets/img/cloud/huawei_fc.png and /dev/null differ diff --git a/src/assets/img/cloud/jd.png b/src/assets/img/cloud/jd.png deleted file mode 100644 index 42e5f7c71..000000000 Binary files a/src/assets/img/cloud/jd.png and /dev/null differ diff --git a/src/assets/img/cloud/jd.svg b/src/assets/img/cloud/jd.svg new file mode 100644 index 000000000..3ccb2ba9a --- /dev/null +++ b/src/assets/img/cloud/jd.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/cloud/kingsoft.png b/src/assets/img/cloud/kingsoft.png deleted file mode 100644 index b580e988a..000000000 Binary files a/src/assets/img/cloud/kingsoft.png and /dev/null differ diff --git a/src/assets/img/cloud/kingsoft.svg b/src/assets/img/cloud/kingsoft.svg new file mode 100644 index 000000000..69617b44f --- /dev/null +++ b/src/assets/img/cloud/kingsoft.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/cloud/lan.png b/src/assets/img/cloud/lan.png deleted file mode 100644 index 6eb4a78f6..000000000 Binary files a/src/assets/img/cloud/lan.png and /dev/null differ diff --git a/src/assets/img/cloud/lan.svg b/src/assets/img/cloud/lan.svg new file mode 100644 index 000000000..e60791d0b --- /dev/null +++ b/src/assets/img/cloud/lan.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/cloud/lan2.png b/src/assets/img/cloud/lan2.png deleted file mode 100644 index 02f1accd2..000000000 Binary files a/src/assets/img/cloud/lan2.png and /dev/null differ diff --git a/src/assets/img/cloud/nutanix.png b/src/assets/img/cloud/nutanix.png deleted file mode 100644 index 5c80ae76c..000000000 Binary files a/src/assets/img/cloud/nutanix.png and /dev/null differ diff --git a/src/assets/img/cloud/nutanix.svg b/src/assets/img/cloud/nutanix.svg new file mode 100644 index 000000000..3e3eaf8a2 --- /dev/null +++ b/src/assets/img/cloud/nutanix.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/cloud/openstack.png b/src/assets/img/cloud/openstack.png deleted file mode 100644 index 55803b0b2..000000000 Binary files a/src/assets/img/cloud/openstack.png and /dev/null differ diff --git a/src/assets/img/cloud/openstack.svg b/src/assets/img/cloud/openstack.svg new file mode 100644 index 000000000..76da013ef --- /dev/null +++ b/src/assets/img/cloud/openstack.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/cloud/qcloud.png b/src/assets/img/cloud/qcloud.png deleted file mode 100644 index fcc3eda03..000000000 Binary files a/src/assets/img/cloud/qcloud.png and /dev/null differ diff --git a/src/assets/img/cloud/qcloud.svg b/src/assets/img/cloud/qcloud.svg new file mode 100644 index 000000000..559e4cdef --- /dev/null +++ b/src/assets/img/cloud/qcloud.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/cloud/qcloud_lighthouse.png b/src/assets/img/cloud/qcloud_lighthouse.png deleted file mode 100644 index 5a0a7204f..000000000 Binary files a/src/assets/img/cloud/qcloud_lighthouse.png and /dev/null differ diff --git a/src/assets/img/cloud/qcloud_lighthouse.svg b/src/assets/img/cloud/qcloud_lighthouse.svg new file mode 100644 index 000000000..559e4cdef --- /dev/null +++ b/src/assets/img/cloud/qcloud_lighthouse.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/cloud/qing.png b/src/assets/img/cloud/qing.png deleted file mode 100644 index 5373324fa..000000000 Binary files a/src/assets/img/cloud/qing.png and /dev/null differ diff --git a/src/assets/img/cloud/qing.svg b/src/assets/img/cloud/qing.svg new file mode 100644 index 000000000..b5e2da4af --- /dev/null +++ b/src/assets/img/cloud/qing.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/cloud/scp.png b/src/assets/img/cloud/scp.png deleted file mode 100644 index 15c82dc68..000000000 Binary files a/src/assets/img/cloud/scp.png and /dev/null differ diff --git a/src/assets/img/cloud/scp.svg b/src/assets/img/cloud/scp.svg new file mode 100644 index 000000000..1141bcb3c --- /dev/null +++ b/src/assets/img/cloud/scp.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/cloud/state.png b/src/assets/img/cloud/state.png deleted file mode 100644 index 29a4746a1..000000000 Binary files a/src/assets/img/cloud/state.png and /dev/null differ diff --git a/src/assets/img/cloud/state.svg b/src/assets/img/cloud/state.svg new file mode 100644 index 000000000..2d9343fd0 --- /dev/null +++ b/src/assets/img/cloud/state.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/cloud/ucloud.png b/src/assets/img/cloud/ucloud.png deleted file mode 100644 index 4e5d909a1..000000000 Binary files a/src/assets/img/cloud/ucloud.png and /dev/null differ diff --git a/src/assets/img/cloud/ucloud.svg b/src/assets/img/cloud/ucloud.svg new file mode 100644 index 000000000..8ca934a89 --- /dev/null +++ b/src/assets/img/cloud/ucloud.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/cloud/vmware.png b/src/assets/img/cloud/vmware.png deleted file mode 100644 index 8153ff788..000000000 Binary files a/src/assets/img/cloud/vmware.png and /dev/null differ diff --git a/src/assets/img/cloud/vmware.svg b/src/assets/img/cloud/vmware.svg new file mode 100644 index 000000000..76928e52c --- /dev/null +++ b/src/assets/img/cloud/vmware.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/cloud/volcengine.png b/src/assets/img/cloud/volcengine.png deleted file mode 100644 index 994ee7b6c..000000000 Binary files a/src/assets/img/cloud/volcengine.png and /dev/null differ diff --git a/src/assets/img/cloud/volcengine.svg b/src/assets/img/cloud/volcengine.svg new file mode 100644 index 000000000..ffb5a70b9 --- /dev/null +++ b/src/assets/img/cloud/volcengine.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/cloud/zstack.png b/src/assets/img/cloud/zstack.png deleted file mode 100644 index 58e5b300b..000000000 Binary files a/src/assets/img/cloud/zstack.png and /dev/null differ diff --git a/src/assets/img/cloud/zstack.svg b/src/assets/img/cloud/zstack.svg new file mode 100644 index 000000000..cb6502f8b --- /dev/null +++ b/src/assets/img/cloud/zstack.svg @@ -0,0 +1 @@ + diff --git a/src/layout/components/NavHeader/Language.vue b/src/layout/components/NavHeader/Language.vue index f7adc02e8..0fde23a5e 100644 --- a/src/layout/components/NavHeader/Language.vue +++ b/src/layout/components/NavHeader/Language.vue @@ -63,6 +63,9 @@ export default { }, mounted() { this.changeMomentLang() + + const userLang = localStorage.getItem('lang') + document.documentElement.lang = userLang }, methods: { changeLang() { diff --git a/src/styles/ztree.css b/src/styles/ztree.css index ceec42c27..c4d1ee0d6 100644 --- a/src/styles/ztree.css +++ b/src/styles/ztree.css @@ -111,6 +111,8 @@ website: http://code.google.com/p/jquerytree/ font-family: FontAwesome; padding-top: 10px; } + + .ztree li span.button.chk { margin: 0px; cursor: auto; diff --git a/src/views/assets/Cloud/Account/components/AccountPanel.vue b/src/views/assets/Cloud/Account/components/AccountPanel.vue index 57bac06df..d608c69e0 100644 --- a/src/views/assets/Cloud/Account/components/AccountPanel.vue +++ b/src/views/assets/Cloud/Account/components/AccountPanel.vue @@ -19,10 +19,10 @@ - + - + diff --git a/src/views/assets/Cloud/Account/components/AssetPanel.vue b/src/views/assets/Cloud/Account/components/AssetPanel.vue index 76229828f..ddfdad47c 100644 --- a/src/views/assets/Cloud/Account/components/AssetPanel.vue +++ b/src/views/assets/Cloud/Account/components/AssetPanel.vue @@ -59,7 +59,7 @@ export default { title: this.$t('Next'), type: 'primary', hidden: !this.active, - callback: () => { this.$emit('update:active', 4) } + callback: () => { this.$emit('update:active', 3) } } ], config: { diff --git a/src/views/assets/Cloud/Account/components/AuthPanel.vue b/src/views/assets/Cloud/Account/components/AuthPanel.vue index 2c343380d..54eae440d 100644 --- a/src/views/assets/Cloud/Account/components/AuthPanel.vue +++ b/src/views/assets/Cloud/Account/components/AuthPanel.vue @@ -175,7 +175,7 @@ export default { handleSubmitSuccess(res) { if (this.submitType === 'manual') { this.$emit('update:object', res) - this.$emit('update:active', 3) + this.$emit('update:active', 2) } }, handlePerformFinished() { diff --git a/src/views/assets/Cloud/Account/components/CreateDialog.vue b/src/views/assets/Cloud/Account/components/CreateDialog.vue index 92ec7b7c6..01145a1fc 100644 --- a/src/views/assets/Cloud/Account/components/CreateDialog.vue +++ b/src/views/assets/Cloud/Account/components/CreateDialog.vue @@ -64,17 +64,13 @@ export default { }, data() { return { - active: 1, + activeMenuMap: { 0: 'ProviderPanel', 1: 'AuthPanel', 2: 'AssetPanel', 3: 'ResultPanel' }, + activeMenu: 'ProviderPanel', selected: '', activeMenu: 'ProviderPanel', firstStepDesc: this.$tc('SelectPlatforms'), - account: {}, - activeMenuMap: { - 1: 'ProviderPanel', - 2: 'AuthPanel', - 3: 'AssetPanel', - 4: 'ResultPanel' - } + active: 0, + account: {} } }, computed: { @@ -106,3 +102,35 @@ export default { } } + + diff --git a/src/views/assets/Cloud/Account/components/InfoPanel.vue b/src/views/assets/Cloud/Account/components/InfoPanel.vue index 19d0b83c4..1c9ed83ac 100644 --- a/src/views/assets/Cloud/Account/components/InfoPanel.vue +++ b/src/views/assets/Cloud/Account/components/InfoPanel.vue @@ -49,7 +49,6 @@ export default { span { @include textOverflow; - min-width: 120px; text-align: left; } @@ -58,4 +57,20 @@ export default { color: var(--color-text-primary); } } + +html:lang(en) .panel-item span { + min-width: 160px; +} + +html:lang(ja) .panel-item span { + min-width: 160px; +} + +html:lang(cn) .panel-item span { + min-width: 120px; +} + +html:lang(zh_hant) .panel-item span { + min-width: 120px; +} diff --git a/src/views/assets/Cloud/Account/components/ProviderPanel.vue b/src/views/assets/Cloud/Account/components/ProviderPanel.vue index 090993652..d4c7b2bfa 100644 --- a/src/views/assets/Cloud/Account/components/ProviderPanel.vue +++ b/src/views/assets/Cloud/Account/components/ProviderPanel.vue @@ -1,9 +1,9 @@ diff --git a/src/views/assets/Cloud/const.js b/src/views/assets/Cloud/const.js index 0cb5e32dc..cf1ddc5ac 100644 --- a/src/views/assets/Cloud/const.js +++ b/src/views/assets/Cloud/const.js @@ -34,163 +34,152 @@ export const ACCOUNT_PROVIDER_ATTRS_MAP = { name: aliyun, title: i18n.t('Aliyun'), attrs: ['access_key_id', 'access_key_secret'], - image: require('@/assets/img/cloud/ali.png') + image: require('@/assets/img/cloud/ali.svg') }, [aws_international]: { name: aws_international, title: i18n.t('AWS_Int'), attrs: ['access_key_id', 'access_key_secret'], - image: require('@/assets/img/cloud/aws_international.png') + image: require('@/assets/img/cloud/aws_international.svg') }, [aws_china]: { name: aws_china, title: i18n.t('AWS_China'), attrs: ['access_key_id', 'access_key_secret'], - image: require('@/assets/img/cloud/aws_china.png') + image: require('@/assets/img/cloud/aws_china.svg') }, [huaweicloud]: { name: huaweicloud, title: i18n.t('HuaweiCloud'), attrs: ['access_key_id', 'access_key_secret'], - image: require('@/assets/img/cloud/huawei.png'), - imageCSS: { 'margin': '1em 0.5em' } + image: require('@/assets/img/cloud/huawei.svg') }, [baiducloud]: { name: baiducloud, title: i18n.t('BaiduCloud'), attrs: ['access_key_id', 'access_key_secret'], - image: require('@/assets/img/cloud/baidu.png') + image: require('@/assets/img/cloud/baidu.svg') }, [jdcloud]: { name: jdcloud, title: i18n.t('JDCloud'), attrs: ['access_key_id', 'access_key_secret'], - image: require('@/assets/img/cloud/jd.png') + image: require('@/assets/img/cloud/jd.svg') }, [kingsoftcloud]: { name: kingsoftcloud, title: i18n.t('KingSoftCloud'), attrs: ['access_key_id', 'access_key_secret'], - image: require('@/assets/img/cloud/kingsoft.png') + image: require('@/assets/img/cloud/kingsoft.svg') }, [qcloud]: { name: qcloud, title: i18n.t('Qcloud'), attrs: ['access_key_id', 'access_key_secret'], - image: require('@/assets/img/cloud/qcloud.png') + image: require('@/assets/img/cloud/qcloud.svg') }, [qcloud_lighthouse]: { name: qcloud_lighthouse, title: i18n.t('QcloudLighthouse'), attrs: ['access_key_id', 'access_key_secret'], - image: require('@/assets/img/cloud/qcloud_lighthouse.png'), - imageCSS: { 'margin': '1.8em 0.5em' } + image: require('@/assets/img/cloud/qcloud_lighthouse.svg') }, [azure]: { name: azure, title: i18n.t('Azure'), attrs: ['client_id', 'client_secret', 'tenant_id', 'subscription_id'], - image: require('@/assets/img/cloud/azure_china.png') + image: require('@/assets/img/cloud/azure_china.svg') }, [azure_international]: { name: azure_international, title: i18n.t('Azure_Int'), attrs: ['client_id', 'client_secret', 'tenant_id', 'subscription_id'], - image: require('@/assets/img/cloud/azure_international.png') + image: require('@/assets/img/cloud/azure_international.svg') }, [gcp]: { name: gcp, title: i18n.t('GCP'), attrs: ['service_account_key'], - image: require('@/assets/img/cloud/gcp.png') + image: require('@/assets/img/cloud/gcp.svg') }, [ucloud]: { name: ucloud, title: i18n.t('UCloud'), attrs: ['base_url', 'public_key', 'private_key', 'project'], - image: require('@/assets/img/cloud/ucloud.png'), - imageCSS: { 'margin': '0 15px' } + image: require('@/assets/img/cloud/ucloud.svg') }, [volcengine]: { name: volcengine, title: i18n.t('Volcengine'), attrs: ['access_key_id', 'access_key_secret'], - image: require('@/assets/img/cloud/volcengine.png'), - imageCSS: { 'margin': '0 15px' } + image: require('@/assets/img/cloud/volcengine.svg') }, [vmware]: { name: vmware, title: 'VMware', attrs: ['host', 'port', 'username', 'password'], - image: require('@/assets/img/cloud/vmware.png') + image: require('@/assets/img/cloud/vmware.svg') }, [nutanix]: { name: nutanix, title: 'Nutanix', attrs: ['access_key_id', 'access_key_secret', 'api_endpoint'], - image: require('@/assets/img/cloud/nutanix.png'), - imageCSS: { 'margin': '20px' } + image: require('@/assets/img/cloud/nutanix.svg') }, [qingcloud_private]: { name: qingcloud_private, title: i18n.t('QingYunPrivateCloud'), attrs: ['access_key_id', 'access_key_secret', 'api_endpoint'], - image: require('@/assets/img/cloud/qing.png') + image: require('@/assets/img/cloud/qing.svg') }, [huaweicloud_private]: { name: huaweicloud_private, title: i18n.t('HuaweiPrivateCloud'), attrs: ['sc_username', 'sc_password', 'domain_name', 'oc_username', 'oc_password', 'api_endpoint'], - image: require('@/assets/img/cloud/huawei.png'), - imageCSS: { 'margin': '5px 15px' } + image: require('@/assets/img/cloud/huawei.svg') }, [openstack]: { name: openstack, title: i18n.t('OpenStack'), attrs: ['auth_url', 'user_domain_name', 'username', 'password'], - image: require('@/assets/img/cloud/openstack.png'), - imageCSS: { padding: '1em' } + image: require('@/assets/img/cloud/openstack.svg') }, [zstack]: { name: zstack, title: i18n.t('ZStack'), attrs: ['access_key_id', 'access_key_secret', 'api_endpoint'], - image: require('@/assets/img/cloud/zstack.png'), - imageCSS: { 'background-color': '#007FDF', 'padding': '10px' } + image: require('@/assets/img/cloud/zstack.svg') }, [fc]: { name: fc, title: i18n.t('FC'), attrs: ['api_endpoint', 'username', 'password'], - image: require('@/assets/img/cloud/huawei_fc.png'), - imageCSS: { 'margin': '10px' } + image: require('@/assets/img/cloud/huawei.svg') }, [state_private]: { name: state_private, title: i18n.t('StatePrivate'), attrs: ['access_key_id', 'access_key_secret', 'api_endpoint', 'cert_file', 'key_file'], - image: require('@/assets/img/cloud/state.png'), - imageCSS: { padding: '1em' } + image: require('@/assets/img/cloud/state.svg') }, [scp]: { name: scp, title: i18n.t('SCP'), attrs: ['access_key_id', 'access_key_secret', 'api_endpoint'], - image: require('@/assets/img/cloud/scp.png'), - imageCSS: { padding: '1em' } + image: require('@/assets/img/cloud/scp.svg') }, [apsara_stack]: { name: apsara_stack, title: i18n.t('ApsaraStack'), attrs: ['access_key_id', 'access_key_secret', 'api_endpoint'], - image: require('@/assets/img/cloud/ali.png') + image: require('@/assets/img/cloud/ali.svg') }, [lan]: { name: lan, title: i18n.t('LAN'), attrs: ['ip_group', 'test_port', 'test_timeout', 'hostname_prefix'], - image: require('@/assets/img/cloud/lan.png'), - imageCSS: { 'margin': '10px 15px' } + image: require('@/assets/img/cloud/lan.svg'), + imageCSS: { height: '250px' } } }