diff --git a/package.json b/package.json index aa44eb4c..1ad2b0ea 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "node-sass": "^4.14.1", "postcss-plugin-px2rem": "^0.8.1", "postcss-px2rem-exclude": "0.0.6", + "relation-graph": "^2.0.26", "sass-loader": "^8.0.2", "sass-resources-loader": "^2.2.1", "tiny-emitter": "^2.1.0", @@ -40,7 +41,9 @@ "@babel/cli": "^7.12.1", "@babel/core": "^7.11.4", "@babel/plugin-proposal-class-properties": "^7.12.1", + "@babel/plugin-proposal-private-methods": "^7.12.1", "@babel/plugin-transform-runtime": "^7.12.1", + "@babel/plugin-proposal-private-property-in-object": "^7.12.1", "@babel/preset-env": "^7.11.5", "@babel/preset-typescript": "^7.10.4", "@commitlint/cli": "^9.1.2", diff --git a/src/utils/api.js b/src/utils/api.js index 6458f7e2..3afa52c2 100644 --- a/src/utils/api.js +++ b/src/utils/api.js @@ -252,7 +252,11 @@ export const api = { openPortOfApp: apiVersion + '/entity/detail/app/relate/ports', basicInfo: apiVersion + '/entity/detail/basic', tags: apiVersion + '/entity/detail/kb/intelligence/tag', - informationAggregation: apiVersion + '/entity/detail/kb/intelligence/list' + informationAggregation: apiVersion + '/entity/detail/kb/intelligence/list', + // 实体关系 + entityGraph: { + relatedEntityCount: apiVersion + '/entity/graph/relation/summaryCount' + } } } diff --git a/src/views/charts2/charts/entityDetail/tabs/PerformanceEvent.vue b/src/views/charts2/charts/entityDetail/tabs/PerformanceEvent.vue index aa114f5d..31fc48a6 100644 --- a/src/views/charts2/charts/entityDetail/tabs/PerformanceEvent.vue +++ b/src/views/charts2/charts/entityDetail/tabs/PerformanceEvent.vue @@ -76,7 +76,7 @@ export default { setup () { const { query } = useRoute() const entityType = query.entityType - const entityName = query.name || query.entityName + const entityName = query.entityName return { entityType, diff --git a/src/views/charts2/charts/entityDetail/tabs/SecurityEvent.vue b/src/views/charts2/charts/entityDetail/tabs/SecurityEvent.vue index 6bdee65b..adfaa210 100644 --- a/src/views/charts2/charts/entityDetail/tabs/SecurityEvent.vue +++ b/src/views/charts2/charts/entityDetail/tabs/SecurityEvent.vue @@ -101,7 +101,7 @@ export default { setup () { const { query } = useRoute() const entityType = query.entityType - const entityName = query.name + const entityName = query.entityName return { entityType, diff --git a/src/views/entityExplorer/EntityDetail.vue b/src/views/entityExplorer/EntityDetail.vue index 0602b6f9..392ad979 100644 --- a/src/views/entityExplorer/EntityDetail.vue +++ b/src/views/entityExplorer/EntityDetail.vue @@ -22,21 +22,21 @@ export default { setup (props) { const { query } = useRoute() let panelType - const entityData = { entityType: query.entityType, entityName: query.name } + const entityData = { entityType: query.entityType, entityName: query.entityName } switch (query.entityType) { case 'ip': { panelType = panelTypeAndRouteMapping.ipEntityDetail - entityData.ip = query.name + entityData.ip = query.entityName break } case 'domain': { panelType = panelTypeAndRouteMapping.domainEntityDetail - entityData.domain = query.name + entityData.domain = query.entityName break } case 'app': { panelType = panelTypeAndRouteMapping.appEntityDetail - entityData.appName = query.name + entityData.appName = query.entityName break } default: { diff --git a/src/views/entityExplorer/EntityGraph.vue b/src/views/entityExplorer/EntityGraph.vue index fde368e0..e86fbc5e 100644 --- a/src/views/entityExplorer/EntityGraph.vue +++ b/src/views/entityExplorer/EntityGraph.vue @@ -1,7 +1,23 @@