From ed13de38be27099576f5cbf9cc223094a0bb0a12 Mon Sep 17 00:00:00 2001
From: Qiuxia Fan <fine0830@outlook.com>
Date: Tue, 12 Jul 2022 15:39:31 +0800
Subject: [PATCH] fix widgets

---
 .../configuration/widget/AssociateOptions.vue | 59 +++++++++++--------
 1 file changed, 33 insertions(+), 26 deletions(-)

diff --git a/src/views/dashboard/configuration/widget/AssociateOptions.vue b/src/views/dashboard/configuration/widget/AssociateOptions.vue
index bf846110..4d56eff2 100644
--- a/src/views/dashboard/configuration/widget/AssociateOptions.vue
+++ b/src/views/dashboard/configuration/widget/AssociateOptions.vue
@@ -41,27 +41,29 @@ const widgetIds = ref<string[]>(
   associate.map((d: { widgetId: string }) => d.widgetId)
 );
 const widgets = computed(() => {
-  const isLinear = ["Bar", "Line", "Area"].includes(
-    dashboardStore.selectedGrid.graph && dashboardStore.selectedGrid.graph.type
-  );
   // const isRank = ["TopList"].includes(
   //   dashboardStore.selectedGrid.graph && dashboardStore.selectedGrid.graph.type
   // );
-  const { widgets } = getDashboard(dashboardStore.currentDashboard);
-  const items = widgets.filter(
+  const all = getDashboard(dashboardStore.currentDashboard).widgets;
+  const items = all.filter(
     (d: { value: string; label: string } & LayoutConfig) => {
-      if (dashboardStore.selectedGrid.id !== d.id) {
-        if (isLinear && d.type === "Widget" && d.widget && d.id) {
-          d.value = d.id;
-          d.label = d.widget.name || d.id;
-          return d;
-        }
-        // if (isRank && d.type !== "Widget" && d.widget && d.id) {
-        //   d.value = d.id;
-        //   d.label = d.widget.name || d.id;
-        //   return d;
-        // }
+      const isLinear = ["Bar", "Line", "Area"].includes(
+        (d.graph && d.graph.type) || ""
+      );
+      if (
+        (isLinear || d.type === "Event") &&
+        d.id &&
+        dashboardStore.selectedGrid.id !== d.id
+      ) {
+        d.value = d.id;
+        d.label = (d.widget && d.widget.name) || d.id;
+        return d;
       }
+      // if (isRank && d.type !== "Widget" && d.widget && d.id) {
+      //   d.value = d.id;
+      //   d.label = d.widget.name || d.id;
+      //   return d;
+      // }
     }
   );
   return items;
@@ -78,15 +80,18 @@ function updateWidgetConfig(options: Option[]) {
     associate: opt,
   };
   dashboardStore.selectWidget({ ...widget });
+
   // remove unuse association widget option
   for (const id of widgetIds.value) {
     if (!newVal.includes(id)) {
       const w = widgets.find((d: { id: string }) => d.id === id);
-      const config = {
-        ...w,
-        associate: [],
-      };
-      dashboardStore.setWidget(config);
+      if (w.type !== "Event") {
+        const config = {
+          ...w,
+          associate: [],
+        };
+        dashboardStore.setWidget(config);
+      }
     }
   }
   // add association options in target widgets
@@ -94,11 +99,13 @@ function updateWidgetConfig(options: Option[]) {
     const item = JSON.parse(JSON.stringify(opt));
     item[i] = { widgetId: dashboardStore.selectedGrid.id };
     const w = widgets.find((d: { id: string }) => d.id === opt[i].widgetId);
-    const config = {
-      ...w,
-      associate: item,
-    };
-    dashboardStore.setWidget(config);
+    if (w.type !== "Event") {
+      const config = {
+        ...w,
+        associate: item,
+      };
+      dashboardStore.setWidget(config);
+    }
   }
   widgetIds.value = newVal;
 }