diff --git a/src/store/modules/topology.ts b/src/store/modules/topology.ts index 83738f68..85897d09 100644 --- a/src/store/modules/topology.ts +++ b/src/store/modules/topology.ts @@ -44,9 +44,9 @@ export const topologyStore = defineStore({ setLink(link: Call) { this.call = link; }, - setTopology(data: { nodes: Node[]; links: Call[] }) { + setTopology(data: { nodes: Node[]; calls: Call[] }) { this.nodes = data.nodes; - this.calls = data.links; + this.calls = data.calls; }, async getServiceTopology() { const serviceId = useSelectorStore().currentService.id; diff --git a/src/views/dashboard/Edit.vue b/src/views/dashboard/Edit.vue index a3c23d9a..3479999e 100644 --- a/src/views/dashboard/Edit.vue +++ b/src/views/dashboard/Edit.vue @@ -29,6 +29,7 @@ limitations under the License. --> v-model="dashboardStore.showTopology" :title="t('topology')" :destroy-on-close="true" + fullscreen @closed="dashboardStore.setTopology(false)" > @@ -91,4 +92,8 @@ function handleClick(e: any) { height: 100%; overflow-y: auto; } +// .el-overlay-dialog { +// background-color: #333840 !important; +// color: #ddd; +// } diff --git a/src/views/dashboard/related/topology/Graph.vue b/src/views/dashboard/related/topology/Graph.vue index bc4349c2..1826ec48 100644 --- a/src/views/dashboard/related/topology/Graph.vue +++ b/src/views/dashboard/related/topology/Graph.vue @@ -33,21 +33,22 @@ import { useDashboardStore } from "@/store/modules/dashboard"; import { EntityType } from "../../data"; /*global defineProps, Nullable */ -const props = defineProps({ - current: { - type: Object as PropType<{ [key: string]: number[] }>, - default: () => ({}), - }, - nodes: { type: Array as PropType, default: () => [] }, - links: { type: Array as PropType, default: () => [] }, -}); +// const props = defineProps({ +// current: { +// type: Object as PropType<{ [key: string]: number[] }>, +// default: () => ({}), +// }, +// nodes: { type: Array as PropType, default: () => [] }, +// links: { type: Array as PropType, default: () => [] }, +// }); const { t } = useI18n(); const topologyStore = useTopologyStore(); const dashboardStore = useDashboardStore(); -// const height = ref(600); +const height = ref(document.body.clientHeight - 90); +const width = ref(document.body.clientWidth - 40); const simulation = ref(""); const svg = ref>(null); -const chart = ref(null); +const chart = ref(null); const tip = ref(null); const graph = ref(null); const node = ref(null); @@ -55,18 +56,24 @@ const link = ref(null); const anchor = ref(null); const tools = ref(null); -onMounted(() => { - getTopology(); +onMounted(async () => { + await getTopology(); window.addEventListener("resize", resize); svg.value = d3 .select(chart.value) .append("svg") .attr("class", "topo-svg") - .attr("height", chart.value.clientHeight); + .attr("height", height.value) + .attr("width", width.value); tip.value = (d3tip as any)().attr("class", "d3-tip").offset([-8, 0]); graph.value = svg.value.append("g").attr("class", "topo-svg_graph"); graph.value.call(tip.value); - simulation.value = simulationInit(d3, props.nodes, props.links, ticked); + simulation.value = simulationInit( + d3, + topologyStore.nodes, + topologyStore.calls, + ticked + ); node.value = graph.value.append("g").selectAll(".topo-node"); link.value = graph.value.append("g").selectAll(".topo-line"); anchor.value = graph.value.append("g").selectAll(".topo-line-anchor"); @@ -78,9 +85,10 @@ onMounted(() => { // { icon: "ENDPOINT", click: handleGoEndpointDependency }, // { icon: "" }, // ]); + update(); }); async function getTopology() { - switch (dashboardStore.layer) { + switch (dashboardStore.entity) { case EntityType[0].value: await topologyStore.getServiceTopology(); break; @@ -96,7 +104,9 @@ async function getTopology() { } } function resize() { - svg.value.attr("height", chart.value.clientHeight); + height.value = document.body.clientHeight - 90; + width.value = document.body.clientWidth - 40; + svg.value.attr("height", height.value).attr("width", width.value); } function ticked() { link.value.attr( @@ -151,7 +161,7 @@ function handleLinkClick(event: any, d: any) { } function update() { // node element - node.value = node.value.data(props.nodes, (d: any) => d.id); + node.value = node.value.data(topologyStore.nodes, (d: any) => d.id); node.value.exit().remove(); node.value = nodeElement( d3, @@ -166,11 +176,11 @@ function update() { tip.value ).merge(node.value); // line element - link.value = link.value.data(props.links, (d: any) => d.id); + link.value = link.value.data(topologyStore.calls, (d: any) => d.id); link.value.exit().remove(); link.value = linkElement(link.value.enter()).merge(link.value); // anchorElement - anchor.value = anchor.value.data(props.links, (d: any) => d.id); + anchor.value = anchor.value.data(topologyStore.calls, (d: any) => d.id); anchor.value.exit().remove(); anchor.value = anchorElement( anchor.value.enter(), @@ -192,21 +202,21 @@ function update() { tip.value ).merge(anchor.value); // force element - simulation.value.nodes(props.nodes); + simulation.value.nodes(topologyStore.nodes); simulation.value .force("link") - .links(props.links) + .links(topologyStore.calls) .id((d: any) => d.id); simulationSkip(d3, simulation.value, ticked); const loopMap: any = {}; - for (let i = 0; i < props.links.length; i++) { - const link: any = props.links[i]; + for (let i = 0; i < topologyStore.calls.length; i++) { + const link: any = topologyStore.calls[i]; link.loopFactor = 1; - for (let j = 0; j < props.links.length; j++) { + for (let j = 0; j < topologyStore.calls.length; j++) { if (i === j || loopMap[i]) { continue; } - const otherLink = props.links[j]; + const otherLink = topologyStore.calls[j]; if ( link.source.id === otherLink.target.id && link.target.id === otherLink.source.id @@ -222,10 +232,19 @@ onBeforeUnmount(() => { window.removeEventListener("resize", resize); }); - diff --git a/src/views/dashboard/related/topology/utils/icons.ts b/src/views/dashboard/related/topology/utils/icons.ts index ac659977..c9d05939 100755 --- a/src/views/dashboard/related/topology/utils/icons.ts +++ b/src/views/dashboard/related/topology/utils/icons.ts @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -const requireComponent = require.context("./tool", false, /\.png$/); +const requireComponent = require.context("./images", false, /\.png$/); const result: { [key: string]: string } = {}; function capitalizeFirstLetter(str: string) { diff --git a/src/views/dashboard/related/topology/utils/images/ACTIVEMQ.png b/src/views/dashboard/related/topology/utils/images/ACTIVEMQ.png new file mode 100755 index 00000000..c60ec6e4 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/ACTIVEMQ.png differ diff --git a/src/views/dashboard/related/topology/utils/images/AIOHTTP.png b/src/views/dashboard/related/topology/utils/images/AIOHTTP.png new file mode 100644 index 00000000..43fe2bc9 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/AIOHTTP.png differ diff --git a/src/views/dashboard/related/topology/utils/tool/ALARM.png b/src/views/dashboard/related/topology/utils/images/ALARM.png similarity index 100% rename from src/views/dashboard/related/topology/utils/tool/ALARM.png rename to src/views/dashboard/related/topology/utils/images/ALARM.png diff --git a/src/views/dashboard/related/topology/utils/images/APACHEKYLIN.png b/src/views/dashboard/related/topology/utils/images/APACHEKYLIN.png new file mode 100644 index 00000000..0041bd3d Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/APACHEKYLIN.png differ diff --git a/src/views/dashboard/related/topology/utils/tool/API.png b/src/views/dashboard/related/topology/utils/images/API.png similarity index 100% rename from src/views/dashboard/related/topology/utils/tool/API.png rename to src/views/dashboard/related/topology/utils/images/API.png diff --git a/src/views/dashboard/related/topology/utils/images/APISIX.png b/src/views/dashboard/related/topology/utils/images/APISIX.png new file mode 100644 index 00000000..33185360 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/APISIX.png differ diff --git a/src/views/dashboard/related/topology/utils/images/ARMERIA.png b/src/views/dashboard/related/topology/utils/images/ARMERIA.png new file mode 100755 index 00000000..1f7bcb2a Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/ARMERIA.png differ diff --git a/src/views/dashboard/related/topology/utils/images/AVRO.png b/src/views/dashboard/related/topology/utils/images/AVRO.png new file mode 100755 index 00000000..fbaf0dd5 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/AVRO.png differ diff --git a/src/views/dashboard/related/topology/utils/images/AZUREFUNCTIONS.png b/src/views/dashboard/related/topology/utils/images/AZUREFUNCTIONS.png new file mode 100644 index 00000000..3b71d7f9 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/AZUREFUNCTIONS.png differ diff --git a/src/views/dashboard/related/topology/utils/images/CASSANDRA.png b/src/views/dashboard/related/topology/utils/images/CASSANDRA.png new file mode 100755 index 00000000..efe38d0d Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/CASSANDRA.png differ diff --git a/src/views/dashboard/related/topology/utils/images/CELERY.jpg b/src/views/dashboard/related/topology/utils/images/CELERY.jpg new file mode 100644 index 00000000..0410c8a5 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/CELERY.jpg differ diff --git a/src/views/dashboard/related/topology/utils/images/CLICKHOUSE.png b/src/views/dashboard/related/topology/utils/images/CLICKHOUSE.png new file mode 100644 index 00000000..af2e06aa Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/CLICKHOUSE.png differ diff --git a/src/views/dashboard/related/topology/utils/images/CUBE.png b/src/views/dashboard/related/topology/utils/images/CUBE.png new file mode 100755 index 00000000..412000bd Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/CUBE.png differ diff --git a/src/views/dashboard/related/topology/utils/images/CUBEERROR.png b/src/views/dashboard/related/topology/utils/images/CUBEERROR.png new file mode 100755 index 00000000..9405c891 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/CUBEERROR.png differ diff --git a/src/views/dashboard/related/topology/utils/images/DATABASE.png b/src/views/dashboard/related/topology/utils/images/DATABASE.png new file mode 100755 index 00000000..480430f3 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/DATABASE.png differ diff --git a/src/views/dashboard/related/topology/utils/images/DJANGO.png b/src/views/dashboard/related/topology/utils/images/DJANGO.png new file mode 100644 index 00000000..0d49f438 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/DJANGO.png differ diff --git a/src/views/dashboard/related/topology/utils/images/DOLPHINSCHEDULER.png b/src/views/dashboard/related/topology/utils/images/DOLPHINSCHEDULER.png new file mode 100644 index 00000000..8db96031 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/DOLPHINSCHEDULER.png differ diff --git a/src/views/dashboard/related/topology/utils/images/DUBBO.png b/src/views/dashboard/related/topology/utils/images/DUBBO.png new file mode 100755 index 00000000..23717435 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/DUBBO.png differ diff --git a/src/views/dashboard/related/topology/utils/images/ELASTICSEARCH.png b/src/views/dashboard/related/topology/utils/images/ELASTICSEARCH.png new file mode 100755 index 00000000..3692fbbf Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/ELASTICSEARCH.png differ diff --git a/src/views/dashboard/related/topology/utils/tool/ENDPOINT.png b/src/views/dashboard/related/topology/utils/images/ENDPOINT.png similarity index 100% rename from src/views/dashboard/related/topology/utils/tool/ENDPOINT.png rename to src/views/dashboard/related/topology/utils/images/ENDPOINT.png diff --git a/src/views/dashboard/related/topology/utils/images/ENVOYPROXY.png b/src/views/dashboard/related/topology/utils/images/ENVOYPROXY.png new file mode 100644 index 00000000..fc2cbd1e Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/ENVOYPROXY.png differ diff --git a/src/views/dashboard/related/topology/utils/images/FALCON.png b/src/views/dashboard/related/topology/utils/images/FALCON.png new file mode 100644 index 00000000..2be0598e Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/FALCON.png differ diff --git a/src/views/dashboard/related/topology/utils/images/FEIGNDEFAULTHTTP.png b/src/views/dashboard/related/topology/utils/images/FEIGNDEFAULTHTTP.png new file mode 100755 index 00000000..bcdaebdc Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/FEIGNDEFAULTHTTP.png differ diff --git a/src/views/dashboard/related/topology/utils/images/FINAGLE.png b/src/views/dashboard/related/topology/utils/images/FINAGLE.png new file mode 100755 index 00000000..fbc8d919 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/FINAGLE.png differ diff --git a/src/views/dashboard/related/topology/utils/images/FLASK.png b/src/views/dashboard/related/topology/utils/images/FLASK.png new file mode 100644 index 00000000..d6e38d2b Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/FLASK.png differ diff --git a/src/views/dashboard/related/topology/utils/images/GEAR.png b/src/views/dashboard/related/topology/utils/images/GEAR.png new file mode 100644 index 00000000..e4d39be7 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/GEAR.png differ diff --git a/src/views/dashboard/related/topology/utils/images/GIN.png b/src/views/dashboard/related/topology/utils/images/GIN.png new file mode 100644 index 00000000..be8494e4 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/GIN.png differ diff --git a/src/views/dashboard/related/topology/utils/images/GOHTTPCLIENT.png b/src/views/dashboard/related/topology/utils/images/GOHTTPCLIENT.png new file mode 100644 index 00000000..d6d98c3b Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/GOHTTPCLIENT.png differ diff --git a/src/views/dashboard/related/topology/utils/images/GOHTTPSERVER.png b/src/views/dashboard/related/topology/utils/images/GOHTTPSERVER.png new file mode 100644 index 00000000..d6d98c3b Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/GOHTTPSERVER.png differ diff --git a/src/views/dashboard/related/topology/utils/images/GOMICROCLIENT.png b/src/views/dashboard/related/topology/utils/images/GOMICROCLIENT.png new file mode 100644 index 00000000..fb544123 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/GOMICROCLIENT.png differ diff --git a/src/views/dashboard/related/topology/utils/images/GOMICROSERVER.png b/src/views/dashboard/related/topology/utils/images/GOMICROSERVER.png new file mode 100644 index 00000000..fb544123 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/GOMICROSERVER.png differ diff --git a/src/views/dashboard/related/topology/utils/images/GRPC.png b/src/views/dashboard/related/topology/utils/images/GRPC.png new file mode 100755 index 00000000..983e2577 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/GRPC.png differ diff --git a/src/views/dashboard/related/topology/utils/images/H2.png b/src/views/dashboard/related/topology/utils/images/H2.png new file mode 100755 index 00000000..e9947baa Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/H2.png differ diff --git a/src/views/dashboard/related/topology/utils/images/HBASE.png b/src/views/dashboard/related/topology/utils/images/HBASE.png new file mode 100644 index 00000000..c941e0ee Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/HBASE.png differ diff --git a/src/views/dashboard/related/topology/utils/images/HPROSE.png b/src/views/dashboard/related/topology/utils/images/HPROSE.png new file mode 100755 index 00000000..6482f718 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/HPROSE.png differ diff --git a/src/views/dashboard/related/topology/utils/images/HTTP.png b/src/views/dashboard/related/topology/utils/images/HTTP.png new file mode 100755 index 00000000..e9a942e4 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/HTTP.png differ diff --git a/src/views/dashboard/related/topology/utils/images/HTTPCLIENT.png b/src/views/dashboard/related/topology/utils/images/HTTPCLIENT.png new file mode 100755 index 00000000..e9a942e4 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/HTTPCLIENT.png differ diff --git a/src/views/dashboard/related/topology/utils/images/INFLUXDB.png b/src/views/dashboard/related/topology/utils/images/INFLUXDB.png new file mode 100644 index 00000000..e07850cf Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/INFLUXDB.png differ diff --git a/src/views/dashboard/related/topology/utils/tool/INSTANCE.png b/src/views/dashboard/related/topology/utils/images/INSTANCE.png similarity index 100% rename from src/views/dashboard/related/topology/utils/tool/INSTANCE.png rename to src/views/dashboard/related/topology/utils/images/INSTANCE.png diff --git a/src/views/dashboard/related/topology/utils/images/JETTY.png b/src/views/dashboard/related/topology/utils/images/JETTY.png new file mode 100755 index 00000000..82234f11 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/JETTY.png differ diff --git a/src/views/dashboard/related/topology/utils/images/JETTYSERVER.png b/src/views/dashboard/related/topology/utils/images/JETTYSERVER.png new file mode 100755 index 00000000..a334f80c Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/JETTYSERVER.png differ diff --git a/src/views/dashboard/related/topology/utils/images/KAFKA.png b/src/views/dashboard/related/topology/utils/images/KAFKA.png new file mode 100755 index 00000000..c72b14e8 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/KAFKA.png differ diff --git a/src/views/dashboard/related/topology/utils/images/KAFKACONSUMER.png b/src/views/dashboard/related/topology/utils/images/KAFKACONSUMER.png new file mode 100755 index 00000000..c72b14e8 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/KAFKACONSUMER.png differ diff --git a/src/views/dashboard/related/topology/utils/images/KONG.png b/src/views/dashboard/related/topology/utils/images/KONG.png new file mode 100644 index 00000000..354b1ae2 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/KONG.png differ diff --git a/src/views/dashboard/related/topology/utils/images/KRATOS.png b/src/views/dashboard/related/topology/utils/images/KRATOS.png new file mode 100644 index 00000000..5dbdbe82 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/KRATOS.png differ diff --git a/src/views/dashboard/related/topology/utils/images/LIGHT4J.png b/src/views/dashboard/related/topology/utils/images/LIGHT4J.png new file mode 100755 index 00000000..0e6208fb Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/LIGHT4J.png differ diff --git a/src/views/dashboard/related/topology/utils/images/LOCAL.png b/src/views/dashboard/related/topology/utils/images/LOCAL.png new file mode 100755 index 00000000..558e45ed Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/LOCAL.png differ diff --git a/src/views/dashboard/related/topology/utils/images/MARIADB.png b/src/views/dashboard/related/topology/utils/images/MARIADB.png new file mode 100644 index 00000000..c75f5eb5 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/MARIADB.png differ diff --git a/src/views/dashboard/related/topology/utils/images/MONGODB.png b/src/views/dashboard/related/topology/utils/images/MONGODB.png new file mode 100755 index 00000000..75df0189 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/MONGODB.png differ diff --git a/src/views/dashboard/related/topology/utils/images/MONGOOSE.png b/src/views/dashboard/related/topology/utils/images/MONGOOSE.png new file mode 100644 index 00000000..5254eaed Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/MONGOOSE.png differ diff --git a/src/views/dashboard/related/topology/utils/images/MOSN.png b/src/views/dashboard/related/topology/utils/images/MOSN.png new file mode 100644 index 00000000..12f72757 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/MOSN.png differ diff --git a/src/views/dashboard/related/topology/utils/images/MOTAN.png b/src/views/dashboard/related/topology/utils/images/MOTAN.png new file mode 100755 index 00000000..a9b7baa7 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/MOTAN.png differ diff --git a/src/views/dashboard/related/topology/utils/images/MYSQL.png b/src/views/dashboard/related/topology/utils/images/MYSQL.png new file mode 100755 index 00000000..88015264 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/MYSQL.png differ diff --git a/src/views/dashboard/related/topology/utils/images/NGINX.png b/src/views/dashboard/related/topology/utils/images/NGINX.png new file mode 100755 index 00000000..b0c5d347 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/NGINX.png differ diff --git a/src/views/dashboard/related/topology/utils/images/OKHTTP.png b/src/views/dashboard/related/topology/utils/images/OKHTTP.png new file mode 100755 index 00000000..22d2157b Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/OKHTTP.png differ diff --git a/src/views/dashboard/related/topology/utils/images/ORACLE.png b/src/views/dashboard/related/topology/utils/images/ORACLE.png new file mode 100755 index 00000000..c786f8a3 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/ORACLE.png differ diff --git a/src/views/dashboard/related/topology/utils/images/PHP.png b/src/views/dashboard/related/topology/utils/images/PHP.png new file mode 100644 index 00000000..c8051538 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/PHP.png differ diff --git a/src/views/dashboard/related/topology/utils/images/PLAY.png b/src/views/dashboard/related/topology/utils/images/PLAY.png new file mode 100755 index 00000000..7c8ffed9 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/PLAY.png differ diff --git a/src/views/dashboard/related/topology/utils/images/POSTGRESQL.png b/src/views/dashboard/related/topology/utils/images/POSTGRESQL.png new file mode 100755 index 00000000..aeca862f Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/POSTGRESQL.png differ diff --git a/src/views/dashboard/related/topology/utils/images/PULSAR.png b/src/views/dashboard/related/topology/utils/images/PULSAR.png new file mode 100755 index 00000000..11781263 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/PULSAR.png differ diff --git a/src/views/dashboard/related/topology/utils/images/PYRAMID.png b/src/views/dashboard/related/topology/utils/images/PYRAMID.png new file mode 100644 index 00000000..e28dc139 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/PYRAMID.png differ diff --git a/src/views/dashboard/related/topology/utils/images/PYTHON.png b/src/views/dashboard/related/topology/utils/images/PYTHON.png new file mode 100644 index 00000000..1e5653f0 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/PYTHON.png differ diff --git a/src/views/dashboard/related/topology/utils/images/RABBITMQ.png b/src/views/dashboard/related/topology/utils/images/RABBITMQ.png new file mode 100755 index 00000000..3278c830 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/RABBITMQ.png differ diff --git a/src/views/dashboard/related/topology/utils/images/REDIS.png b/src/views/dashboard/related/topology/utils/images/REDIS.png new file mode 100755 index 00000000..1d9a80e5 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/REDIS.png differ diff --git a/src/views/dashboard/related/topology/utils/images/REQUESTS.png b/src/views/dashboard/related/topology/utils/images/REQUESTS.png new file mode 100644 index 00000000..ce010b74 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/REQUESTS.png differ diff --git a/src/views/dashboard/related/topology/utils/images/RESIN.png b/src/views/dashboard/related/topology/utils/images/RESIN.png new file mode 100755 index 00000000..999da80c Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/RESIN.png differ diff --git a/src/views/dashboard/related/topology/utils/images/RESTEASY.png b/src/views/dashboard/related/topology/utils/images/RESTEASY.png new file mode 100755 index 00000000..7edbdc31 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/RESTEASY.png differ diff --git a/src/views/dashboard/related/topology/utils/images/ROCKETMQ.png b/src/views/dashboard/related/topology/utils/images/ROCKETMQ.png new file mode 100755 index 00000000..5540590a Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/ROCKETMQ.png differ diff --git a/src/views/dashboard/related/topology/utils/images/SANIC.png b/src/views/dashboard/related/topology/utils/images/SANIC.png new file mode 100644 index 00000000..f56cc941 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/SANIC.png differ diff --git a/src/views/dashboard/related/topology/utils/images/SEATA.png b/src/views/dashboard/related/topology/utils/images/SEATA.png new file mode 100644 index 00000000..2cdb3f9b Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/SEATA.png differ diff --git a/src/views/dashboard/related/topology/utils/images/SERVICECOMB.png b/src/views/dashboard/related/topology/utils/images/SERVICECOMB.png new file mode 100755 index 00000000..6773d211 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/SERVICECOMB.png differ diff --git a/src/views/dashboard/related/topology/utils/images/SERVICECOMBMESHER.png b/src/views/dashboard/related/topology/utils/images/SERVICECOMBMESHER.png new file mode 100755 index 00000000..8056818c Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/SERVICECOMBMESHER.png differ diff --git a/src/views/dashboard/related/topology/utils/images/SERVICECOMBSERVICECENTER.png b/src/views/dashboard/related/topology/utils/images/SERVICECOMBSERVICECENTER.png new file mode 100755 index 00000000..6bb62e29 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/SERVICECOMBSERVICECENTER.png differ diff --git a/src/views/dashboard/related/topology/utils/images/SOFARPC.png b/src/views/dashboard/related/topology/utils/images/SOFARPC.png new file mode 100755 index 00000000..dd0ce594 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/SOFARPC.png differ diff --git a/src/views/dashboard/related/topology/utils/images/SOLR.png b/src/views/dashboard/related/topology/utils/images/SOLR.png new file mode 100755 index 00000000..136ea068 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/SOLR.png differ diff --git a/src/views/dashboard/related/topology/utils/images/SPRINGMVC.png b/src/views/dashboard/related/topology/utils/images/SPRINGMVC.png new file mode 100755 index 00000000..92cbd91b Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/SPRINGMVC.png differ diff --git a/src/views/dashboard/related/topology/utils/images/STRUTS2.png b/src/views/dashboard/related/topology/utils/images/STRUTS2.png new file mode 100755 index 00000000..957049b1 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/STRUTS2.png differ diff --git a/src/views/dashboard/related/topology/utils/images/TOMCAT.png b/src/views/dashboard/related/topology/utils/images/TOMCAT.png new file mode 100755 index 00000000..d835a4c9 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/TOMCAT.png differ diff --git a/src/views/dashboard/related/topology/utils/images/TORNADO.png b/src/views/dashboard/related/topology/utils/images/TORNADO.png new file mode 100644 index 00000000..e2532b9f Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/TORNADO.png differ diff --git a/src/views/dashboard/related/topology/utils/tool/TRACE.png b/src/views/dashboard/related/topology/utils/images/TRACE.png similarity index 100% rename from src/views/dashboard/related/topology/utils/tool/TRACE.png rename to src/views/dashboard/related/topology/utils/images/TRACE.png diff --git a/src/views/dashboard/related/topology/utils/images/UNDEFINED.png b/src/views/dashboard/related/topology/utils/images/UNDEFINED.png new file mode 100755 index 00000000..c5d1ffc3 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/UNDEFINED.png differ diff --git a/src/views/dashboard/related/topology/utils/images/UNKNOWN.png b/src/views/dashboard/related/topology/utils/images/UNKNOWN.png new file mode 100755 index 00000000..c4d283c9 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/UNKNOWN.png differ diff --git a/src/views/dashboard/related/topology/utils/images/UNKNOWN_CLOUD.png b/src/views/dashboard/related/topology/utils/images/UNKNOWN_CLOUD.png new file mode 100755 index 00000000..79781c2b Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/UNKNOWN_CLOUD.png differ diff --git a/src/views/dashboard/related/topology/utils/images/URLLIB3.png b/src/views/dashboard/related/topology/utils/images/URLLIB3.png new file mode 100644 index 00000000..33d4b73c Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/URLLIB3.png differ diff --git a/src/views/dashboard/related/topology/utils/images/USER.png b/src/views/dashboard/related/topology/utils/images/USER.png new file mode 100755 index 00000000..009bde07 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/USER.png differ diff --git a/src/views/dashboard/related/topology/utils/images/VERTX.png b/src/views/dashboard/related/topology/utils/images/VERTX.png new file mode 100644 index 00000000..05d67bea Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/VERTX.png differ diff --git a/src/views/dashboard/related/topology/utils/images/ZOOKEEPER.png b/src/views/dashboard/related/topology/utils/images/ZOOKEEPER.png new file mode 100644 index 00000000..4e8014f8 Binary files /dev/null and b/src/views/dashboard/related/topology/utils/images/ZOOKEEPER.png differ diff --git a/src/views/dashboard/related/topology/utils/simulation.ts b/src/views/dashboard/related/topology/utils/simulation.ts index e05fbad1..80707660 100644 --- a/src/views/dashboard/related/topology/utils/simulation.ts +++ b/src/views/dashboard/related/topology/utils/simulation.ts @@ -16,12 +16,12 @@ */ export const simulationInit = ( d3: any, - data_nodes: any, + dataNodes: any, dataLinks: any, ticked: any ) => { const simulation = d3 - .forceSimulation(data_nodes) + .forceSimulation(dataNodes) .force( "collide", d3.forceCollide().radius(() => 60)