From da69c928bcc014f3a560234d677aed3b63924dd3 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 18 Aug 2023 14:54:53 +0800
Subject: [PATCH 1/6] =?UTF-8?q?NEZ-3084=20fix=EF=BC=9A=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=90=8E=E5=8F=B3=E4=B8=8A=E8=A7=92=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84username=E4=BF=A1=E6=81=AF=E4=B8=8E=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E7=9A=84username=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/rightBox/administration/userBox.vue       | 11 ++++++++++-
 nezha-fronted/src/components/layout/header.vue       | 12 +++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/administration/userBox.vue b/nezha-fronted/src/components/common/rightBox/administration/userBox.vue
index 5df121323..ed97ae57c 100644
--- a/nezha-fronted/src/components/common/rightBox/administration/userBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/administration/userBox.vue
@@ -113,7 +113,7 @@
 <script>
 // import { host, port } from '@/components/common/js/validate'
 import editRigthBox from '../../mixin/editRigthBox'
-
+import bus from '@/libs/bus'
 export default {
   name: 'userBox',
   components: {
@@ -246,6 +246,15 @@ export default {
               if (res.code === 200) {
                 this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') })
                 this.esc(true)
+                const userInfo = localStorage.getItem('nz-userInfo') ? JSON.parse(localStorage.getItem('nz-userInfo')) : ''
+                if (userInfo.id == this.editUser.id) {
+                  const obj = this.$lodash.cloneDeep(this.editUser)
+                  delete obj.roles
+                  delete obj.pin
+                  delete obj.pinChange
+                  localStorage.setItem('nz-userInfo', JSON.stringify(obj))
+                  bus.$emit('login')
+                }
               } else {
                 this.$message.error(res.msg)
               }
diff --git a/nezha-fronted/src/components/layout/header.vue b/nezha-fronted/src/components/layout/header.vue
index 2c0296882..4fd47228f 100644
--- a/nezha-fronted/src/components/layout/header.vue
+++ b/nezha-fronted/src/components/layout/header.vue
@@ -202,8 +202,9 @@ export default {
 
     initEvent () {
       bus.$on('login', () => {
-        this.username = localStorage.getItem('nz-username')
-        this.name = localStorage.getItem('nz-username')
+        const userInfo = localStorage.getItem('nz-userInfo') ? JSON.parse(localStorage.getItem('nz-userInfo')) : ''
+        this.username = userInfo.username
+        this.name = userInfo.name
         // this.refreshLang()
       })
       // if (window.history && window.history.pushState) {
@@ -218,7 +219,7 @@ export default {
       this.$store.commit('isShrink')
     },
     testUser () {
-      if (this.username != localStorage.getItem('nz-username')) {
+      if (this.name != localStorage.getItem('nz-username')) {
         this.$router.go(0)
       }
       if (this.$store.getters.getLanguage && (this.$store.getters.getLanguage !== localStorage.getItem('nz-language'))) {
@@ -233,8 +234,9 @@ export default {
     // for (let i = 97; i < 123; i++) {
     //   this.fontData.push(String.fromCharCode(i))
     // }
-    this.name = localStorage.getItem('nz-username')
-    this.username = localStorage.getItem('nz-username')
+    const userInfo = localStorage.getItem('nz-userInfo') ? JSON.parse(localStorage.getItem('nz-userInfo')) : ''
+    this.name = userInfo.name
+    this.username = userInfo.username
     this.language = localStorage.getItem('nz-language') ? localStorage.getItem('nz-language') : 'en'
     this.$i18n.locale = this.language
     if (localStorage.getItem('nz-token')) {

From 8a78d4f83cc38b7fa6ac0c3245a5fe42956c84d2 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 18 Aug 2023 14:57:02 +0800
Subject: [PATCH 2/6] =?UTF-8?q?NEZ-3084=20=20fix=EF=BC=9A=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7=20name=E6=97=B6?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E5=88=B7=E6=96=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/layout/header.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/layout/header.vue b/nezha-fronted/src/components/layout/header.vue
index 4fd47228f..d130021f3 100644
--- a/nezha-fronted/src/components/layout/header.vue
+++ b/nezha-fronted/src/components/layout/header.vue
@@ -202,7 +202,7 @@ export default {
 
     initEvent () {
       bus.$on('login', () => {
-        const userInfo = localStorage.getItem('nz-userInfo') ? JSON.parse(localStorage.getItem('nz-userInfo')) : ''
+        const userInfo = localStorage.getItem('nz-userInfo') ? JSON.parse(localStorage.getItem('nz-userInfo')) : {}
         this.username = userInfo.username
         this.name = userInfo.name
         // this.refreshLang()
@@ -219,7 +219,8 @@ export default {
       this.$store.commit('isShrink')
     },
     testUser () {
-      if (this.name != localStorage.getItem('nz-username')) {
+      const userInfo = localStorage.getItem('nz-userInfo') ? JSON.parse(localStorage.getItem('nz-userInfo')) : {}
+      if (this.name != userInfo.name) {
         this.$router.go(0)
       }
       if (this.$store.getters.getLanguage && (this.$store.getters.getLanguage !== localStorage.getItem('nz-language'))) {
@@ -234,7 +235,7 @@ export default {
     // for (let i = 97; i < 123; i++) {
     //   this.fontData.push(String.fromCharCode(i))
     // }
-    const userInfo = localStorage.getItem('nz-userInfo') ? JSON.parse(localStorage.getItem('nz-userInfo')) : ''
+    const userInfo = localStorage.getItem('nz-userInfo') ? JSON.parse(localStorage.getItem('nz-userInfo')) : {}
     this.name = userInfo.name
     this.username = userInfo.username
     this.language = localStorage.getItem('nz-language') ? localStorage.getItem('nz-language') : 'en'

From 08d842d3b1f305f6355bf115f66a6f41ebc407dd Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 18 Aug 2023 15:12:54 +0800
Subject: [PATCH 3/6] =?UTF-8?q?NEZ-3085=20fix=EF=BC=9ADashboard=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=97=A0=E6=B3=95=E6=89=93=E5=BC=80=EF=BC=8C=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=B8=80=E7=9B=B4=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/alert/alertMessageInfoTab.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue b/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue
index 04f701af7..3b2a54ef9 100644
--- a/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue
+++ b/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue
@@ -118,7 +118,7 @@ export default {
           })
           // && n.alertRule.dashboardId
           // n.alertRule && (n.alertRule.dashboardId = 101534)
-          if (n.alertRule && n.alertRule.dashboardId) {
+          if (n.alertRule && n.alertRule.dashboardId && n.alertRule.dashboardId != -1) {
             //
             this.cardNames.push({
               key: 'dashboard',

From 988fb60a2de6e3ebec978a430c07f6caa426d68d Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 18 Aug 2023 15:39:13 +0800
Subject: [PATCH 4/6] =?UTF-8?q?NEZ-3088=20fix=EF=BC=9A=20token=20=E7=9A=84?=
 =?UTF-8?q?port=20=E6=9C=AA=E8=BF=9B=E8=A1=8C=E6=95=B0=E5=AD=97=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/rightBox/asset/assetBox.vue          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
index 9d2ea7388..02c65a767 100644
--- a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
@@ -427,7 +427,8 @@ export default {
           { required: true, message: this.$t('validate.required'), trigger: 'change' }
         ],
         clientPort: [
-          { required: true, message: this.$t('validate.required'), trigger: 'change' }
+          { required: true, message: this.$t('validate.required'), trigger: 'change' },
+          { validator: port, trigger: 'blur' }
         ]
       },
       cabRules: {

From d4bca3361a45db77087747eb27769ad30de1450c Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 18 Aug 2023 15:59:31 +0800
Subject: [PATCH 5/6] =?UTF-8?q?NEZ-3090=20fix=EF=BC=9AUsers=E4=B8=ADOperat?=
 =?UTF-8?q?ion=E4=B8=8BOperation=20log=E9=A1=B5=E9=9D=A2=EF=BC=8CRequest?=
 =?UTF-8?q?=20params=E3=80=81Response=E5=A4=8D=E5=88=B6=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=8F=91=E7=94=9F=E8=BD=AC=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/table/settings/operationLogTable.vue    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/common/table/settings/operationLogTable.vue b/nezha-fronted/src/components/common/table/settings/operationLogTable.vue
index 3ab44a588..09dd57130 100644
--- a/nezha-fronted/src/components/common/table/settings/operationLogTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/operationLogTable.vue
@@ -190,7 +190,7 @@ export default {
       }
     },
     copyValue (item) {
-      const str = item
+      const str = JSON.stringify(JSON.parse(item), null, 2)
       // const domUrl = document.createElement('input')
       // domUrl.value = JSON.stringify(str)
       // domUrl.id = 'creatDom'
@@ -200,7 +200,7 @@ export default {
       // const creatDom = document.getElementById('creatDom')
       // creatDom.parentNode.removeChild(creatDom)
       // this.$message.success(this.$t('overall.copySuccess'))
-      this.$copyText(JSON.stringify(str)).then(() => {
+      this.$copyText(str).then(() => {
         this.$message.success({ message: this.$t('overall.copySuccess') })
       })
     }

From c251577a0d8bd4905ba9d42bad98e43fa31cf063 Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Fri, 18 Aug 2023 17:32:32 +0800
Subject: [PATCH 6/6] =?UTF-8?q?NEZ-3077=20fix=EF=BC=9A=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=9C=AA=E6=8C=89ctrl=E9=94=AE=20=E9=A1=B5=E9=9D=A2=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=BB=9A=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/chart/chartTimeSeries.vue           | 35 +++++++++++++++++++
 .../chart/chart/options/chartTimeSeries.js    |  1 +
 2 files changed, 36 insertions(+)

diff --git a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
index 10f66cf63..9a942c67c 100644
--- a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
+++ b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
@@ -202,10 +202,41 @@ export default {
             })
           }
         }
+        if (this.isInit) {
+          // 修复echarts bug(dataZoom设置为inside 未按住ctrl 页面无法滚动)
+          // 监听按键按下事件
+          document.addEventListener('keydown', this.keydown)
+          // 监听按键松开事件
+          document.addEventListener('keyup', this.keyup)
+        }
         this.chartLoading = false
         this.isInit = false
       }, 200)
     },
+    keydown (event) {
+      // 监听按键按下事件
+      // 判断是否按下了Ctrl键
+      if (event.ctrlKey) {
+        // 如果按下了Ctrl键，则启用Echarts的dataZoom功能
+        getChart(this.chartId).setOption({
+          dataZoom: [{
+            disabled: false
+          }]
+        })
+      }
+    },
+    keyup (event) {
+      // 监听按键松开事件
+      // 判断是否释放了Ctrl键
+      if (!event.ctrlKey) {
+        // 如果释放了Ctrl键，则禁用Echarts的dataZoom功能
+        getChart(this.chartId).setOption({
+          dataZoom: [{
+            disabled: true
+          }]
+        })
+      }
+    },
     getMinMaxFromData (originalDatas, chartUnit = 2) {
       let minTime = null
       let maxTime = null
@@ -537,6 +568,10 @@ export default {
       this.isStack = this.chartInfo.param.stack
     } catch (e) {}
     this.chartInfo.loaded && this.initChart(this.chartOption)
+  },
+  beforeDestroy () {
+    document.removeEventListener('keydown', this.keydown)
+    document.removeEventListener('keyup', this.keyup)
   }
 }
 </script>
diff --git a/nezha-fronted/src/components/chart/chart/options/chartTimeSeries.js b/nezha-fronted/src/components/chart/chart/options/chartTimeSeries.js
index 236d4071a..d40abf328 100644
--- a/nezha-fronted/src/components/chart/chart/options/chartTimeSeries.js
+++ b/nezha-fronted/src/components/chart/chart/options/chartTimeSeries.js
@@ -50,6 +50,7 @@ export const chartTimeSeriesLineOption = {
   },
   dataZoom: [
     {
+      disabled: true,
       type: 'inside',
       zoomOnMouseWheel: 'ctrl'
     }