From 19b89fe2bdb1ba3ad9abcbe48f11e17a604ebe29 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 8 Mar 2022 10:01:10 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9panel=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=AF=BC=E5=85=A5=E4=B9=8B=E5=90=8E=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/chart/chart/chartTable.vue          |  2 +-
 nezha-fronted/src/components/chart/chartMixin.js       |  2 +-
 .../components/common/rightBox/chart/chartRightBox.vue | 10 +++++++++-
 nezha-fronted/src/components/page/dashboard/panel.vue  |  6 +++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chart/chartTable.vue b/nezha-fronted/src/components/chart/chart/chartTable.vue
index dde2bf9f3..4603288bc 100644
--- a/nezha-fronted/src/components/chart/chart/chartTable.vue
+++ b/nezha-fronted/src/components/chart/chart/chartTable.vue
@@ -67,7 +67,7 @@ export default {
       }
       this.tableTimer = setTimeout(() => {
         this.columns = this.chartInfo.param.columns
-        this.chartInfo.param.valueMapping.forEach((item) => {
+        this.chartInfo.param.valueMapping && this.chartInfo.param.valueMapping.forEach((item) => {
           if (this.valueMapping[item.column]) {
             this.valueMapping[item.column].push(item)
           } else {
diff --git a/nezha-fronted/src/components/chart/chartMixin.js b/nezha-fronted/src/components/chart/chartMixin.js
index 1571af507..675b0be90 100644
--- a/nezha-fronted/src/components/chart/chartMixin.js
+++ b/nezha-fronted/src/components/chart/chartMixin.js
@@ -163,7 +163,7 @@ export default {
     },
     selectMapping (value, valueMapping, show) {
       let mapping = ''
-      if (show) {
+      if (show && valueMapping) {
         valueMapping.forEach(item => {
           if (item.type === 'value') {
             if (value == item.value) {
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
index 6da9c3bf8..7e4bbd45f 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
@@ -445,7 +445,15 @@ export default {
       deep: true,
       immediate: true,
       handler (n) {
-        this.editChart = JSON.parse(JSON.stringify(n))
+        const obj = JSON.parse(JSON.stringify(n))
+        console.log(obj)
+        if (obj.param && !obj.param.valueMapping) {
+          obj.param.valueMapping = []
+        }
+        if (obj.param && !obj.param.thresholds) {
+          obj.param.thresholds = []
+        }
+        this.editChart = obj
         if (this.editChart.groupId === -1) {
           this.editChart.groupId = ''
         }
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index c7c268377..3f74917f0 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -60,7 +60,7 @@
                 export-file-name="chart"
                 export-url="/visual/panel/export"
                 import-url="/visual/panel/import"
-                @afterImport="dateChange"
+                @afterImport="afterImport"
               >
                 <template v-slot:before>
                   <el-dropdown-item>
@@ -812,6 +812,10 @@ export default {
       if (type === 'duplicate') {
         this.editChart(chartInfo, true)
       }
+    },
+    afterImport () {
+      this.dateChange()
+      this.panelReloadOnlyPanel()
     }
   },
   created () {