Merge pull request #607 from veops/dev_ui_240828

fix(ui): ci choice attr error
veops · Aug 28, 2024 · 02235d8 · 02235d8
2 parents f3e8757 + 00c7a64
commit 02235d8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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] || ''
               }
             ]
           })