From b0765eeb62eacd232c15c5f2e0d3652132198b14 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Thu, 28 Oct 2021 16:43:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?NEZ-1119=20fix:=20=E4=BF=AE=E5=A4=8Duser=20?=
 =?UTF-8?q?=E8=AF=A6=E7=BB=86=E8=A7=86=E5=9B=BE=20-=20terminal=20log=20sta?=
 =?UTF-8?q?te=20=E7=BC=BA=E5=B0=91=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/detailView/view/detailViewRight.vue   | 1 +
 .../src/components/common/table/settings/terminalLogTable.vue   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/detailView/view/detailViewRight.vue b/nezha-fronted/src/components/common/detailView/view/detailViewRight.vue
index 6b11d66bf..24bbd15f5 100644
--- a/nezha-fronted/src/components/common/detailView/view/detailViewRight.vue
+++ b/nezha-fronted/src/components/common/detailView/view/detailViewRight.vue
@@ -344,6 +344,7 @@ export default {
     position: relative;
     padding: 0;
     background-color: #fff;
+    overflow-y: hidden;
   }
   .sub-box /deep/ .top-tools.top-tools--sub{
     border: none;
diff --git a/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue b/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue
index 2ed9eb03c..0146baf85 100644
--- a/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue
@@ -213,7 +213,7 @@ export default {
     },
     statusClass () {
       return function (status) {
-        switch (status) {
+        switch (Number(status)) {
           case 0:
             return 'nz-icon-connecting color23bf9a'
           case 1:

From 9acb8c0b5d72808744f4847dc83d67b65b6fe7d9 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Thu, 28 Oct 2021 16:54:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Del-popover=20trigg?=
 =?UTF-8?q?er=20=E8=A7=A6=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/charts/chart-pie.vue             | 2 +-
 .../src/components/common/popBox/selectAssetMetaGroup.vue     | 2 +-
 .../src/components/common/project/L5/CanvasProps.vue          | 2 +-
 .../src/components/common/project/L5/topologyTopTool.vue      | 2 +-
 .../src/components/common/rightBox/asset/assetBox.vue         | 2 +-
 .../common/rightBox/trafficSetting/trafficSettingTab.vue      | 2 +-
 .../src/components/common/table/settings/mibTable.vue         | 2 +-
 nezha-fronted/src/components/page/asset/components/ping.vue   | 2 +-
 nezha-fronted/src/components/page/asset/endpointStatusPop.vue | 2 +-
 nezha-fronted/src/components/page/config/mibBrowser.vue       | 2 +-
 nezha-fronted/src/components/page/dashboard/chartBox.vue      | 4 ++--
 nezha-fronted/src/components/page/dashboard/chartMetric.vue   | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/nezha-fronted/src/components/charts/chart-pie.vue b/nezha-fronted/src/components/charts/chart-pie.vue
index 2a369380c..e3831dff4 100644
--- a/nezha-fronted/src/components/charts/chart-pie.vue
+++ b/nezha-fronted/src/components/charts/chart-pie.vue
@@ -12,7 +12,7 @@
             v-if="isError"
             :close-delay=10
             placement="top-start"
-            trigger="click"
+            trigger="hover"
             popper-class="chart-error-popper">
             <div >{{errorContent}}</div>
             <span slot="reference" style="" class="panel-info-corner panel-info-corner--error">
diff --git a/nezha-fronted/src/components/common/popBox/selectAssetMetaGroup.vue b/nezha-fronted/src/components/common/popBox/selectAssetMetaGroup.vue
index 06df4e85f..3a3d567a8 100644
--- a/nezha-fronted/src/components/common/popBox/selectAssetMetaGroup.vue
+++ b/nezha-fronted/src/components/common/popBox/selectAssetMetaGroup.vue
@@ -23,7 +23,7 @@
               <span>
                 <el-popover
                   placement="right"
-                  trigger="click"
+                  trigger="hover"
                   :content="node.label">
                   <span slot="reference">{{ node.label }}</span>
                 </el-popover>
diff --git a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
index 4f04be3ba..11787df9d 100644
--- a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
+++ b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
@@ -251,7 +251,7 @@
                   <template>
                     <el-col class="legend-title">
                       {{ $t('dashboard.panel.chartForm.legend') }}&nbsp;
-                      <el-popover placement="top" trigger="click" width="211">
+                      <el-popover placement="top" trigger="hover" width="211">
                         <div style="word-break:keep-all;">{{ $t('dashboard.panel.chartForm.legendTip') }}</div>
                         <i slot="reference" class="nz-icon nz-icon-info-normal" style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;"
                            @mouseover="rz"></i>
diff --git a/nezha-fronted/src/components/common/project/L5/topologyTopTool.vue b/nezha-fronted/src/components/common/project/L5/topologyTopTool.vue
index da1c78049..ca6dd18db 100644
--- a/nezha-fronted/src/components/common/project/L5/topologyTopTool.vue
+++ b/nezha-fronted/src/components/common/project/L5/topologyTopTool.vue
@@ -14,7 +14,7 @@
           <el-popover
             placement="bottom"
             width="111"
-            trigger="click"
+            trigger="hover"
             class="scale-number-box"
             popper-class="scale-number-popover no-style-class"
            >
diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
index d7b297f41..3b0d9142c 100644
--- a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
@@ -241,7 +241,7 @@
                 </span>
                 <el-popover
                   placement="right"
-                  trigger="click"
+                  trigger="hover"
                   :content="$t('asset.talonPrompt')">
                   <i slot="reference" class="nz-icon nz-icon-about"></i>
                 </el-popover>
diff --git a/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue b/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue
index b7024d739..c8e8478bc 100644
--- a/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue
+++ b/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue
@@ -18,7 +18,7 @@
              size="small"
              v-model="assetSetting.host"
            ></el-autocomplete>
-          <el-popover @hide="popHide" @show="popShow" placement="bottom" popper-class="no-style-class" trigger="click">
+          <el-popover @hide="popHide" @show="popShow" placement="bottom" popper-class="no-style-class" trigger="hover">
           <div class="mib-browser-ad-search">
             <el-row class="mib-browser-ad-search-item" style="font-weight: bold">{{$t('config.dc.traffic.snmpSetting')}}</el-row>
             <el-row class="mib-browser-ad-search-item">
diff --git a/nezha-fronted/src/components/common/table/settings/mibTable.vue b/nezha-fronted/src/components/common/table/settings/mibTable.vue
index 2b599f123..2f78fd13a 100644
--- a/nezha-fronted/src/components/common/table/settings/mibTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/mibTable.vue
@@ -42,7 +42,7 @@
           <div style="height: 100%">
             <div style="height: 100%; overflow: auto;">
               <div v-for="(n,i) in scope.row['modelsDetail']" :key="n.name+'-'+n.id+'-'+i" class="detail-item-content">
-                <el-popover placement="top" trigger="click" >
+                <el-popover placement="top" trigger="hover" >
                   <div>
                     <div>
                       <span>{{$t('overall.name')}}:</span>
diff --git a/nezha-fronted/src/components/page/asset/components/ping.vue b/nezha-fronted/src/components/page/asset/components/ping.vue
index 1aab6d256..77d75b805 100644
--- a/nezha-fronted/src/components/page/asset/components/ping.vue
+++ b/nezha-fronted/src/components/page/asset/components/ping.vue
@@ -2,7 +2,7 @@
   <el-popover
     :content="formatPingTime(model.pingLastUpdate)"
     placement="bottom"
-    trigger="click"
+    trigger="hover"
     width="200"
   >
     <div slot="reference" style="width: 100%">
diff --git a/nezha-fronted/src/components/page/asset/endpointStatusPop.vue b/nezha-fronted/src/components/page/asset/endpointStatusPop.vue
index b5420dc06..d183e7aca 100644
--- a/nezha-fronted/src/components/page/asset/endpointStatusPop.vue
+++ b/nezha-fronted/src/components/page/asset/endpointStatusPop.vue
@@ -36,7 +36,7 @@
                     <div :key="index" class="inner-row">
                       <div class="inner-col left">ID：{{item.id}}</div>
                       <div class="inner-col right">
-                        <el-popover placement="right"  width="50" trigger="click" :content="(item.state == 1?'up':'down')+'['+(item.lastUpdate&&item.lastUpdate!=''?(new Date(item.lastUpdate).getHours()+':'+new Date(item.lastUpdate).getMinutes()):'--')+']'" >
+                        <el-popover placement="right"  width="50" trigger="hover" :content="(item.state == 1?'up':'down')+'['+(item.lastUpdate&&item.lastUpdate!=''?(new Date(item.lastUpdate).getHours()+':'+new Date(item.lastUpdate).getMinutes()):'--')+']'" >
                           <div slot="reference" style="width: 20px">
                             <div @mouseover="resetZIndex($event)" :class="{'active-icon green':item.state == 1,'active-icon red':item.state == 0}"></div>
                           </div>
diff --git a/nezha-fronted/src/components/page/config/mibBrowser.vue b/nezha-fronted/src/components/page/config/mibBrowser.vue
index 7d39e2036..8a61aacf2 100644
--- a/nezha-fronted/src/components/page/config/mibBrowser.vue
+++ b/nezha-fronted/src/components/page/config/mibBrowser.vue
@@ -39,7 +39,7 @@
           </el-select>
         </div>
         <div class="top-tool-btn-group">
-          <el-popover :offset="-143" placement="bottom" trigger="click" width="300">
+          <el-popover :offset="-143" placement="bottom" trigger="hover" width="300">
             <div class="mib-browser-ad-search">
               <el-select v-model="searchParam.snmpCredentialId" placeholder="Select credential" popper-class="right-public-box-select-top right-public-box-dropdown-top" size="mini" style="width: 300px" value-key="id">
                 <el-option v-for="(item, index) in credentialData" :key="index" :label="item.name" :value="item.id"></el-option>
diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue
index c8e697807..eda45254c 100644
--- a/nezha-fronted/src/components/page/dashboard/chartBox.vue
+++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue
@@ -406,7 +406,7 @@
               <el-row style="margin-top: 18px">
                 <el-col class="legend-title">
                   {{$t('dashboard.panel.chartForm.legend')}}&nbsp;
-                  <el-popover placement="top" trigger="click" width="211">
+                  <el-popover placement="top" trigger="hover" width="211">
                     <div style="word-break:keep-all;">{{$t('dashboard.panel.chartForm.legendTip')}}</div>
                     <i @mouseover="rz" class="nz-icon nz-icon-info-normal" slot="reference" style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;"></i>
                   </el-popover>
@@ -429,7 +429,7 @@
           <div v-if="editChart.type == 'singleStat'||editChart.type == 'table'" class="form__sub-title">
           <span>
             {{$t('dashboard.panel.chartForm.valMapping.name')}}
-            <el-popover  placement="top" trigger="click" width="275">
+            <el-popover  placement="top" trigger="hover" width="275">
               <div style="white-space: pre-wrap;">{{$t('dashboard.panel.chartForm.valueMappingTip')}}</div>
               <i @mouseover="rz" class="nz-icon nz-icon-info-normal" slot="reference" style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;"></i>
             </el-popover>
diff --git a/nezha-fronted/src/components/page/dashboard/chartMetric.vue b/nezha-fronted/src/components/page/dashboard/chartMetric.vue
index 9bb0ce789..2fdf4a7f1 100644
--- a/nezha-fronted/src/components/page/dashboard/chartMetric.vue
+++ b/nezha-fronted/src/components/page/dashboard/chartMetric.vue
@@ -260,7 +260,7 @@
       <el-row :gutter="4">
         <el-col :span="4">
           {{$t('dashboard.panel.chartForm.legend')}}&nbsp;
-          <el-popover :content="$t('dashboard.panel.chartForm.legendTip')" placement="top" width="150" trigger="click">
+          <el-popover :content="$t('dashboard.panel.chartForm.legendTip')" placement="top" width="150" trigger="hover">
             <i slot="reference" class="nz-icon nz-icon-info-normal" style="font-size: 12px; -webkit-transform:scale(0.75);display:inline-block;" @mouseover="resetZIndex"></i>
           </el-popover>
         </el-col>