diff --git a/src/views/dashboard/panel/Tool.vue b/src/views/dashboard/panel/Tool.vue index 3ae75c2d..283bdfd1 100644 --- a/src/views/dashboard/panel/Tool.vue +++ b/src/views/dashboard/panel/Tool.vue @@ -29,7 +29,7 @@ limitations under the License. -->
{{ - dashboardStore.entity === "Endpoint" + ["EndpointRelation", "Endpoint"].includes(dashboardStore.entity) ? "$Endpoint" : "$ServiceInstance" }} diff --git a/src/views/dashboard/related/topology/components/Settings.vue b/src/views/dashboard/related/topology/components/Settings.vue index 80dc76b8..95678eea 100644 --- a/src/views/dashboard/related/topology/components/Settings.vue +++ b/src/views/dashboard/related/topology/components/Settings.vue @@ -50,42 +50,53 @@ limitations under the License. -->
{{ t("nodeSettings") }}
- -
{{ t("nodeDashboard") }}
-
- {{ t("nodeDashboard") }}
+ +
+ + + + - - - - - -
-
+ +
{{ t("nodeMetrics") }}
entity === (MetricCatalog as any)[d.catalog] @@ -291,9 +304,9 @@ function deleteItem(index: number) { function updateSettings() { emit("update", { linkDashboard: states.linkDashboard, - nodeDashboard: items.filter( - (d: { scope: string; dashboard: string }) => d.dashboard - ), + nodeDashboard: isServer + ? items.filter((d: { scope: string; dashboard: string }) => d.dashboard) + : states.nodeDashboard, linkServerMetrics: states.linkServerMetrics, linkClientMetrics: states.linkClientMetrics, nodeMetrics: states.nodeMetrics,