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

Merge branch 'master' of github.com:veops/cmdb

This commit is contained in:
pycook 2023-08-25 11:01:24 +08:00
parent 2a98c00d97 5044af5490
commit cd70b16eb3
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmdb-api/api/lib/cmdb/auto_discovery/auto_discovery.py
View File

@ -453,9 +453,11 @@ class AutoDiscoveryCICRUD(DBMixin):
relation_adts = AutoDiscoveryCIType.get_by(type_id=adt.type_id, adr_id=None, to_dict=False) relation_adts = AutoDiscoveryCIType.get_by(type_id=adt.type_id, adr_id=None, to_dict=False)
for r_adt in relation_adts: for r_adt in relation_adts:
if r_adt.relation and ci_id is not None: if not r_adt.relation or ci_id is None:
ad_key, cmdb_key = None, {} continue
for ad_key in r_adt.relation: for ad_key in r_adt.relation:
if not adc.instance.get(ad_key):
continue
cmdb_key = r_adt.relation[ad_key] cmdb_key = r_adt.relation[ad_key]
query = "_type:{},{}:{}".format(cmdb_key.get('type_name'), cmdb_key.get('attr_name'), query = "_type:{},{}:{}".format(cmdb_key.get('type_name'), cmdb_key.get('attr_name'),
adc.instance.get(ad_key)) adc.instance.get(ad_key))

3
cmdb-ui/src/modules/cmdb/views/relation_type/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<a-card :bordered="false"> <a-card :bordered="false">
<div class="action-btn"> <div class="action-btn">
<a-button @click="handleCreate" type="primary" style="margin-bottom: 15px">新增关系类型</a-button> <a-button @click="handleCreate" type="primary" style="margin-bottom: 15px;">新增关系类型</a-button>
</div> </div>
<vxe-table <vxe-table
ref="relationTypeTable" ref="relationTypeTable"
@ -122,7 +122,6 @@ export default {
if ($event.keyCode === 13) { if ($event.keyCode === 13) {
const $table = this.$refs.relationTypeTable const $table = this.$refs.relationTypeTable
$table.clearActived() $table.clearActived()
this.handleEditClose({ row: value.row })
} }
}, },
}, },