Skip to content

Commit

Permalink
Merge branch 'master' of github.com:veops/cmdb
Browse files Browse the repository at this point in the history
  • Loading branch information
@pycook
pycook committed Dec 6, 2024
2 parents d322761 + ba7b78a commit 40b452c
Show file tree
Hide file tree
Showing 2 changed files with 191 additions and 5 deletions.
110 changes: 106 additions & 4 deletions cmdb-ui/src/modules/cmdb/views/ci/modules/ciDetailRelation.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
:href="`/cmdb/cidetail/${column.params.attr.reference_type_id}/${id}`"
target="_blank"
>
{{ id }}
{{ getReferenceName(id, column) }}
</a>
</template>
<template #operation_default="{ row }">
Expand Down Expand Up @@ -102,7 +102,7 @@
:href="`/cmdb/cidetail/${column.params.attr.reference_type_id}/${id}`"
target="_blank"
>
{{ id }}
{{ getReferenceName(id, column) }}
</a>
</template>
<template #operation_default="{ row }">
Expand Down Expand Up @@ -133,9 +133,11 @@
import _ from 'lodash'
import { getCITypeChildren, getCITypeParent, getCanEditByParentIdChildId } from '@/modules/cmdb/api/CITypeRelation'
import { searchCIRelation, deleteCIRelationView } from '@/modules/cmdb/api/CIRelation'
import { searchCI } from '@/modules/cmdb/api/ci'
import CiDetailRelationTopo from './ciDetailRelationTopo/index.vue'
import Node from './ciDetailRelationTopo/node.js'
import AddTableModal from '../../relation_views/modules/AddTableModal.vue'

