diff --git a/cmdb-ui/src/modules/cmdb/components/ciTable/index.vue b/cmdb-ui/src/modules/cmdb/components/ciTable/index.vue index 39918eb..8f2538e 100644 --- a/cmdb-ui/src/modules/cmdb/components/ciTable/index.vue +++ b/cmdb-ui/src/modules/cmdb/components/ciTable/index.vue @@ -107,8 +107,8 @@ :type="choice[1].icon.name" /> </template> - <a-tooltip placement="topLeft" :title="choice[1].label || choice[0]"> - <span>{{ choice[1].label || choice[0] }}</span> + <a-tooltip placement="topLeft" :title="choice[1] ? choice[1].label || choice[0] : choice[0]"> + <span>{{ choice[1] ? choice[1].label || choice[0] : choice[0] }}</span> </a-tooltip> </span> </a-select-option> diff --git a/cmdb-ui/src/modules/cmdb/views/ci/modules/CreateInstanceForm.vue b/cmdb-ui/src/modules/cmdb/views/ci/modules/CreateInstanceForm.vue index 816c9c9..4d2603d 100644 --- a/cmdb-ui/src/modules/cmdb/views/ci/modules/CreateInstanceForm.vue +++ b/cmdb-ui/src/modules/cmdb/views/ci/modules/CreateInstanceForm.vue @@ -128,8 +128,8 @@ v-if="choice[1] && choice[1].icon && choice[1].icon.name" :type="choice[1].icon.name" /> - <a-tooltip placement="topLeft" :title="choice[1].label || choice[0]" > - {{ choice[1].label || choice[0] }} + <a-tooltip placement="topLeft" :title="choice[1] ? choice[1].label || choice[0] : choice[0]" > + {{ choice[1] ? choice[1].label || choice[0] : choice[0] }} </a-tooltip> </span> </a-select-option> diff --git a/cmdb-ui/src/modules/cmdb/views/ci/modules/ciDetailAttrContent.vue b/cmdb-ui/src/modules/cmdb/views/ci/modules/ciDetailAttrContent.vue index fcb073c..29d7c7e 100644 --- a/cmdb-ui/src/modules/cmdb/views/ci/modules/ciDetailAttrContent.vue +++ b/cmdb-ui/src/modules/cmdb/views/ci/modules/ciDetailAttrContent.vue @@ -134,7 +134,7 @@ :type="choice[1].icon.name" /> </template> - {{ choice[1].label || choice[0] }} + {{ choice[1] ? choice[1].label || choice[0] : choice[0] }} </span> </a-select-option> </a-select> diff --git a/cmdb-ui/src/modules/cmdb/views/ci/modules/createInstanceFormByGroup.vue b/cmdb-ui/src/modules/cmdb/views/ci/modules/createInstanceFormByGroup.vue index 621675f..d1dee14 100644 --- a/cmdb-ui/src/modules/cmdb/views/ci/modules/createInstanceFormByGroup.vue +++ b/cmdb-ui/src/modules/cmdb/views/ci/modules/createInstanceFormByGroup.vue @@ -72,8 +72,8 @@ :type="choice[1].icon.name" /> </template> - <a-tooltip placement="topLeft" :title="choice[1].label || choice[0]"> - {{ choice[1].label || choice[0] }} + <a-tooltip placement="topLeft" :title="choice[1] ? choice[1].label || choice[0] : choice[0]"> + {{ choice[1] ? choice[1].label || choice[0] : choice[0] }} </a-tooltip> </span> </a-select-option> diff --git a/cmdb-ui/src/modules/cmdb/views/ci_types/preValueArea.vue b/cmdb-ui/src/modules/cmdb/views/ci_types/preValueArea.vue index ddd02f7..d184163 100644 --- a/cmdb-ui/src/modules/cmdb/views/ci_types/preValueArea.vue +++ b/cmdb-ui/src/modules/cmdb/views/ci_types/preValueArea.vue @@ -450,8 +450,9 @@ export default { return [ item[0], { - ...item[1], - label: item?.[1]?.['label'] || item[0] + icon: item?.[1]?.['icon'] || {}, + style: item?.[1]?.['style'] || {}, + label: item?.[1]?.['label'] || item?.[0] || '' } ] })