From 0b859bda889faa43388aacf1b4b7279d6c7cd6a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com>
Date: Thu, 7 Sep 2023 11:35:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8E=92=E6=9F=A5=E5=B9=B6=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=AF=B9=E6=97=A0=E6=95=B0=E6=8D=AE=E6=9C=AA=E5=81=9A?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/advancedSearch/TagMode.vue     | 19 ++++++++++++-------
 .../dnsInsight/DnsActiveMaliciousDomain.vue   |  7 +++++--
 .../charts2/charts/npm/NpmRecentEvents.vue    | 12 +++++++-----
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/components/advancedSearch/TagMode.vue b/src/components/advancedSearch/TagMode.vue
index fb58705a..74b411d0 100644
--- a/src/components/advancedSearch/TagMode.vue
+++ b/src/components/advancedSearch/TagMode.vue
@@ -467,13 +467,18 @@ export default {
       }
     },
     changeMode () {
-      const parser = new Parser(this.columnList)
-      const errorList = parser.validateMeta(this.metaList)
-      if (_.isEmpty(errorList)) {
-        this.reloadUrl({ mode: 'text' })
-        const strObj = handleMetaListToStr(this.metaList)
-        const str2 = strObj.str2 ? strObj.str2 : strObj
-        this.$emit('changeMode', 'text', str2)
+      if (this.metaList.length > 0) {
+        const parser = new Parser(this.columnList)
+        const errorList = parser.validateMeta(this.metaList)
+        if (_.isEmpty(errorList)) {
+          this.reloadUrl({ mode: 'text' })
+          const strObj = handleMetaListToStr(this.metaList)
+          const str2 = strObj.str2 ? strObj.str2 : strObj
+          this.$emit('changeMode', 'text', str2)
+        } else {
+          this.reloadUrl({ mode: 'text' })
+          this.$emit('changeMode', 'text', { metaList: [], str: '' })
+        }
       } else {
         this.reloadUrl({ mode: 'text' })
         this.$emit('changeMode', 'text', { metaList: [], str: '' })
diff --git a/src/views/charts2/charts/dnsInsight/DnsActiveMaliciousDomain.vue b/src/views/charts2/charts/dnsInsight/DnsActiveMaliciousDomain.vue
index 032d15fc..70ea24b2 100644
--- a/src/views/charts2/charts/dnsInsight/DnsActiveMaliciousDomain.vue
+++ b/src/views/charts2/charts/dnsInsight/DnsActiveMaliciousDomain.vue
@@ -23,7 +23,7 @@
                     <span class="data-column-ips">{{ $t(scope.row[item.prop]) }}</span>
                   </template>
                   <!--超过3个ip就省略号显示，移动鼠标block块展示，并换行-->
-                  <pre style="max-height: 152px;margin: 0px -10px -15px 0;overflow: scroll;"><span style="height: 24px;line-height: 24px;color: #046ECA;">{{scope.row[item.prop].replace(/,/g, '\n')}}</span></pre>
+                  <pre style="max-height: 152px;margin: 0 -10px -15px 0;overflow: scroll;"><span style="height: 24px;line-height: 24px;color: #046ECA;">{{scope.row[item.prop].replace(/,/g, '\n')}}</span></pre>
                 </el-popover>
                 <span v-else class="data-column-ips">{{ $t(scope.row[item.prop]) }}</span>
               </template>
@@ -103,7 +103,9 @@ export default {
   watch: {
     timeFilter: {
       handler (n) {
-        this.initData()
+        if (n) {
+          this.initData()
+        }
       }
     }
   },
@@ -128,6 +130,7 @@ export default {
           this.tableData = res.data.result
         } else {
           this.isNoData = true
+          this.tableData = []
         }
       }).finally(() => {
         this.toggleLoading(false)
diff --git a/src/views/charts2/charts/npm/NpmRecentEvents.vue b/src/views/charts2/charts/npm/NpmRecentEvents.vue
index 0f0f4974..41490ec6 100644
--- a/src/views/charts2/charts/npm/NpmRecentEvents.vue
+++ b/src/views/charts2/charts/npm/NpmRecentEvents.vue
@@ -114,11 +114,13 @@ export default {
         if (response.status === 200) {
           this.showError = false
           this.isNoData = res.data.result.length === 0
-          res.data.result.forEach(e => {
-            if (e.startTime) {
-              e.startTime = dateFormatByAppearance(e.startTime)
-            }
-          })
+          if (!this.isNoData) {
+            res.data.result.forEach(e => {
+              if (e.startTime) {
+                e.startTime = dateFormatByAppearance(e.startTime)
+              }
+            })
+          }
           this.tableData = res.data.result
         } else {
           this.httpError(res)