From 16a1e9c8a6a9966574cb992357c98b0d60ace2f4 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Sat, 2 Apr 2022 17:30:49 +0800
Subject: [PATCH 1/7] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=20=20char-ba?=
 =?UTF-8?q?r=20=E6=98=BE=E7=A4=BA=E9=98=88=E5=80=BC=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/rightBox/chart/chartConfig.vue       |  4 ++--
 .../common/rightBox/chart/chartTypeShow.js      | 17 +++++++++++++++++
 .../common/rightBox/chart/systemChartConfig.vue |  4 ++--
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
index 2266f4b15..697a08d06 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
@@ -410,7 +410,7 @@
         </transition>
 
         <!--thresholdConfig-->
-        <div class="form__sub-title">
+        <div class="form__sub-title" v-if="isThresholdConfig(chartConfig.type)">
           <span>{{$t('dashboard.panel.chartForm.threshold')}}</span>
           <el-switch
             v-model="chartConfig.param.enable.thresholds"
@@ -419,7 +419,7 @@
           ></el-switch>
         </div>
         <transition name="el-zoom-in-top">
-          <el-row v-if="chartConfig.param.enable.thresholds">
+          <el-row v-if="chartConfig.param.enable.thresholds && isThresholdConfig(chartConfig.type)">
             <el-form-item
               v-for="(item,index) in chartConfig.param.thresholds"
               :key="index"
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartTypeShow.js b/nezha-fronted/src/components/common/rightBox/chart/chartTypeShow.js
index c380c1c49..849301126 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartTypeShow.js
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartTypeShow.js
@@ -93,6 +93,23 @@ export default {
         default: return false
       }
     },
+    isThresholdConfig(type) {
+      switch (type) {
+        case 'line':
+        case 'area':
+        case 'point':
+          return true
+        case 'table':
+        case 'stat':
+        case 'hexagon':
+        case 'gauge':
+        case 'treemap':
+        case 'pie':
+        case 'bar':
+          return false
+        default: return false
+      }
+    },
     isShowLegendVlaues (type) {
       switch (type) {
         case 'line':
diff --git a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
index 618dad858..98894a1cc 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
@@ -374,7 +374,7 @@
         </transition>
 
         <!--thresholdConfig-->
-        <div class="form__sub-title">
+        <div class="form__sub-title" v-if="isThresholdConfig(chartConfig.type)">
           <span>{{$t('dashboard.panel.chartForm.threshold')}}</span>
           <el-switch
             v-model="chartConfig.param.enable.thresholds"
@@ -383,7 +383,7 @@
           ></el-switch>
         </div>
         <transition name="el-zoom-in-top">
-          <el-row v-if="chartConfig.param.enable.thresholds">
+          <el-row v-if="chartConfig.param.enable.thresholds && isThresholdConfig(chartConfig.type)">
             <el-form-item
               v-for="(item,index) in chartConfig.param.thresholds"
               :key="index"

From 5cdc744b657693c67e66455ae6a26ee979520c47 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Sat, 2 Apr 2022 17:41:24 +0800
Subject: [PATCH 2/7] =?UTF-8?q?fix=EF=BC=9A=E5=A4=84=E7=90=86=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E4=B8=8D=E5=AF=B9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/rightBox/chart/chartRightBox.vue   | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
index e392ea405..62a236086 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
@@ -494,6 +494,9 @@ export default {
           if (!obj.param.max) {
             obj.param.max = 100
           }
+          if (!obj.param.text && obj.param.display) {
+            obj.param.text = obj.param.display
+          }
           if (!obj.param.link) {
             this.$set(obj.param, 'link', '')
           }
@@ -516,6 +519,12 @@ export default {
               if (!item.show) {
                 item.show = false
               }
+              if (item.text && !item.display) {
+                item.display = item.text
+              }
+              if (item.columns && !item.column) {
+                item.column = item.columns
+              }
             })
           }
         }

From 2af50a60cd5ba845c6df027aeb9e3fd551076b54 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Sat, 2 Apr 2022 18:08:10 +0800
Subject: [PATCH 3/7] =?UTF-8?q?NEZ-1775=20fix=EF=BC=9A=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=9B=BE=E8=A1=A8system=E7=B1=BB=E5=9E=8B=E6=97=B6Display?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E5=A4=9A=E4=BD=99=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/rightBox/chart/publicConfig.js        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js b/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
index a17834b5d..9c72af763 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
+++ b/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
@@ -165,7 +165,7 @@ export default {
           label: this.$t('dashboard.panel.chartForm.legend'),
           value: 'legend'
         }, {
-          label: this.$t('config.assetLabel.all'),
+          label: this.$t('project.topology.none'),
           value: 'none'
         }
       ],

From 819fdc34895dd4192eb1c05da668190d44b528fc Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Sat, 2 Apr 2022 18:08:28 +0800
Subject: [PATCH 4/7] =?UTF-8?q?NEZ-1776=20fix=EF=BC=9Achart=20params?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=94=99=E8=AF=AF=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/chart/chartList.vue    | 13 +++++++++++++
 .../common/rightBox/chart/chartRightBox.vue         |  2 ++
 2 files changed, 15 insertions(+)

diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue
index 370ba37c0..d4873ab9e 100644
--- a/nezha-fronted/src/components/chart/chartList.vue
+++ b/nezha-fronted/src/components/chart/chartList.vue
@@ -449,6 +449,19 @@ export default {
             // }
             height = (item.type === 'group' && item.param.collapse) ? this.headerH : item.height
             param.showHeader = true
+            if (param.valueMapping) {
+              param.valueMapping.forEach(valueMapping => {
+                if (!valueMapping.show) {
+                  valueMapping.show = false
+                }
+                if (valueMapping.text && !valueMapping.display) {
+                  valueMapping.display = valueMapping.text
+                }
+                if (valueMapping.columns && !valueMapping.column) {
+                  valueMapping.column = valueMapping.columns
+                }
+              })
+            }
           }
           return {
             ...item,
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
index 62a236086..d7fd8e637 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
@@ -521,6 +521,8 @@ export default {
               }
               if (item.text && !item.display) {
                 item.display = item.text
+              } else if (!item.display) {
+                item.display = '{{A.$value}}'
               }
               if (item.columns && !item.column) {
                 item.column = item.columns

From 70290654bf16fc4e9fb11432fed512aa4756b12c Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Sat, 2 Apr 2022 18:24:47 +0800
Subject: [PATCH 5/7] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2panel=20=E4=B8=8D=E5=88=B7=E6=96=B0=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=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/page/dashboard/panel.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index 0020148de..4a986b190 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -319,11 +319,11 @@ export default {
         nowTimeType: JSON.stringify(this.nowTimeType),
         searchTime: JSON.stringify(this.searchTime)
       }
-      // this.dateChange()
       // this.getTableData()
       const path = this.fromRoute.panel
       this.updatePath(param, path)
-      this.getData(this.filter)
+      this.dateChange()
+      // this.getData(this.filter)
       this.$refs.chartList.cleanData()
     },
 

From 5d25f989dd94cd1526e18d35c8da924080602e0c Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Sat, 2 Apr 2022 18:31:19 +0800
Subject: [PATCH 6/7] =?UTF-8?q?NEZ-1774=20fix=EF=BC=9A=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0Misc=E5=86=85Diagram=E6=97=B6=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=E5=90=8E=E7=95=8C=E9=9D=A2=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E6=B5=8F=E8=A7=88=E5=99=A8=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/ChartDiagram/diagram.vue   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
index d748acfa2..d2e55ac4e 100644
--- a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
+++ b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
@@ -99,23 +99,23 @@
 
         </span>
           <span class="float-right">
-          <button @click="previewTopology" v-if="!isPreview" class="nz-btn nz-btn-size-normal nz-btn-style-light"
+          <button type="button" @click="previewTopology" v-if="!isPreview" class="nz-btn nz-btn-size-normal nz-btn-style-light"
                   style="margin-right: 20px"
           >
              {{$t('project.topology.preview')}}
            </button>
-            <button v-if="isPreview" class="nz-btn nz-btn-size-normal nz-btn-style-light" @click="previewExit"
+            <button type="button" v-if="isPreview" class="nz-btn nz-btn-size-normal nz-btn-style-light" @click="previewExit"
                     style="margin-right: 20px"
             >
              {{$t('project.topology.previewExit')}}
            </button>
-           <button class="nz-btn nz-btn-size-normal nz-btn-style-normal" @click="saveTopology"
+           <button type="button" class="nz-btn nz-btn-size-normal nz-btn-style-normal" @click="saveTopology"
                    :disabled="prevent_opt.save"
                    :class="{'nz-btn-disabled':prevent_opt.save}"
                    style="margin-right: 20px">
              {{$t('project.topology.save')}}
            </button>
-           <button class="nz-btn nz-btn-size-normal nz-btn-style-normal" style="margin-right: 20px" @click="cancelTopology">
+           <button type="button" class="nz-btn nz-btn-size-normal nz-btn-style-normal" style="margin-right: 20px" @click="cancelTopology">
              {{$t('project.topology.exit')}}
            </button>
          </span>
@@ -294,11 +294,11 @@
       </el-row>
       <div class="upload-pic-row" style="text-align: center">
             <span>
-               <button class="nz-btn nz-btn-size-normal nz-btn-style-light" style="margin-right: 20px" @click="uploadPicShow=false">
+               <button type="button" class="nz-btn nz-btn-size-normal nz-btn-style-light" style="margin-right: 20px" @click="uploadPicShow=false">
              {{$t('project.topology.exit')}}
            </button>
 
-              <button class="nz-btn nz-btn-size-normal nz-btn-style-normal" @click="imgUpload"
+              <button type="button" class="nz-btn nz-btn-size-normal nz-btn-style-normal" @click="imgUpload"
                       v-has="'topo_icon_save'" :disabled="prevent_opt.save"
                       :class="{'nz-btn-disabled':prevent_opt.save}"
                       style="margin-right: 20px">

From 1ec39433ac0d4fc06bd97e9cc7746ab8a3f015fa Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 6 Apr 2022 10:23:28 +0800
Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=20chart-line?=
 =?UTF-8?q?=E7=9A=84Y=E8=BD=B4=E5=9C=A8=E5=80=BC=E6=AF=94=E8=BE=83?=
 =?UTF-8?q?=E5=B0=8F=E7=9A=84=E6=97=B6=E5=80=99=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/chart/chartTimeSeries.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
index fc97bc59a..f640fc2c0 100644
--- a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
+++ b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
@@ -290,7 +290,7 @@ export default {
     yAxisLabelFormatter (minValue, maxValue, copies, unit, dot) {
       const self = this
       return function (val, index) {
-        const value = formatScientificNotation(val, 2)
+        const value = formatScientificNotation(val, 6)
         let chartUnit = self.chartInfo.unit
         chartUnit = chartUnit || 2
         const unit = chartDataFormat.getUnit(chartUnit)