7x31
/
cmdb
mirror of https://github.com/veops/cmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #607 from veops/dev_ui_240828 

fix(ui): ci choice attr error
This commit is contained in:
Leo Song 2024-08-28 18:52:43 +08:00 committed by GitHub
parent f3e8757450 00c7a644a2
commit 02235d8cc0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmdb-ui/src/modules/cmdb/components/ciTable/index.vue
View File

@ -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>

4
cmdb-ui/src/modules/cmdb/views/ci/modules/CreateInstanceForm.vue
View File

@ -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>

2
cmdb-ui/src/modules/cmdb/views/ci/modules/ciDetailAttrContent.vue
View File

@ -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>

4
cmdb-ui/src/modules/cmdb/views/ci/modules/createInstanceFormByGroup.vue
View File

@ -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>

5
cmdb-ui/src/modules/cmdb/views/ci_types/preValueArea.vue
View File

@ -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] || ''
}
]
})