Fix initialization dashboards (#424)

apache · Oct 24, 2024 · 224e761 · 224e761
1 parent 4c60f69
commit 224e761
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/src/views/dashboard/panel/Layout.vue b/src/views/dashboard/panel/Layout.vue
@@ -78,15 +78,19 @@ limitations under the License. -->
       }
       async function queryMetrics() {
         const widgets = [];
-
         for (const item of dashboardStore.layout) {
-          const isList = ListChartTypes.includes(item.type || "");
-          if (item.type === WidgetType.Widget && !isList) {
-            widgets.push(item);
+          if (item.type === WidgetType.Widget) {
+            if (!ListChartTypes.includes(item.graph?.type || "")) {
+              widgets.push(item);
+            }
           }
           if (item.type === WidgetType.Tab) {
             const index = isNaN(item.activedTabIndex) ? 0 : item.activedTabIndex;
-            widgets.push(...item.children[index].children);
+            widgets.push(
+              ...item.children[index].children.filter(
+                (d: LayoutConfig) => !ListChartTypes.includes(d.graph?.type || ""),
+              ),
+            );
           }
         }
         const configList = widgets.map((d: LayoutConfig) => ({
@@ -103,7 +107,9 @@ limitations under the License. -->
       }
       async function queryTabsMetrics() {
         const configList = dashboardStore.currentTabItems
-          .filter((item: LayoutConfig) => item.type === WidgetType.Widget && !ListChartTypes.includes(item.type || ""))
+          .filter(
+            (item: LayoutConfig) => item.type === WidgetType.Widget && !ListChartTypes.includes(item.graph?.type || ""),
+          )
           .map((d: LayoutConfig) => ({
             metrics: d.expressions || [],
             metricConfig: d.metricConfig || [],
@@ -151,7 +157,7 @@ limitations under the License. -->
         },
       );
       watch(
-        () => appStore.durationTime,
+        () => [appStore.durationTime, dashboardStore.layout],
         () => {
           if (dashboardStore.entity === EntityType[1].value) {
             queryMetrics();