|
35 | 35 | <resource-icon :image="resourceIcon" size="4x" style="margin-right: 5px"/> |
36 | 36 | </span> |
37 | 37 | <span v-else> |
38 | | - <os-logo v-if="resource.ostypeid || resource.ostypename || ['guestoscategory'].includes($route.path.split('/')[1])" :osId="resource.ostypeid" :osName="resource.ostypename || resource.osdisplayname || resource.name" size="3x" @update-osname="setResourceOsType"/> |
| 38 | + <os-logo v-if="resource.ostypeid || resource.ostypename || ['guestoscategory'].includes($route.path.split('/')[1])" :osId="resource.ostypeid" :osName="resource.ostypename || resource.osdisplayname || resource.name" size="3x" /> |
39 | 39 | <render-icon v-else-if="typeof $route.meta.icon ==='string'" style="font-size: 36px" :icon="$route.meta.icon" /> |
40 | 40 | <font-awesome-icon |
41 | 41 | v-else-if="$route.meta.icon && Array.isArray($route.meta.icon)" |
|
153 | 153 | <span style="margin-left: 10px;"><copy-label :label="resource.id" /></span> |
154 | 154 | </div> |
155 | 155 | </div> |
156 | | - <div class="resource-detail-item" v-if="resource.ostypename && resource.ostypeid"> |
| 156 | + <div class="resource-detail-item" v-if="(resource.ostypename || resource.osdisplayname) && resource.ostypeid"> |
157 | 157 | <div class="resource-detail-item__label">{{ $t('label.ostypename') }}</div> |
158 | 158 | <div class="resource-detail-item__details"> |
159 | 159 | <span v-if="images.guestoscategory"> |
160 | 160 | <resource-icon :image="images.guestoscategory" size="1x" style="margin-right: 5px"/> |
161 | 161 | </span> |
162 | | - <os-logo v-else :osId="resource.ostypeid" :osName="resource.ostypename" size="lg" style="margin-left: -1px" /> |
| 162 | + <os-logo v-else :osId="resource.ostypeid" :osName="resource.ostypename || resource.osdisplayname" size="lg" style="margin-left: -1px" /> |
163 | 163 | <span style="margin-left: 8px"> |
164 | 164 | <router-link v-if="$router.resolve('/guestos/' + resource.ostypeid).matched[0].redirect !== '/exception/404'" :to="{ path: '/guestos/' + resource.ostypeid }"> |
165 | | - {{ resource.ostypename }} |
| 165 | + {{ resource.ostypename || resource.osdisplayname }} |
166 | 166 | </router-link> |
167 | | - <span v-else>{{ resource.ostypename }}</span> |
| 167 | + <span v-else>{{ resource.ostypename || resource.osdisplayname }}</span> |
168 | 168 | </span> |
169 | 169 | </div> |
170 | 170 | </div> |
@@ -1252,10 +1252,6 @@ export default { |
1252 | 1252 | this.getTags() |
1253 | 1253 | }) |
1254 | 1254 | }, |
1255 | | - setResourceOsType (name) { |
1256 | | - this.newResource.ostypename = name |
1257 | | - this.$emit('change-resource', this.newResource) |
1258 | | - }, |
1259 | 1255 | getRouterQuery (item) { |
1260 | 1256 | const query = {} |
1261 | 1257 | if (item.value) { |
|
0 commit comments