From 072e24792b638aeec554bf2e1ab3033e216d553e Mon Sep 17 00:00:00 2001 From: Fine Date: Tue, 14 Nov 2023 20:17:03 +0800 Subject: [PATCH] fix: update --- src/styles/reset.scss | 12 ------------ .../related/topology/components/PodTopology.vue | 8 ++++---- .../dashboard/related/topology/components/Sankey.vue | 5 ++++- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/src/styles/reset.scss b/src/styles/reset.scss index 883ee027..d2396848 100644 --- a/src/styles/reset.scss +++ b/src/styles/reset.scss @@ -144,18 +144,6 @@ pre { } } -// .el-switch__label--left { -// margin-right: 5px; -// } - -// .el-switch__label--right { -// margin-left: 5px; -// } - -// .el-switch__label * { -// font-size: $font-size-smaller; -// } - .el-drawer__header { margin-bottom: 0; padding-left: 10px; diff --git a/src/views/dashboard/related/topology/components/PodTopology.vue b/src/views/dashboard/related/topology/components/PodTopology.vue index e569d642..40812b14 100644 --- a/src/views/dashboard/related/topology/components/PodTopology.vue +++ b/src/views/dashboard/related/topology/components/PodTopology.vue @@ -282,15 +282,15 @@ limitations under the License. --> width: 400px; height: 600px; border: 1px solid $border-color-primary; - background-color: $theme-background; overflow: auto; padding: 10px 15px; border-radius: 3px; color: $disabled-color; + background-color: var(--sw-topology-setting-bg); + box-shadow: var(--sw-topology-box-shadow); transition: all 0.5ms linear; z-index: 99; text-align: left; - box-shadow: #eee 1px 2px 10px; } .tool { @@ -307,7 +307,7 @@ limitations under the License. --> text-align: center; cursor: pointer; transition: all 0.5ms linear; - background: rgb(0 0 0 / 30%); + background: var(--sw-topology-switch-icon); color: $text-color; display: inline-block; border-radius: 3px; @@ -338,7 +338,7 @@ limitations under the License. --> span:hover { color: $active-color; - background-color: #eee; + background-color: $popper-hover-bg-color; } i { diff --git a/src/views/dashboard/related/topology/components/Sankey.vue b/src/views/dashboard/related/topology/components/Sankey.vue index 156b8302..f8fa2d44 100644 --- a/src/views/dashboard/related/topology/components/Sankey.vue +++ b/src/views/dashboard/related/topology/components/Sankey.vue @@ -24,6 +24,8 @@ limitations under the License. --> import type { MetricConfigOpt } from "@/types/dashboard"; import { aggregation } from "@/hooks/useMetricsProcessor"; import { MetricModes } from "../../../data"; + import { useAppStoreWithOut } from "@/store/modules/app"; + import { Themes } from "@/constants/data"; /*global defineEmits, defineProps */ const props = defineProps({ @@ -33,6 +35,7 @@ limitations under the License. --> }, }); const emit = defineEmits(["click"]); + const appStore = useAppStoreWithOut(); const topologyStore = useTopologyStore(); const option = computed(() => getOption()); @@ -52,7 +55,7 @@ limitations under the License. --> data: topologyStore.nodes, links: topologyStore.calls, label: { - color: "#666", + color: appStore.theme === Themes.Dark ? "#ccc" : "#666", formatter: (param: any) => param.data.name, }, color: ["#6be6c1", "#3fcfdc", "#626c91", "#3fbcde", "#a0a7e6", "#3fa9e1", "#96dee8", "#bf99f8"],