Merge pull request #6747 from GuoLiBin6/fix/glb-to-3.12/cloudenv

fix(v3.12/9955): 新建云账号默认开启代理请求
yunionio · Jun 20, 2024 · ca4c18a · ca4c18a
2 parents 0c0cfc6 + ff10f3c
commit ca4c18a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/containers/Cloudenv/views/cloudaccount/components/ProxySetting.vue b/containers/Cloudenv/views/cloudaccount/components/ProxySetting.vue
@@ -60,7 +60,7 @@ export default {
     },
   },
   created () {
-    if (this.account && this.isPermission) {
+    if (this.isPermission) {
       this.fetchQueryProxy()
     }
   },

diff --git a/containers/Cloudenv/views/cloudaccount/mixins/singleActions.js b/containers/Cloudenv/views/cloudaccount/mixins/singleActions.js
@@ -224,15 +224,15 @@ export default {
                     let tooltip
                     if (obj.saml_auth) tooltip = this.$t('cloudaccount.tooltip.already_enable_sso')
                     const isSupportSAMLAuth = ['Aws', 'Aliyun', 'Huawei', 'Qcloud', 'Azure', 'HCSO', 'HCS'].includes(obj.brand)
-                    if (!isSupportSAMLAuth) tooltip = this.$t('cloudaccount.tooltip.not_support_sso', [obj.brand])
+                    if (!isSupportSAMLAuth) tooltip = this.$t('cloudaccount.tooltip.not_support_sso', [BRAND_MAP[obj.brand]?.label || obj.brand])
                     if (obj.brand === 'Azure' && obj.access_url !== 'AzurePublicCloud') {
                       let txt
                       Object.keys(i18n.t('cloudAccountAccessType')).forEach(k => {
                         if (obj.access_url.indexOf(k) > -1) {
                           txt = i18n.t('cloudAccountAccessType')[k]
                         }
                       })
-                      tooltip = this.$t('cloudaccount.tooltip.not_support_sso', [`${obj.brand} ${txt}`])
+                      tooltip = this.$t('cloudaccount.tooltip.not_support_sso', [`${BRAND_MAP[obj.brand]?.label || obj.brand} ${txt}`])
                       return { validate: false, tooltip }
                     }
                     return {