From 618d4fc3bb7610dc405d9eb9672b02251bf87b16 Mon Sep 17 00:00:00 2001
From: Fine <fanxue0830@gmail.com>
Date: Mon, 13 Nov 2023 18:58:29 +0800
Subject: [PATCH] fix: trace id

---
 .../related/trace/components/D3Graph/SpanDetail.vue       | 3 ++-
 .../dashboard/related/trace/components/Table/Index.vue    | 8 +++++++-
 .../related/trace/components/Table/TableContainer.vue     | 2 ++
 .../related/trace/components/Table/TableItem.vue          | 3 ++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/views/dashboard/related/trace/components/D3Graph/SpanDetail.vue b/src/views/dashboard/related/trace/components/D3Graph/SpanDetail.vue
index 7947464c..f4c27777 100644
--- a/src/views/dashboard/related/trace/components/D3Graph/SpanDetail.vue
+++ b/src/views/dashboard/related/trace/components/D3Graph/SpanDetail.vue
@@ -142,6 +142,7 @@ limitations under the License. -->
   /*global defineProps, Nullable, Recordable */
   const props = defineProps({
     currentSpan: { type: Object as PropType<Recordable>, default: () => ({}) },
+    traceId: { type: String, default: "" },
   });
   const { t } = useI18n();
   const traceStore = useTraceStore();
@@ -167,7 +168,7 @@ limitations under the License. -->
     const res = await traceStore.getSpanLogs({
       condition: {
         relatedTrace: {
-          traceId: props.currentSpan.traceId,
+          traceId: props.currentSpan.traceId || props.traceId,
           segmentId: props.currentSpan.segmentId,
           spanId: props.currentSpan.spanId,
         },
diff --git a/src/views/dashboard/related/trace/components/Table/Index.vue b/src/views/dashboard/related/trace/components/Table/Index.vue
index 9d16a758..0d210b1d 100644
--- a/src/views/dashboard/related/trace/components/Table/Index.vue
+++ b/src/views/dashboard/related/trace/components/Table/Index.vue
@@ -17,7 +17,13 @@ limitations under the License. -->
     <div class="trace-t-loading" v-show="loading">
       <Icon iconName="spinner" size="sm" />
     </div>
-    <TableContainer :tableData="tableData" type="table" :headerType="headerType" @select="handleSelectSpan">
+    <TableContainer
+      :tableData="tableData"
+      type="table"
+      :headerType="headerType"
+      :traceId="traceId"
+      @select="handleSelectSpan"
+    >
       <div class="trace-tips" v-if="!tableData.length">{{ $t("noData") }}</div>
     </TableContainer>
   </div>
diff --git a/src/views/dashboard/related/trace/components/Table/TableContainer.vue b/src/views/dashboard/related/trace/components/Table/TableContainer.vue
index 1961cc1a..795dda6d 100644
--- a/src/views/dashboard/related/trace/components/Table/TableContainer.vue
+++ b/src/views/dashboard/related/trace/components/Table/TableContainer.vue
@@ -41,6 +41,7 @@ limitations under the License. -->
     </div>
     <TableItem
       :method="method"
+      :traceId="traceId"
       v-for="(item, index) in tableData"
       :data="item"
       :key="'key' + index"
@@ -63,6 +64,7 @@ limitations under the License. -->
     tableData: { type: Array as PropType<Recordable>, default: () => [] },
     type: { type: String, default: "" },
     headerType: { type: String, default: "" },
+    traceId: { type: String, default: "" },
   });
   const emits = defineEmits(["select"]);
   const method = ref<number>(300);
diff --git a/src/views/dashboard/related/trace/components/Table/TableItem.vue b/src/views/dashboard/related/trace/components/Table/TableItem.vue
index 1bfa4ffe..52297534 100644
--- a/src/views/dashboard/related/trace/components/Table/TableItem.vue
+++ b/src/views/dashboard/related/trace/components/Table/TableItem.vue
@@ -137,7 +137,7 @@ limitations under the License. -->
       />
     </div>
     <el-dialog v-model="showDetail" :destroy-on-close="true" fullscreen @closed="showDetail = false">
-      <SpanDetail :currentSpan="data" />
+      <SpanDetail :currentSpan="data" :traceId="traceId" />
     </el-dialog>
   </div>
 </template>
@@ -156,6 +156,7 @@ limitations under the License. -->
     method: { type: Number, default: 0 },
     type: { type: String, default: "" },
     headerType: { type: String, default: "" },
+    traceId: { type: String, traceId: "" },
   };
   export default defineComponent({
     name: "TableItem",