From d8a3c27345cde352a804edcfc286db869706379f Mon Sep 17 00:00:00 2001
From: Fine0830 <fanxue0830@gmail.com>
Date: Wed, 22 Nov 2023 13:03:59 +0800
Subject: [PATCH] fix: Log associate with Trace (#343)

---
 src/views/dashboard/related/log/LogTable/LogService.vue | 1 +
 src/views/dashboard/related/trace/Filter.vue            | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/dashboard/related/log/LogTable/LogService.vue b/src/views/dashboard/related/log/LogTable/LogService.vue
index cfcfab1f..60d32f8c 100644
--- a/src/views/dashboard/related/log/LogTable/LogService.vue
+++ b/src/views/dashboard/related/log/LogTable/LogService.vue
@@ -76,6 +76,7 @@ limitations under the License. -->
       {
         sourceId: options.id || "",
         traceId: id,
+        id: props.data.serviceId || "",
       },
       "Trace",
     );
diff --git a/src/views/dashboard/related/trace/Filter.vue b/src/views/dashboard/related/trace/Filter.vue
index 17b30b57..429f71c2 100644
--- a/src/views/dashboard/related/trace/Filter.vue
+++ b/src/views/dashboard/related/trace/Filter.vue
@@ -178,6 +178,7 @@ limitations under the License. -->
     if (props.data.filters.id) {
       item = arr.find((d: { id: string }) => d.id === props.data.filters?.id);
     }
+
     return item;
   }
   function setCondition() {
@@ -194,7 +195,7 @@ limitations under the License. -->
     if (props.data.filters && props.data.filters.id) {
       param = {
         ...param,
-        serviceId: selectorStore.currentService.id,
+        serviceId: props.data.filters.id || undefined,
         endpointId: state.endpoint.id || undefined,
         serviceInstanceId: state.instance.id || undefined,
       };