From 11ce32e73eb686deef6f6e202fc3b41779203daa Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 29 Dec 2021 18:12:40 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E4=BF=AE=E6=94=B9=20=E5=A4=8D?=
 =?UTF-8?q?=E5=88=B6=20groupId=20=3D=200=20=E7=9A=84=E9=97=AE=E9=A2=98=20?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=20=E5=88=A0=E9=99=A4other=E7=9A=84hexagon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/bottomBox/tabs/panelTabNew.vue      | 3 +++
 .../src/components/common/rightBox/chart/otherChartConfig.vue | 4 ----
 nezha-fronted/src/components/page/dashboard/panel.vue         | 3 +++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
index 59bc37310..74724216a 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
@@ -378,6 +378,9 @@ export default {
         if (this.chart.datasource !== 'metrics' && this.chart.datasource !== 'log') {
           delete this.chart.elements
         }
+        if (!this.chart.groupId || this.chart.groupId == -1) {
+          this.chart.groupId = ''
+        }
       } else {
         this.rightBox.loading = true
         this.$get('visual/panel/chart/' + data.id).then(res => {
diff --git a/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
index 914b64dde..6dac0ec3e 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
@@ -201,10 +201,6 @@ export default {
           id: 'topology',
           name: this.$t('dashboard.panel.chartForm.typeVal.topology.label')
         },
-        {
-          id: 'hexagon',
-          name: this.$t('dashboard.panel.chartForm.typeVal.hexagonFigure.label')
-        },
         {
           id: 'clock',
           name: this.$t('dashboard.panel.chartForm.typeVal.clock.label')
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index 9080bbe2b..90b14c8b3 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -429,6 +429,9 @@ export default {
         if (this.chart.datasource !== 'metrics' && this.chart.datasource !== 'log') {
           delete this.chart.elements
         }
+        if (!this.chart.groupId || this.chart.groupId == -1) {
+          this.chart.groupId = ''
+        }
       } else {
         this.rightBox.loading = true
         this.$get('visual/panel/chart/' + data.id).then(res => {