export default {
name: 'CiDetailRelation',
components: { CiDetailRelationTopo, AddTableModal },
Expand Down Expand Up @@ -172,7 +174,8 @@ export default {
topoData: {
nodes: {},
edges: []
}
},
referenceCINameMap: {}
}
},
computed: {
Expand Down Expand Up @@ -211,9 +214,14 @@ export default {
},
methods: {
async init(isFirst) {
const ci_types_list = this.ci_types()
const _findCiType = ci_types_list.find((item) => item.id === this.typeId)
if (!_findCiType) {
return
}

await Promise.all([this.getParentCITypes(), this.getChildCITypes()])
Promise.all([this.getFirstCIs(), this.getSecondCIs()]).then(() => {
const ci_types_list = this.ci_types()
this.handleTopoData()
if (
isFirst &&
Expand All @@ -223,6 +231,8 @@ export default {
this.$refs.ciDetailRelationTopo.exsited_ci = this.exsited_ci
this.$refs.ciDetailRelationTopo.setTopoData(this.topoData)
}

this.handleReferenceCINameMap()
})
},
async getFirstCIs() {
Expand Down Expand Up @@ -394,6 +404,98 @@ export default {
this.secondCIColumns = secondCIColumns
this.secondCIJsonAttr = secondCIJsonAttr
},

async handleReferenceCINameMap() {
const CITypes = _.unionBy(
[
...this.parentCITypes,
...this.childCITypes
],
'id'
)
const CIList = _.unionBy(
_.flatten(
[
...Object.values(this.firstCIs),
...Object.values(this.secondCIs)
]
),
'_id'
)

const CIMap = {}
CIList.forEach((ci) => {
if (!CIMap[ci._type]) {
CIMap[ci._type] = []
}
CIMap[ci._type].push(ci)
})

const referenceCINameMap = {}
CITypes.forEach((CIType) => {
CIType.attributes.forEach((attr) => {
if (attr?.is_reference && attr?.reference_type_id) {
const currentCIList = CIMap[CIType.id]
if (currentCIList?.length) {
currentCIList.forEach((ci) => {
const ids = Array.isArray(ci[attr.name]) ? ci[attr.name] : ci[attr.name] ? [ci[attr.name]] : []

if (ids.length) {
if (!referenceCINameMap?.[attr.reference_type_id]) {
referenceCINameMap[attr.reference_type_id] = {}
}
ids.forEach((id) => {
referenceCINameMap[attr.reference_type_id][id] = ''
})
}
})
}
}
})
})

if (!Object.keys(referenceCINameMap).length) {
return
}

const allRes = await Promise.all(
Object.keys(referenceCINameMap).map((key) => {
return searchCI({
q: `_type:${key},_id:(${Object.keys(referenceCINameMap[key]).join(';')})`,
count: 9999
})
})
)
const CITypeList = this.ci_types()
const showNameMap = {}

Object.keys(referenceCINameMap).forEach((id) => {
const CIType = CITypeList.find((CIType) => Number(CIType.id) === Number(id))

showNameMap[id] = {
show_name: CIType?.show_name,
unique_key: CIType?.unique_key
}
})

allRes.forEach((res) => {
res.result.forEach((item) => {
if (referenceCINameMap?.[item._type]?.[item._id] === '') {
const showName = showNameMap?.[item._type]

referenceCINameMap[item._type][item._id] = item?.[showName?.show_name] ?? item?.[showName?.unique_key] ?? ''
}
})
})

this.referenceCINameMap = referenceCINameMap
},

getReferenceName(id, column) {
const typeId = column?.params?.attr?.reference_type_id
return this.referenceCINameMap?.[typeId]?.[id] || id
},

reload() {
this.init()
},
Expand Down
86 changes: 85 additions & 1 deletion cmdb-ui/src/modules/cmdb/views/relation_views/modules/AddTableModal.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
:href="`/cmdb/cidetail/${col.reference_type_id}/${id}`"
target="_blank"
>
{{ id }}
{{ getReferenceAttrValue(id, col) }}
</a>
</template>
<template #default="{row}" v-else-if="col.is_choice">
Expand Down Expand Up @@ -118,6 +118,7 @@ import SearchForm from '../../../components/searchForm/SearchForm.vue'
import CreateInstanceForm from '../../ci/modules/CreateInstanceForm.vue'
import { getCITypeAttributesById } from '@/modules/cmdb/api/CITypeAttr'
import { SUB_NET_CITYPE_NAME, SCOPE_CITYPE_NAME, ADDRESS_CITYPE_NAME } from '@/modules/cmdb/views/ipam/constants.js'
import { getCITypes } from '@/modules/cmdb/api/CIType'

export default {
name: 'AddTableModal',
Expand All @@ -140,6 +141,9 @@ export default {
ancestor_ids: undefined,
attrList1: [],
showCreateBtn: true, // 是否展示新增按钮

referenceShowAttrNameMap: {},
referenceCIIdMap: {}
}
},
computed: {
Expand Down Expand Up @@ -174,6 +178,7 @@ export default {

await getSubscribeAttributes(this.addTypeId).then((res) => {
this.preferenceAttrList = res.attributes // 已经订阅的全部列
this.handleReferenceShowAttrName()
})
getCITypeAttributesById(this.addTypeId).then((res) => {
this.attrList = res.attributes
Expand Down Expand Up @@ -217,6 +222,8 @@ export default {
}
this.loading = false
})

this.handleReferenceCIIdMap()
})
.catch(() => {
this.loading = false
Expand All @@ -230,6 +237,83 @@ export default {
}
return []
},

async handleReferenceShowAttrName() {
const needRequiredCITypeIds = this.preferenceAttrList?.filter((attr) => attr?.is_reference && attr?.reference_type_id).map((attr) => attr.reference_type_id) || []
if (!needRequiredCITypeIds.length) {
this.referenceShowAttrNameMap = {}
return
}

const res = await getCITypes({
type_ids: needRequiredCITypeIds.join(',')
})

const map = {}
res.ci_types.forEach((ciType) => {
map[ciType.id] = ciType?.show_name || ciType?.unique_name || ''
})

this.referenceShowAttrNameMap = map
},

async handleReferenceCIIdMap() {
const referenceTypeCol = this.preferenceAttrList.filter((attr) => attr?.is_reference && attr?.reference_type_id) || []
if (!this.tableData?.length || !referenceTypeCol?.length) {
this.referenceCIIdMap = {}
return
}

const map = {}
this.tableData.forEach((row) => {
referenceTypeCol.forEach((col) => {
const ids = Array.isArray(row[col.name]) ? row[col.name] : row[col.name] ? [row[col.name]] : []
if (ids.length) {
if (!map?.[col.reference_type_id]) {
map[col.reference_type_id] = {}
}
ids.forEach((id) => {
map[col.reference_type_id][id] = {}
})
}
})
})

if (!Object.keys(map).length) {
this.referenceCIIdMap = {}
return
}

const allRes = await Promise.all(
Object.keys(map).map((key) => {
return searchCI({
q: `_type:${key},_id:(${Object.keys(map[key]).join(';')})`,
count: 9999
})
})
)

allRes.forEach((res) => {
res.result.forEach((item) => {
if (map?.[item._type]?.[item._id]) {
map[item._type][item._id] = item
}
})
})

this.referenceCIIdMap = map
},

getReferenceAttrValue(id, col) {
const ci = this?.referenceCIIdMap?.[col?.reference_type_id]?.[id]
if (!ci) {
return id
}

const attrName = this.referenceShowAttrNameMap?.[col.reference_type_id]
return ci?.[attrName] || id
},

onSelectChange() {},
handleClose() {
this.$refs.xTable.clearCheckboxRow()
Expand Down

0 comments on commit 40b452c

Please sign in to comment.