From 9d15fed1c8289a21e0fcf07e9e0f7d462ae13263 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=8A=B2=E6=9D=BE?= <chenjinsong@zdjizhi.com>
Date: Fri, 22 Jan 2021 19:21:43 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dchart-box=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E6=8C=89=E9=92=AE=E4=B8=8D=E8=A7=81=E4=BA=86=E7=9A=84?=
 =?UTF-8?q?=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/chartBox.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue
index 7659fc27f..b101f244c 100644
--- a/nezha-fronted/src/components/page/dashboard/chartBox.vue
+++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue
@@ -480,13 +480,13 @@
       <button v-cancel="{obj:editChart,func:esc}" id="chart-box-esc" class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new">
         <span>{{$t('overall.cancel')}}</span>
       </button>
-      <button @click="SyncSave" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="chart-box-Sync" v-has:all="[`${from}_chart_save`, `${from}_chart_sync`]" v-if="showPanel.type && showPanel.type == 'model'">
+      <button @click="SyncSave" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="chart-box-Sync" v-has:all="[`${from}_chart_toAdd`, `${from}_chart_sync`]" v-if="showPanel.type && showPanel.type == 'model'">
         <span>{{$t('overall.SyncSave')}}</span>
       </button>
       <button @click="preview" id="chart-box-preview" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" v-else>
         <span>{{$t('overall.preview')}}</span>
       </button>
-      <button @click="confirmAdd" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="chart-box-save" v-has="`${from}_chart_save`" :disabled="prevent_opt.save" :class="{'nz-btn-disabled':prevent_opt.save}" >
+      <button :class="{'nz-btn-disabled':prevent_opt.save}" :disabled="prevent_opt.save" @click="confirmAdd" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="chart-box-save" v-has="`${from}_chart_toAdd`" >
         <span>{{$t('overall.save')}}</span>
       </button>
     </div>

From 73a5da318ab9f73af1231d8b7a35988fb63568e4 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Fri, 22 Jan 2021 19:28:40 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E5=88=A0=E6=8E=89=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/rightBox/modelBox.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/modelBox.vue b/nezha-fronted/src/components/common/rightBox/modelBox.vue
index c3d8cef58..4195a40b2 100644
--- a/nezha-fronted/src/components/common/rightBox/modelBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/modelBox.vue
@@ -36,7 +36,7 @@
                 <div class="dropdown-btns" v-show="dropdownHoverItem == 'type' + item.id">
                   <span :id="'model-type-op-del-' + item.id" @click.stop="delType(item.id)" class="dropdown-btn dropdown-btn-delete" v-has="'model_type_delete'"><i class="nz-icon nz-icon-delete"></i></span>
                   <span :id="'model-type-op-edit-' + item.id" @click.stop="editType(item)" class="dropdown-btn dropdown-btn-edit" v-has="'model_type_toEdit'" v-if="!item.isEdit"><i class="nz-icon nz-icon-edit"></i></span>
-                  <span :id="'model-type-op-edit-' + item.id" @click.stop="saveType(item)" class="dropdown-btn dropdown-btn-edit" v-else v-has="'model_type_save'"><i class="nz-icon nz-icon-check"></i></span>
+                  <span :id="'model-type-op-edit-' + item.id" @click.stop="saveType(item)" class="dropdown-btn dropdown-btn-edit" v-else><i class="nz-icon nz-icon-check"></i></span>
                 </div>
               </div>
             </template>
@@ -59,7 +59,7 @@
                 <div class="dropdown-btns" v-show="dropdownHoverItem == 'vendor' + item.id">
                   <span :id="'model-vendor-op-del-' + item.id" @click.stop="delVendor(item.id)" class="dropdown-btn dropdown-btn-delete" v-has="'model_vendor_delete'"><i class="nz-icon nz-icon-delete"></i></span>
                   <span :id="'model-vendor-op-edit-' + item.id" @click.stop="editVendor(item)" class="dropdown-btn dropdown-btn-edit" v-has="'model_vendor_toEdit'" v-if="!item.isEdit"><i class="nz-icon nz-icon-edit"></i></span>
-                  <span :id="'model-type-op-edit-' + item.id" @click.stop="saveVendor(item)" class="dropdown-btn dropdown-btn-edit" v-else v-has="'model_vendor_save'"><i class="nz-icon nz-icon-check"></i></span>
+                  <span :id="'model-type-op-edit-' + item.id" @click.stop="saveVendor(item)" class="dropdown-btn dropdown-btn-edit" v-else><i class="nz-icon nz-icon-check"></i></span>
                 </div>
               </div>
             </template>

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 3/3] =?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
         },