From 87196e0cd1f54d4a436ed955b1c46ecdf69dcbc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com> Date: Tue, 11 Apr 2023 16:23:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=BF=9C=E7=A8=8B?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=8F=91=E5=B8=83=E6=9C=BA=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E5=88=B0=E8=AF=A6=E6=83=85=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DetailCard/auto.vue | 4 ++-- .../AppletHost/AppletHostDetail/Detail.vue | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/components/DetailCard/auto.vue b/src/components/DetailCard/auto.vue index f22a287b7..e7336dd24 100644 --- a/src/components/DetailCard/auto.vue +++ b/src/components/DetailCard/auto.vue @@ -141,9 +141,9 @@ export default { } else if (fieldMeta.type === 'labeled_choice') { value = value?.['label'] } else if (fieldMeta.type === 'related_field' || fieldMeta.type === 'nested object') { - value = value['name'] + value = value?.['name'] } else if (fieldMeta.type === 'm2m_related_field') { - value = value.map(item => item['name']).join(', ') + value = value?.map(item => item['name']).join(', ') } else if (fieldMeta.type === 'boolean') { value = value ? this.$t('common.Yes') : this.$t('common.No') } diff --git a/src/views/settings/Applet/AppletHost/AppletHostDetail/Detail.vue b/src/views/settings/Applet/AppletHost/AppletHostDetail/Detail.vue index 5d2718111..1c4947094 100644 --- a/src/views/settings/Applet/AppletHost/AppletHostDetail/Detail.vue +++ b/src/views/settings/Applet/AppletHost/AppletHostDetail/Detail.vue @@ -2,8 +2,8 @@ - - + + @@ -116,18 +116,18 @@ export default { ] }, detailSpecInfoConfig: { - show: Object.keys(this.object['spec_info']).length > 0, title: this.$t('common.SpecificInfo'), - url: `/api/v1/assets/assets/${this.object.id}/spec-info/`, - object: this.object.spec_info, + url: `/api/v1/assets/assets/${this.object.id}/`, + object: this.object, + nested: 'spec_info', showUndefine: false, excludes: ['spec_info.script'] }, detailInfoConfig: { - show: this.object.category.value === 'host' && Object.keys(this.object['info']).length > 0, - url: `/api/v1/assets/hosts/${this.object.id}/info/`, + url: `/api/v1/assets/hosts/${this.object.id}/`, title: this.$t('assets.HardwareInfo'), - object: this.object.info, + object: this.object, + nested: 'info', showUndefine: false } }