From 19b85285baafe7731a2a90be0e9829dc6e94042d Mon Sep 17 00:00:00 2001
From: Qiuxia Fan <fine0830@outlook.com>
Date: Tue, 26 Jul 2022 17:15:27 +0800
Subject: [PATCH] query logs with trace id

---
 src/types/dashboard.d.ts                     |  1 +
 src/views/dashboard/related/log/Header.vue   | 16 +++++++++++++---
 src/views/dashboard/related/trace/Detail.vue |  6 +++---
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/types/dashboard.d.ts b/src/types/dashboard.d.ts
index 1f3ecac9..e0bcd7de 100644
--- a/src/types/dashboard.d.ts
+++ b/src/types/dashboard.d.ts
@@ -47,6 +47,7 @@ export interface LayoutConfig {
       startTime: string;
       endTime: string;
     };
+    traceId?: string;
   };
 }
 
diff --git a/src/views/dashboard/related/log/Header.vue b/src/views/dashboard/related/log/Header.vue
index 0efc3829..1a32a3d3 100644
--- a/src/views/dashboard/related/log/Header.vue
+++ b/src/views/dashboard/related/log/Header.vue
@@ -130,7 +130,7 @@ limitations under the License. -->
   </div>
 </template>
 <script lang="ts" setup>
-import { ref, reactive, watch, onUnmounted } from "vue";
+import { ref, reactive, watch, onUnmounted, inject } from "vue";
 import { useI18n } from "vue-i18n";
 import { Option } from "@/types/app";
 import { useLogStore } from "@/store/modules/log";
@@ -141,8 +141,10 @@ import ConditionTags from "@/views/components/ConditionTags.vue";
 import { ElMessage } from "element-plus";
 import { EntityType } from "../../data";
 import { ErrorCategory } from "./data";
+import { LayoutConfig } from "@/types/dashboard";
 
-/*global defineProps */
+/*global  defineProps */
+const options: LayoutConfig | undefined = inject("options");
 const props = defineProps({
   needQuery: { type: Boolean, default: true },
 });
@@ -151,7 +153,9 @@ const appStore = useAppStoreWithOut();
 const selectorStore = useSelectorStore();
 const dashboardStore = useDashboardStore();
 const logStore = useLogStore();
-const traceId = ref<string>("");
+const traceId = ref<string>(
+  (options && options.filters && options.filters.traceId) || ""
+);
 const keywordsOfContent = ref<string[]>([]);
 const excludingKeywordsOfContent = ref<string[]>([]);
 const tagsList = ref<string[]>([]);
@@ -325,6 +329,12 @@ function removeExcludeContent(index: number) {
 }
 onUnmounted(() => {
   logStore.resetCondition();
+  const item = {
+    ...options,
+    filters: undefined,
+  };
+  dashboardStore.setWidget(item);
+  traceId.value = "";
 });
 watch(
   () => selectorStore.currentService,
diff --git a/src/views/dashboard/related/trace/Detail.vue b/src/views/dashboard/related/trace/Detail.vue
index d88a9de0..7806bec0 100644
--- a/src/views/dashboard/related/trace/Detail.vue
+++ b/src/views/dashboard/related/trace/Detail.vue
@@ -140,8 +140,8 @@ export default defineComponent({
     LogTable,
   },
   setup() {
-    /*global Nullable */
-    const options: LayoutConfig | undefined = inject("options");
+    /*global Nullable, Recordable */
+    const options: Recordable<LayoutConfig> = inject("options") || {};
     const { t } = useI18n();
     const traceStore = useTraceStore();
     const loading = ref<boolean>(false);
@@ -189,7 +189,7 @@ export default defineComponent({
       };
       dashboardStore.setWidget(item);
       const logTabIndex = widget.id.split("-");
-      const traceTabindex = options?.id?.split("-") || [];
+      const traceTabindex = (options.id as any).split("-") || [];
       let container: Nullable<Element>;
 
       if (logTabIndex[1] === undefined) {