From f449f08e777414470f8c5cc78acb9335c603c740 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Fri, 22 Jan 2021 19:48:02 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=80=E5=87=BA=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/bottomBox/tabs/panelTab.vue  |  2 +-
 .../src/components/page/dashboard/chartBox.vue         | 10 ++++++----
 nezha-fronted/src/components/page/dashboard/panel.vue  |  4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue
index 1f1b69e1b..341c59690 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue
@@ -142,7 +142,7 @@
             url:'',
             threshold:'',
           },
-          elements:[],
+          elements:[{expression: "", legend: "", type: "expert", id: ""}],
           panel: '',
           sync: 0
         },
diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue
index b101f244c..d87ec9288 100644
--- a/nezha-fronted/src/components/page/dashboard/chartBox.vue
+++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue
@@ -331,7 +331,7 @@
                   <label >{{$t('dashboard.panel.chartForm.statistics')}}</label>&nbsp;
                 </el-col>
                 <el-col style="width: calc(100% - 120px);">
-                  <el-select placeholder="" popper-class="chart-box-dropdown-mini" size="small" v-model="statistics">
+                  <el-select placeholder="" popper-class="chart-box-dropdown-mini" size="small" v-model="editChart.param.statistics">
                     <el-option :key="item.value" :label="item.label" :value="item.value" v-for="item in statisticsList">
                       <span class="panel-dropdown-label-txt" >{{item.label}}</span>
                     </el-option>
@@ -382,6 +382,7 @@
                 <el-color-picker
                   :ref="'colorPickerBac'+index"
                   @active-change="(val)=>colorChange(mapping,showPicker[index].bac,val)"
+                  popper-class="no-style-class"
                   v-model="showPicker[index].bac?mapping.color.bac:mapping.color.text"
                 >
                 </el-color-picker>
@@ -426,6 +427,7 @@
               <div class="color-content" ref="color-content">
                 <el-color-picker
                   :ref="'colorPickerBac'+index"
+                  popper-class="no-style-class"
                   @active-change="(val)=>colorChange(mapping,showPicker[index].bac,val)"
                   v-model="showPicker[index].bac?mapping.color.bac:mapping.color.text"
                 >
@@ -937,7 +939,7 @@
               sync: this.editChart.sync
             };
             if(this.editChart.type === 'singleStat'){
-              params.param.statistics=this.statistics;
+              // params.param.statistics=this.statistics;
             } else {
               delete params.param.statistics;
             }
@@ -1037,7 +1039,7 @@
             return ;
           }
           if(this.editChart.type == 'singleStat'){
-            this.$set(this.editChart.param, "statistics", this.statistics);
+            // this.$set(this.editChart.param, "statistics", this.statistics);
           } else {
             delete this.editChart.param.statistics;
           }
@@ -1436,7 +1438,7 @@
                 sync: this.editChart.sync
               };
               if(this.editChart.type === 'singleStat'){
-                params.param.statistics=this.statistics;
+                // params.param.statistics=this.statistics;
                 params.param.valueMapping=this.editChart.param.valueMapping;
               } else {
                 delete params.param.statistics;
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index 43d2dda69..d08698db5 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -123,7 +123,7 @@
   import pickTime from "../../common/pickTime";
   import exportXLSX from "../../common/exportXLSX";
   import selectPanel from "../../common/popBox/selectPanel";
-  
+
   export default {
     name: "panel",
     data() {
@@ -159,7 +159,7 @@
             url:'',
             threshold:'',
           },
-          elements:[],
+          elements:[{expression: "", legend: "", type: "expert", id: ""}],
           panel: '',
           sync: 0
         },