From 986d047285b15b5da08460fa4ac4dfe10dc2dd45 Mon Sep 17 00:00:00 2001
From: Fine <fanxue0830@gmail.com>
Date: Fri, 25 Nov 2022 15:48:08 +0800
Subject: [PATCH] update

---
 src/views/dashboard/related/trace/Header.vue | 33 ++++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/views/dashboard/related/trace/Header.vue b/src/views/dashboard/related/trace/Header.vue
index b847608e..253aa195 100644
--- a/src/views/dashboard/related/trace/Header.vue
+++ b/src/views/dashboard/related/trace/Header.vue
@@ -44,12 +44,18 @@ limitations under the License. -->
       </template>
       <div>
         <div class="title">{{ t("queryConditions") }}</div>
-        <div
-          v-for="key in Object.keys(FiltersKeys)"
-          :key="key"
-          v-show="traceStore.conditions[FiltersKeys[key]]"
-        >
-          <span v-if="key !== 'duration'">
+        <div v-for="key in Object.keys(FiltersKeys)" :key="key">
+          <span
+            v-if="
+              [
+                FiltersKeys.minTraceDuration,
+                FiltersKeys.maxTraceDuration,
+              ].includes(key) && !isNaN(traceStore.conditions[FiltersKeys[key]])
+            "
+          >
+            {{ t(key) }}: {{ traceStore.conditions[FiltersKeys[key]] }}
+          </span>
+          <span v-else-if="key !== 'duration'">
             {{ t(key) }}: {{ traceStore.conditions[FiltersKeys[key]] }}
           </span>
         </div>
@@ -127,13 +133,13 @@ const items = ref<{ label: string; value: string }[]>([]);
 const currentLatency = ref<number[]>(
   filters.latency ? filters.latency[0].data : []
 );
-
 init();
 
 async function init() {
   for (const d of Object.keys(filters)) {
     if (
-      ["status", "queryOrder"].includes(d) ||
+      ["queryOrder"].includes(d) ||
+      (d === "status" && filters[d] && filters[d] !== "ALL") ||
       (filters[d] && d === "latency")
     ) {
       items.value.push({ label: d, value: FiltersKeys[d] });
@@ -204,15 +210,8 @@ function setCondition() {
     traceState: Status[0].value,
     queryOrder: QueryOrders[0].value,
     queryDuration: duration.value,
-    minTraceDuration: isNaN(currentLatency.value[0])
-      ? undefined
-      : currentLatency.value[0] === currentLatency.value[1]
-      ? currentLatency.value[0] - 10
-      : currentLatency.value[0],
-    maxTraceDuration:
-      isNaN(currentLatency.value[1]) || currentLatency.value[1] === Infinity
-        ? undefined
-        : currentLatency.value[1],
+    minTraceDuration: currentLatency.value[0],
+    maxTraceDuration: currentLatency.value[1],
     tags: tagsMap.value.length ? tagsMap.value : undefined,
     paging: { pageNum: 1, pageSize: 20 },
     serviceId: state.service || undefined,