diff --git a/cmdb-ui/src/modules/cmdb/views/ci/index.vue b/cmdb-ui/src/modules/cmdb/views/ci/index.vue index 0c31669..64019af 100644 --- a/cmdb-ui/src/modules/cmdb/views/ci/index.vue +++ b/cmdb-ui/src/modules/cmdb/views/ci/index.vue @@ -108,7 +108,7 @@ {{ col.title }} - + + + + + {{ ci[attr.name].join(',') }} + {{ getName(ci[attr.name]) }} @@ -75,7 +78,6 @@ placeholder="请选择" v-if="attr.is_choice" :mode="attr.is_list ? 'multiple' : 'default'" - :multiple="attr.is_list" showSearch allowClear size="small" @@ -103,6 +105,23 @@ + + diff --git a/cmdb-ui/src/modules/cmdb/views/relation_views/index.vue b/cmdb-ui/src/modules/cmdb/views/relation_views/index.vue index 3310c5d..e5b87f3 100644 --- a/cmdb-ui/src/modules/cmdb/views/relation_views/index.vue +++ b/cmdb-ui/src/modules/cmdb/views/relation_views/index.vue @@ -25,7 +25,7 @@ :expandedKeys="expandedKeys" > - + - 新建新建 @@ -135,7 +131,7 @@ {{ col.title }} - + + + + > 属性说明 - 新建新建 - + + + { - if (!(item.field in this.initialPasswordValue) && !_.isEqual(row[item.field], this.initialInstanceList[rowIndex][item.field])) { + if ( + !(item.field in this.initialPasswordValue) && + !_.isEqual(row[item.field], this.initialInstanceList[rowIndex][item.field]) + ) { data[item.field] = row[item.field] ?? null } })