From 0880ed24fa4ca5fcb1ba601fa309422ed10487e2 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 19 Oct 2022 13:57:17 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-2264=20fix=EF=BC=9A=20=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E8=B7=B3=E8=BD=AC=E5=90=8E=20=E6=98=BE?=
 =?UTF-8?q?=E8=91=97=E6=8F=90=E7=A4=BA=20=E6=90=9C=E7=B4=A2=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/css/common.scss        | 16 ++++++++++++++++
 .../src/components/common/mixin/table.js        |  9 ++++++++-
 .../src/components/common/multipleTime.vue      | 17 ++++++++++-------
 .../common/table/alert/alertRuleTable.vue       |  1 +
 .../common/table/asset/assetTable.vue           |  1 +
 .../common/table/settings/dcTable.vue           |  1 +
 .../common/table/settings/endpointTable.vue     |  1 +
 .../common/table/settings/moduleTable.vue       |  1 +
 .../common/table/settings/projectTable.vue      |  1 +
 9 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss
index e1a8ee8df..4df2ec9c5 100644
--- a/nezha-fronted/src/assets/css/common.scss
+++ b/nezha-fronted/src/assets/css/common.scss
@@ -608,3 +608,19 @@ textarea {
 .el-tabs--border-card {
   background: $--background-color-empty;
 }
+.nz-table-global-select{
+  background: linear-gradient(to right, $--table-row-hover-background-color 0%,$--table-row-hover-background-color 50%,$--background-color-empty 51%,$--background-color-empty 100%);
+  background-size: 200% 100%;
+  animation: gradientBG 5s ease-in infinite;
+}
+@keyframes gradientBG {
+  0% {
+    background-position: 100% 0%;
+  }
+  50% {
+    background-position: 0% 0%;
+  }
+  100% {
+    background-position: 100% 0%;
+  }
+}
diff --git a/nezha-fronted/src/components/common/mixin/table.js b/nezha-fronted/src/components/common/mixin/table.js
index 5b9604bde..13afdf27b 100644
--- a/nezha-fronted/src/components/common/mixin/table.js
+++ b/nezha-fronted/src/components/common/mixin/table.js
@@ -148,6 +148,10 @@ export default {
     },
     rowKey (row) { // ping trace的 唯一key
       return row.ip + '-' + row.dc.id
+    },
+    cellMouseEnter (row, column, cell, event) {
+      // console.log(row, column, cell, event)
+      cell.parentNode.classList.remove('nz-table-global-select')
     }
   },
   watch: {
@@ -173,7 +177,10 @@ export default {
           if (id) {
             setTimeout(() => {
               if (document.getElementById('globalSearch' + id)) {
-                document.getElementById('globalSearch' + id).scrollIntoView(true)
+                document.getElementById('globalSearch' + id).scrollIntoView({ block: 'center', inline: 'center' })
+                if (document.getElementById('globalSearch' + id).parentNode.parentNode.parentNode.classList.contains('el-table__row')) {
+                  document.getElementById('globalSearch' + id).parentNode.parentNode.parentNode.classList.add('nz-table-global-select')
+                }
                 this.$store.commit('setGlobalSearchId', '')
               }
             }, 500)
diff --git a/nezha-fronted/src/components/common/multipleTime.vue b/nezha-fronted/src/components/common/multipleTime.vue
index c78c9363f..15d60e500 100644
--- a/nezha-fronted/src/components/common/multipleTime.vue
+++ b/nezha-fronted/src/components/common/multipleTime.vue
@@ -2,7 +2,7 @@
   <div class="multiple-time-box">
     <div :class="showDropdown?'compare-box':''" :title="$t('dashboard.panel.customTimeRange')"><i class="nz-icon nz-icon-compare" @click="changeShowDropdown" /></div>
     <transition>
-      <div v-show="showDropdown" id="panel-calender" class="calendar">
+      <div v-show="showDropdown" id="panel-calender" class="calendar" style="position: relative">
         <my-date-picker prefix-icon=" " size="mini" ref="calendar"
                         :value-format="timeFormatStrToDatePickFormat(timeFormatMain)"
                         :format="timeFormatStrToDatePickFormat(timeFormatMain)" class="panel-time-picker-hidden" @change="dateChange" v-model="startTime" type="datetime"
@@ -76,10 +76,10 @@ export default {
         text: this.$t('dashboard.panel.noDate')
       },
       timeData: [
-        // {
-        //   id: 0,
-        //   text: this.$t('dashboard.panel.customTimeRange')
-        // },
+        {
+          id: 0,
+          text: this.$t('dashboard.panel.customTimeRange')
+        },
         {
           id: 12,
           text: this.$t('dashboard.panel.noDate')
@@ -198,8 +198,11 @@ export default {
   },
   methods: {
     dateChange (val) {
-      const startTime = bus.timeFormate(val, this.multipleTime)
-      const endTime = bus.timeFormate(new Date(val).getTime() + new Date(this.stepSearchTime[1]).getTime() - new Date(this.stepSearchTime[0]).getTime(), this.multipleTime)
+      console.log(val)
+      const startTime = this.momentTz(this.momentStrToTimestamp(val))
+      console.log(this.stepSearchTime[1], this.stepSearchTime[0])
+      const end = this.momentStrToTimestamp(val) + this.momentStrToTimestamp(this.stepSearchTime[1]) - this.momentStrToTimestamp(this.stepSearchTime[0])
+      const endTime = this.momentTz(end, this.multipleTime)
       this.$set(this.searchTime, 0, startTime)
       this.$set(this.searchTime, 1, endTime)
 
diff --git a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
index b91054371..c1e1eff3e 100644
--- a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
@@ -8,6 +8,7 @@
     border
     :default-sort="orderBy"
     @header-dragend="dragend"
+    @cell-mouse-enter="cellMouseEnter"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"
     @row-dblclick="(row)=>{queryMessage(row)}"
diff --git a/nezha-fronted/src/components/common/table/asset/assetTable.vue b/nezha-fronted/src/components/common/table/asset/assetTable.vue
index 7843f7b2b..11b5d6ac6 100644
--- a/nezha-fronted/src/components/common/table/asset/assetTable.vue
+++ b/nezha-fronted/src/components/common/table/asset/assetTable.vue
@@ -8,6 +8,7 @@
       :height="height"
       :default-sort="orderBy"
       border
+      @cell-mouse-enter="cellMouseEnter"
       @header-dragend="dragend"
       @sort-change="tableDataSort"
       @selection-change="selectionChange"
diff --git a/nezha-fronted/src/components/common/table/settings/dcTable.vue b/nezha-fronted/src/components/common/table/settings/dcTable.vue
index 2d00731c6..82a3f19fd 100644
--- a/nezha-fronted/src/components/common/table/settings/dcTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/dcTable.vue
@@ -6,6 +6,7 @@
     :height="height"
     border
     :default-sort="orderBy"
+    @cell-mouse-enter="cellMouseEnter"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"
diff --git a/nezha-fronted/src/components/common/table/settings/endpointTable.vue b/nezha-fronted/src/components/common/table/settings/endpointTable.vue
index 897d1cf6e..fb9229dec 100644
--- a/nezha-fronted/src/components/common/table/settings/endpointTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/endpointTable.vue
@@ -8,6 +8,7 @@
       border
       :default-sort="orderBy"
       @header-dragend="dragend"
+      @cell-mouse-enter="cellMouseEnter"
       @sort-change="tableDataSort"
       @selection-change="selectionChange"
       @row-dblclick="(row)=>{$emit('showBottomBox', 'panelTab', row)}"
diff --git a/nezha-fronted/src/components/common/table/settings/moduleTable.vue b/nezha-fronted/src/components/common/table/settings/moduleTable.vue
index 8abed4f11..58e0ee09d 100644
--- a/nezha-fronted/src/components/common/table/settings/moduleTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/moduleTable.vue
@@ -5,6 +5,7 @@
     :data="tableData"
     :height="height"
     border
+    @cell-mouse-enter="cellMouseEnter"
     :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
diff --git a/nezha-fronted/src/components/common/table/settings/projectTable.vue b/nezha-fronted/src/components/common/table/settings/projectTable.vue
index 102d189a2..77323811c 100644
--- a/nezha-fronted/src/components/common/table/settings/projectTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/projectTable.vue
@@ -8,6 +8,7 @@
     border
     :default-sort="orderBy"
     @header-dragend="dragend"
+    @cell-mouse-enter="cellMouseEnter"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"
     @row-dblclick="(row)=>{changeProjectTopo(row)}"