From 0b06b1d6baabaa733d80b9de094160aa01797c43 Mon Sep 17 00:00:00 2001
From: Fine <fanxue0830@gmail.com>
Date: Sat, 3 Jun 2023 23:24:01 +0800
Subject: [PATCH] feat: update data

---
 src/types/dashboard.d.ts                     |  2 ++
 src/views/dashboard/Widget.vue               |  2 ++
 src/views/dashboard/configuration/Widget.vue | 11 ++++++++++-
 src/views/dashboard/controls/Widget.vue      |  2 ++
 src/views/dashboard/graphs/EndpointList.vue  |  5 ++++-
 src/views/dashboard/graphs/InstanceList.vue  |  1 -
 src/views/dashboard/graphs/ServiceList.vue   |  1 -
 7 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/types/dashboard.d.ts b/src/types/dashboard.d.ts
index 2c7c102a..636db486 100644
--- a/src/types/dashboard.d.ts
+++ b/src/types/dashboard.d.ts
@@ -44,6 +44,8 @@ export interface LayoutConfig {
   eventAssociate?: boolean;
   filters?: Filters;
   relatedTrace?: RelatedTrace;
+  subExpressions?: string[];
+  subTypesOfMQE?: string[];
 }
 export type RelatedTrace = {
   duration: DurationTime;
diff --git a/src/views/dashboard/Widget.vue b/src/views/dashboard/Widget.vue
index 963fb550..466ae247 100644
--- a/src/views/dashboard/Widget.vue
+++ b/src/views/dashboard/Widget.vue
@@ -38,6 +38,8 @@ limitations under the License. -->
           metricMode: config.metricMode,
           expressions: config.expressions || [],
           typesOfMQE: config.typesOfMQE || [],
+          subExpressions: config.subExpressions || [],
+          subTypesOfMQE: config.subTypesOfMQE || [],
         }"
         :needQuery="true"
       />
diff --git a/src/views/dashboard/configuration/Widget.vue b/src/views/dashboard/configuration/Widget.vue
index b5be4a10..772f2f8d 100644
--- a/src/views/dashboard/configuration/Widget.vue
+++ b/src/views/dashboard/configuration/Widget.vue
@@ -33,7 +33,16 @@ limitations under the License. -->
           :config="{
             ...graph,
             legend: (dashboardStore.selectedGrid.graph || {}).legend,
-            ...dashboardStore.selectedGrid,
+            i: dashboardStore.selectedGrid.i,
+            metrics: dashboardStore.selectedGrid.metrics,
+            metricTypes: dashboardStore.selectedGrid.metricTypes,
+            metricConfig: dashboardStore.selectedGrid.metricConfig,
+            relatedTrace: dashboardStore.selectedGrid.relatedTrace,
+            metricMode: dashboardStore.selectedGrid.metricMode,
+            expressions: dashboardStore.selectedGrid.expressions || [],
+            typesOfMQE: dashboardStore.selectedGrid.typesOfMQE || [],
+            subExpressions: dashboardStore.selectedGrid.subExpressions || [],
+            subTypesOfMQE: dashboardStore.selectedGrid.subTypesOfMQE || [],
           }"
           :needQuery="true"
         />
diff --git a/src/views/dashboard/controls/Widget.vue b/src/views/dashboard/controls/Widget.vue
index 6e04b7e8..0f36affd 100644
--- a/src/views/dashboard/controls/Widget.vue
+++ b/src/views/dashboard/controls/Widget.vue
@@ -62,6 +62,8 @@ limitations under the License. -->
           metricMode: data.metricMode,
           expressions: data.expressions || [],
           typesOfMQE: data.typesOfMQE || [],
+          subExpressions: data.subExpressions || [],
+          subTypesOfMQE: data.subTypesOfMQE || [],
         }"
         :needQuery="needQuery"
         @click="clickHandle"
diff --git a/src/views/dashboard/graphs/EndpointList.vue b/src/views/dashboard/graphs/EndpointList.vue
index 77dc5e15..6781886a 100644
--- a/src/views/dashboard/graphs/EndpointList.vue
+++ b/src/views/dashboard/graphs/EndpointList.vue
@@ -80,6 +80,8 @@ limitations under the License. -->
           metricMode: string;
           expressions: string[];
           typesOfMQE: string[];
+          subExpressions: string[];
+          subTypesOfMQE: string[];
         } & { metricConfig: MetricConfigOpt[] }
       >,
       default: () => ({
@@ -166,11 +168,12 @@ limitations under the License. -->
   async function queryEndpointExpressions(currentPods: Endpoint[]) {
     const expressions = props.config.expressions || [];
     const typesOfMQE = props.config.typesOfMQE || [];
+    const subExpressions = props.config.subExpressions || [];
 
     if (expressions.length && expressions[0] && typesOfMQE.length && typesOfMQE[0]) {
       const params = await useExpressionsQueryPodsMetrics(
         currentPods,
-        { ...props.config, metricConfig: metricConfig.value || [], typesOfMQE, expressions },
+        { ...props.config, metricConfig: metricConfig.value || [], typesOfMQE, expressions, subExpressions },
         EntityType[2].value,
       );
       endpoints.value = params.data;
diff --git a/src/views/dashboard/graphs/InstanceList.vue b/src/views/dashboard/graphs/InstanceList.vue
index 15c72c5d..5b754ac1 100644
--- a/src/views/dashboard/graphs/InstanceList.vue
+++ b/src/views/dashboard/graphs/InstanceList.vue
@@ -204,7 +204,6 @@ limitations under the License. -->
     const expressions = props.config.expressions || [];
     const typesOfMQE = props.config.typesOfMQE || [];
     const subExpressions = props.config.subExpressions || [];
-    const subTypesOfMQE = props.config.subTypesOfMQE || [];
 
     if (expressions.length && expressions[0] && typesOfMQE.length && typesOfMQE[0]) {
       const params = await useExpressionsQueryPodsMetrics(
diff --git a/src/views/dashboard/graphs/ServiceList.vue b/src/views/dashboard/graphs/ServiceList.vue
index 72de7183..1b4a125b 100644
--- a/src/views/dashboard/graphs/ServiceList.vue
+++ b/src/views/dashboard/graphs/ServiceList.vue
@@ -252,7 +252,6 @@ limitations under the License. -->
     const expressions = props.config.expressions || [];
     const typesOfMQE = props.config.typesOfMQE || [];
     const subExpressions = props.config.subExpressions || [];
-    const subTypesOfMQE = props.config.subTypesOfMQE || [];
 
     if (expressions.length && expressions[0] && typesOfMQE.length && typesOfMQE[0]) {
       const params = await useExpressionsQueryPodsMetrics(