From b01565b2b83d57f2906bd6a852d3d55a4a0eae8a Mon Sep 17 00:00:00 2001
From: Fine0830 <fine0830@outlook.com>
Date: Fri, 29 Jul 2022 20:54:57 +0800
Subject: [PATCH] fix: set the value(SECOND) of the `step` filed for queries
 (#131)

---
 src/views/dashboard/related/event/Content.vue | 24 ++++++++++++-------
 src/views/dashboard/related/log/Header.vue    |  9 +------
 src/views/dashboard/related/trace/Filter.vue  |  7 ------
 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/src/views/dashboard/related/event/Content.vue b/src/views/dashboard/related/event/Content.vue
index a8a71f8c..50de8b7c 100644
--- a/src/views/dashboard/related/event/Content.vue
+++ b/src/views/dashboard/related/event/Content.vue
@@ -139,7 +139,19 @@ function associateTraceLog(
       };
       dashboardStore.setWidget(item);
     } else {
-      const { start, end } = setEndTime(i.start, i.end);
+      let step = appStore.duration.step;
+      let start = i.start;
+      let end = i.end;
+      if (
+        appStore.duration.step === "MINUTE" &&
+        i.end.getTime() - i.start.getTime() < 60000
+      ) {
+        step = "SECOND";
+      } else {
+        const times = setEndTime(i.start, i.end);
+        start = times.start;
+        end = times.end;
+      }
       const item = {
         ...widget,
         filters: {
@@ -147,15 +159,11 @@ function associateTraceLog(
           duration: {
             start: dateFormatStep(
               getLocalTime(appStore.utc, start),
-              appStore.duration.step,
+              step,
               true
             ),
-            end: dateFormatStep(
-              getLocalTime(appStore.utc, end),
-              appStore.duration.step,
-              true
-            ),
-            step: appStore.duration.step,
+            end: dateFormatStep(getLocalTime(appStore.utc, end), step, true),
+            step,
           },
         },
       };
diff --git a/src/views/dashboard/related/log/Header.vue b/src/views/dashboard/related/log/Header.vue
index 33732011..d91cbe84 100644
--- a/src/views/dashboard/related/log/Header.vue
+++ b/src/views/dashboard/related/log/Header.vue
@@ -271,7 +271,7 @@ function searchLogs() {
         : state.service.id,
       endpointId: endpoint || state.endpoint.id || undefined,
       serviceInstanceId: instance || state.instance.id || undefined,
-      queryDuration: appStore.durationTime,
+      queryDuration: duration.value,
       keywordsOfContent: keywordsOfContent.value,
       excludingKeywordsOfContent: excludingKeywordsOfContent.value,
       tags: tagsMap.value.length ? tagsMap.value : undefined,
@@ -344,13 +344,6 @@ function removeExcludeContent(index: number) {
 }
 onUnmounted(() => {
   logStore.resetState();
-  const item = {
-    ...props.data,
-    filters: undefined,
-  };
-  dashboardStore.setWidget(item);
-  traceId.value = "";
-  duration.value = appStore.durationTime;
 });
 watch(
   () => selectorStore.currentService,
diff --git a/src/views/dashboard/related/trace/Filter.vue b/src/views/dashboard/related/trace/Filter.vue
index cb351e99..1deb1688 100644
--- a/src/views/dashboard/related/trace/Filter.vue
+++ b/src/views/dashboard/related/trace/Filter.vue
@@ -236,13 +236,6 @@ async function searchEndpoints(keyword: string) {
 }
 onUnmounted(() => {
   traceStore.resetState();
-  const item = {
-    ...props.data,
-    filters: undefined,
-  };
-  dashboardStore.setWidget(item);
-  traceId.value = "";
-  duration.value = appStore.durationTime;
 });
 watch(
   () => [selectorStore.currentPod],