From eea641d8ce9e854cacc8424c2646e27caeca206d Mon Sep 17 00:00:00 2001 From: Qiuxia Fan Date: Sat, 19 Mar 2022 11:33:10 +0800 Subject: [PATCH] fix dashboards --- src/views/dashboard/Edit.vue | 2 +- src/views/dashboard/List.vue | 3 +-- src/views/dashboard/panel/Layout.vue | 4 ++++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/views/dashboard/Edit.vue b/src/views/dashboard/Edit.vue index ed953348..3da6c974 100644 --- a/src/views/dashboard/Edit.vue +++ b/src/views/dashboard/Edit.vue @@ -78,7 +78,7 @@ async function setTemplate() { dashboardStore.setCurrentDashboard({ layer: p.layerId, entity: p.entity, - name: p.name, + name: String(p.name).split("-").join(" "), id: c.id, isRoot: layout.isRoot, }); diff --git a/src/views/dashboard/List.vue b/src/views/dashboard/List.vue index 9c44474d..294ed77c 100644 --- a/src/views/dashboard/List.vue +++ b/src/views/dashboard/List.vue @@ -214,8 +214,7 @@ function handleView(row: DashboardItem) { } async function setRoot(row: DashboardItem) { - console.log(row); - const items: any[] = []; + const items: DashboardItem[] = []; loading.value = true; for (const d of dashboardStore.dashboards) { if (d.id === row.id) { diff --git a/src/views/dashboard/panel/Layout.vue b/src/views/dashboard/panel/Layout.vue index 3bbc9d2c..4188e497 100644 --- a/src/views/dashboard/panel/Layout.vue +++ b/src/views/dashboard/panel/Layout.vue @@ -42,6 +42,7 @@ limitations under the License. --> import { defineComponent, onBeforeUnmount } from "vue"; import { useI18n } from "vue-i18n"; import { useDashboardStore } from "@/store/modules/dashboard"; +import { useSelectorStore } from "@/store/modules/selectors"; import { LayoutConfig } from "@/types/dashboard"; import controls from "../controls/index"; @@ -51,6 +52,7 @@ export default defineComponent({ setup() { const { t } = useI18n(); const dashboardStore = useDashboardStore(); + const selectorStore = useSelectorStore(); function layoutUpdatedEvent(newLayout: LayoutConfig[]) { dashboardStore.setLayout(newLayout); } @@ -60,6 +62,8 @@ export default defineComponent({ } onBeforeUnmount(() => { dashboardStore.setLayout([]); + selectorStore.setCurrentService(null); + selectorStore.setCurrentPod(null); }); return { dashboardStore,