diff --git a/ui/src/components/view/DedicateDomain.vue b/ui/src/components/view/DedicateDomain.vue index 8214922f823..3cdd80434ad 100644 --- a/ui/src/components/view/DedicateDomain.vue +++ b/ui/src/components/view/DedicateDomain.vue @@ -23,7 +23,7 @@

{{ $t('label.required') }}

- {{ domain.name }} + {{ domain.path || domain.name || domain.description }} diff --git a/ui/src/views/compute/AssignInstance.vue b/ui/src/views/compute/AssignInstance.vue index e534bcb3abc..883e4b3e76f 100644 --- a/ui/src/views/compute/AssignInstance.vue +++ b/ui/src/views/compute/AssignInstance.vue @@ -39,7 +39,7 @@

*{{ $t('label.domain') }}

- {{ domain.path }} + {{ domain.path || domain.name || domain.description }} diff --git a/ui/src/views/compute/CreateSSHKeyPair.vue b/ui/src/views/compute/CreateSSHKeyPair.vue index cefac878f31..81fa7c57b7d 100644 --- a/ui/src/views/compute/CreateSSHKeyPair.vue +++ b/ui/src/views/compute/CreateSSHKeyPair.vue @@ -49,7 +49,7 @@ :placeholder="apiParams.domainid.description" @change="val => { this.handleDomainChanged(this.domains[val]) }"> - {{ opt.name || opt.description }} + {{ opt.path || opt.name || opt.description }} diff --git a/ui/src/views/iam/AddAccount.vue b/ui/src/views/iam/AddAccount.vue index db7e734a3a0..bb0359b2372 100644 --- a/ui/src/views/iam/AddAccount.vue +++ b/ui/src/views/iam/AddAccount.vue @@ -145,7 +145,7 @@ rules: [{ required: true, message: $t('message.error.select') }] }]" :placeholder="apiParams.domainid.description"> - {{ domain.name }} + {{ domain.path || domain.name || domain.description }} diff --git a/ui/src/views/iam/AddUser.vue b/ui/src/views/iam/AddUser.vue index 27196df10cc..8ef88eb64ce 100644 --- a/ui/src/views/iam/AddUser.vue +++ b/ui/src/views/iam/AddUser.vue @@ -125,7 +125,7 @@ v-decorator="['domainid']" :placeholder="apiParams.domainid.description"> - {{ domain.name }} + {{ domain.path || domain.name || domain.description }} diff --git a/ui/src/views/infra/network/DedicatedVLANTab.vue b/ui/src/views/infra/network/DedicatedVLANTab.vue index 444e9f6d17f..ffb82179581 100644 --- a/ui/src/views/infra/network/DedicatedVLANTab.vue +++ b/ui/src/views/infra/network/DedicatedVLANTab.vue @@ -92,7 +92,7 @@ rules: [{ required: true, message: `${$t('label.required')}` }] }]" > - {{ domain.name }} + {{ domain.path || domain.name || domain.description }} diff --git a/ui/src/views/infra/network/IpRangesTabPublic.vue b/ui/src/views/infra/network/IpRangesTabPublic.vue index 924f5938bec..285152ec6d8 100644 --- a/ui/src/views/infra/network/IpRangesTabPublic.vue +++ b/ui/src/views/infra/network/IpRangesTabPublic.vue @@ -125,7 +125,7 @@ {{ domain.name }} + :value="domain.id">{{ domain.path || domain.name || domain.description }} @@ -187,7 +187,7 @@ {{ domain.name }} + :value="domain.id">{{ domain.path || domain.name || domain.description }} diff --git a/ui/src/views/network/CreateIsolatedNetworkForm.vue b/ui/src/views/network/CreateIsolatedNetworkForm.vue index fb2c9f45cf9..135e6bc3ff1 100644 --- a/ui/src/views/network/CreateIsolatedNetworkForm.vue +++ b/ui/src/views/network/CreateIsolatedNetworkForm.vue @@ -97,7 +97,7 @@ :placeholder="this.$t('label.domainid')" @change="val => { this.handleDomainChange(this.domains[val]) }"> - {{ opt.name || opt.description }} + {{ opt.path || opt.name || opt.description }} diff --git a/ui/src/views/network/CreateL2NetworkForm.vue b/ui/src/views/network/CreateL2NetworkForm.vue index f55b4acd1ec..9771e282238 100644 --- a/ui/src/views/network/CreateL2NetworkForm.vue +++ b/ui/src/views/network/CreateL2NetworkForm.vue @@ -97,7 +97,7 @@ :placeholder="this.$t('label.domainid')" @change="val => { this.handleDomainChange(this.domains[val]) }"> - {{ opt.name || opt.description }} + {{ opt.path || opt.name || opt.description }} diff --git a/ui/src/views/network/CreateSharedNetworkForm.vue b/ui/src/views/network/CreateSharedNetworkForm.vue index 32b200b92dd..e2556047380 100644 --- a/ui/src/views/network/CreateSharedNetworkForm.vue +++ b/ui/src/views/network/CreateSharedNetworkForm.vue @@ -207,7 +207,7 @@ :placeholder="this.$t('label.domainid')" @change="val => { this.handleDomainChange(this.domains[val]) }"> - {{ opt.name || opt.description }} + {{ opt.path || opt.name || opt.description }}