gfwleak/cyber-narrator-cn-ui
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CN-1548 fix: 处理冲突

Browse Source
This commit is contained in:
chenjinsong
2024-06-18 16:32:27 +08:00
parent 69110ce49d
commit 8739d8335d
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/views/entityExplorer/EntityGraph.vue
View File

@@ -394,7 +394,7 @@ export default {
this.getIconUrl(node.data.entityType, false, false) this.getIconUrl(node.data.entityType, false, false)
) )
nodes.push(listNode) nodes.push(listNode)
links.push(new Link(sourceNode, listNode, null)) links.push(new Link(sourceNode, listNode))
// 判断listNode的sourceNode层级，若大于等于10（即第6层listNode），则不继续拓展entity node，并给用户提示。否则拓展entity node // 判断listNode的sourceNode层级，若大于等于10（即第6层listNode），则不继续拓展entity node，并给用户提示。否则拓展entity node
const level = this.getNodeLevel(listNode.sourceNode.id) const level = this.getNodeLevel(listNode.sourceNode.id)
@@ -411,7 +411,7 @@ export default {
y: e.y + Math.random() * 100 - 50 y: e.y + Math.random() * 100 - 50
}, listNode, this.defaultChargeStrength, this.getIconUrl(listNode.data.entityType, false, false)) }, listNode, this.defaultChargeStrength, this.getIconUrl(listNode.data.entityType, false, false))
nodes.push(entityNode) nodes.push(entityNode)
links.push(new Link(listNode, entityNode, null)) links.push(new Link(listNode, entityNode))
}) })
} catch (e) { } catch (e) {
console.error(e) console.error(e)
@@ -909,7 +909,7 @@ export default {
cleanTempItems () { cleanTempItems () {
const { nodes, links } = this.graph.graphData() const { nodes, links } = this.graph.graphData()
const newNodes = nodes.filter(n => n.type !== nodeType.tempNode) const newNodes = nodes.filter(n => n.type !== nodeType.tempNode)
const newLinks = links.filter(l => l.level !== 3) const newLinks = links.filter(l => l.type !== linkType.temp)
if (newNodes.length !== nodes.length || newLinks.length !== links.length) { if (newNodes.length !== nodes.length || newLinks.length !== links.length) {
this.graph.graphData({ nodes: newNodes, links: newLinks }) this.graph.graphData({ nodes: newNodes, links: newLinks })
} }
@@ -957,7 +957,7 @@ export default {
this.getIconUrl(k, false, false) this.getIconUrl(k, false, false)
) )
listNodes.push(listNode) listNodes.push(listNode)
links.push(new Link(rootNode, listNode, null, 60, 1)) links.push(new Link(rootNode, listNode))
} }
}) })
// entityNode // entityNode
@@ -975,10 +975,10 @@ export default {
}, },
listNode, listNode,
this.defaultChargeStrength, this.defaultChargeStrength,
this.getIconUrl(listNode.data.entityType, true, false) this.getIconUrl(listNode.data.entityType, false, false)
) )
entityNodes.push(entityNode) entityNodes.push(entityNode)
links.push(new Link(listNode, entityNode, null, this.defaultLinkDistance, 2)) links.push(new Link(listNode, entityNode))
}) })
} }
nodes.push(...listNodes, ...entityNodes) nodes.push(...listNodes, ...entityNodes)
@@ -1008,10 +1008,10 @@ export default {
const toAddNode = new Node(nodeType.entityNode, entity.vertex, { const toAddNode = new Node(nodeType.entityNode, entity.vertex, {
entityType: expandType, entityType: expandType,
entityName: entity.vertex entityName: entity.vertex
}, node, this.defaultChargeStrength, this.getIconUrl(node.data.entityType, true, false)) }, node, this.defaultChargeStrength, this.getIconUrl(node.data.entityType, false, false))
toAddNodes.push(toAddNode) toAddNodes.push(toAddNode)
const toAddLink = new Link(node, toAddNode, null, this.defaultLinkDistance) const toAddLink = new Link(node, toAddNode)
toAddLinks.push(toAddLink) toAddLinks.push(toAddLink)
}) })
this.addItems(toAddNodes, toAddLinks) this.addItems(toAddNodes, toAddLinks)
@@ -1048,7 +1048,7 @@ export default {
let listNode = neighbors.targetNodes.find(n => n.data.entityType === expandType) let listNode = neighbors.targetNodes.find(n => n.data.entityType === expandType)
if (!listNode) { if (!listNode) {
listNode = new Node(nodeType.listNode, `${node.id}__${expandType}-list`, { entityType: expandType }, node, this.defaultChargeStrength, this.getIconUrl(expandType, false, false)) listNode = new Node(nodeType.listNode, `${node.id}__${expandType}-list`, { entityType: expandType }, node, this.defaultChargeStrength, this.getIconUrl(expandType, false, false))
const link = new Link(node, listNode, null, this.defaultLinkDistance) const link = new Link(node, listNode)
toAddNodes.push(listNode) toAddNodes.push(listNode)
toAddLinks.push(link) toAddLinks.push(link)
} }
@@ -1056,9 +1056,9 @@ export default {
const entityNode = new Node(nodeType.entityNode, entity.vertex, { const entityNode = new Node(nodeType.entityNode, entity.vertex, {
entityType: expandType, entityType: expandType,
entityName: entity.vertex entityName: entity.vertex
}, listNode, this.defaultChargeStrength, this.getIconUrl(expandType, true, false)) }, listNode, this.defaultChargeStrength, this.getIconUrl(expandType, false, false))
toAddNodes.push(entityNode) toAddNodes.push(entityNode)
toAddLinks.push(new Link(listNode, entityNode, null, this.defaultLinkDistance)) toAddLinks.push(new Link(listNode, entityNode))
}) })
this.addItems(toAddNodes, toAddLinks) this.addItems(toAddNodes, toAddLinks)
this.rightBox.node = _.cloneDeep(node) this.rightBox.node = _.cloneDeep(node)
@@ -1111,7 +1111,7 @@ export default {
const rightBox = ref({ const rightBox = ref({
mode: 'detail', // list | detail mode: 'detail', // list | detail
show: false,//true, show: true,
node: null, node: null,
loading: true loading: true
}) })