From af70abd14188710bb82aa71eb771b24f49a51448 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Wed, 5 Aug 2020 20:58:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dasset-tag=E3=80=81char?=
 =?UTF-8?q?tbox=E3=80=81endpoint=E8=A1=A8=E5=A4=B4=E7=AD=89bug=201.edit-as?=
 =?UTF-8?q?set=E6=97=B6tag=E4=B8=8D=E8=83=BD=E6=96=B0=E5=A2=9E=E7=9A=84bug?=
 =?UTF-8?q?=202.chartbox=20url=E7=B1=BB=E5=9E=8B=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84bug=203.endpoint=E8=A1=A8=E5=A4=B4?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=A1=86=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?bug=204.=E5=BA=95=E9=83=A8=E6=BB=91=E6=A1=86=E9=80=80=E5=87=BA?=
 =?UTF-8?q?=E5=85=A8=E5=B1=8F=E5=90=8E=E4=B8=BB=E5=88=97=E8=A1=A8=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84bug=205.=E5=B7=A6=E4=BE=A7=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95project=E6=8A=98=E5=8F=A0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/charts/chart-list.vue      |  2 +-
 .../src/components/common/js/tools.js         |  4 +-
 .../src/components/common/leftMenu.vue        |  2 +-
 .../components/common/rightBox/assetBox.vue   |  1 +
 .../components/common/rightBox/moduleBox.vue  |  3 +
 .../components/page/dashboard/chartBox.vue    | 56 ++++++-------------
 .../src/components/page/dashboard/panel.vue   | 20 ++-----
 7 files changed, 29 insertions(+), 59 deletions(-)

diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue
index 2985d8e49..e2398f2b0 100644
--- a/nezha-fronted/src/components/charts/chart-list.vue
+++ b/nezha-fronted/src/components/charts/chart-list.vue
@@ -498,8 +498,8 @@
           }
         }
       },
-      // 获取panel详情数据,获取panel下所有chart列表
 
+      // 获取panel详情数据,获取panel下所有chart列表
       getData(params) {
         const param = {
           panelId: params.panelId,
diff --git a/nezha-fronted/src/components/common/js/tools.js b/nezha-fronted/src/components/common/js/tools.js
index 2a03b264c..ab7dbd693 100644
--- a/nezha-fronted/src/components/common/js/tools.js
+++ b/nezha-fronted/src/components/common/js/tools.js
@@ -267,13 +267,13 @@ export const bottomBoxWindow = {
     //副列表
     document.querySelector(".sub-list").style.height = vm.bottomBox.mainListHeight ? contentRightHeight-vm.bottomBox.mainListHeight-9 + 'px' : 'calc(50% - 4px)';
     setTimeout(() => {
-      vm.bottomBox.isFullScreen = false;
       if (document.querySelector(".main-list-with-sub").offsetHeight >= 100) {
-        vm.mainResizeShow = true;
+        vm.bottomBox.mainResizeShow = true;
       }
       if (document.querySelector(".sub-list").offsetHeight >= 100) {
         vm.bottomBox.subResizeShow = true;
       }
+      vm.bottomBox.isFullScreen = false;
       window.resizing = false;
     }, 210);
   },
diff --git a/nezha-fronted/src/components/common/leftMenu.vue b/nezha-fronted/src/components/common/leftMenu.vue
index 32a3eca31..e8d395b18 100644
--- a/nezha-fronted/src/components/common/leftMenu.vue
+++ b/nezha-fronted/src/components/common/leftMenu.vue
@@ -9,7 +9,7 @@
       <div class="sidebar-info" style="height: 90%">
         <el-scrollbar style="height: 100%;">
           <template v-if="parentMenu == 'projects'">
-            <el-collapse v-model="currentProject.id + ''" class="left-menu-bg" accordion style="padding-top: 0;" ref="projectLeft">
+            <el-collapse class="left-menu-bg" accordion style="padding-top: 0;" ref="projectLeft">
               <el-collapse-item v-for="(item, index) in projectList" :key="item.id" :name="item.id + ''">
                 <template slot="title">
                   <div class="sidebar-info-item-project sidebar-info-item" :class="{'sidebar-info-item-active': item.id == currentProject.id}" @click="detailProject(item)" :id="'project-module-'+item.id">
diff --git a/nezha-fronted/src/components/common/rightBox/assetBox.vue b/nezha-fronted/src/components/common/rightBox/assetBox.vue
index 253dde31d..a678ff92f 100644
--- a/nezha-fronted/src/components/common/rightBox/assetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/assetBox.vue
@@ -375,6 +375,7 @@
         });
       },
       addTag() {
+        !this.editAsset.tags && (this.$set(this.editAsset, "tags", []));
         this.editAsset.tags.push({tag: "", value: ""});
         this.$nextTick(() => {
           this.$refs.tagEditBoxScrollbar.update();
diff --git a/nezha-fronted/src/components/common/rightBox/moduleBox.vue b/nezha-fronted/src/components/common/rightBox/moduleBox.vue
index daffccd6e..ea7a7985d 100644
--- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue
@@ -637,6 +637,9 @@
           } else if (!n.id && n.type && n.type.toLowerCase() == 'http') {
             n.port = 9100;
           }
+          if (!n.type) {
+            n.type = 'http';
+          }
         }
       },
     }
diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue
index 3788694ad..6eaa44596 100644
--- a/nezha-fronted/src/components/page/dashboard/chartBox.vue
+++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue
@@ -311,7 +311,6 @@
         //productId: 0,//不需要这个参数，可以删除
         panelId: 0,
         panelName: '',
-        panelName2: '',
         selectFirstPanel: false,
         metricList: [], // metric列表
         metricCascaderList:[],//metric级联列表
@@ -333,8 +332,6 @@
       'promql-input': promqlInput,
     },
     mounted() {
-      this.isUrl = false;
-      this.isSingleStat = false;
       this.$nextTick(() => {
         this.initElements();
       });
@@ -451,7 +448,6 @@
             if (response.code === 200) {
               if(this.$refs.chartForm){
                 this.$refs.chartForm.resetFields();//清空表单
-                this.panelName2 = '';
               }
               this.$message({duration: 1000, type: 'success', message: this.$t("tip.deleteSuccess")});
               this.esc(true);
@@ -618,7 +614,6 @@
             this.esc();
             this.$message({duration: 1000, type: 'success', message: this.$t("tip.saveSuccess")});
             this.$refs.chartForm.resetFields();//清空表单
-            this.panelName2 = '';
             this.$emit('on-create-success', 'update', response2.data, params);
           } else {
             if(response2.msg){
@@ -871,7 +866,7 @@
       setIsUrl(){
         this.isUrl = true;
         this.isSingleStat = false;
-        this.isAlert=false;
+        this.isAlert = false;
       },
       setIsSingleStat(){
         this.isUrl = false;
@@ -892,13 +887,11 @@
       editData(data, panelId) {
         if (!panelId) {
           this.panelId = 0;
-          this.panelName2 = "";
         } else {
           this.panelId = panelId;
           let temp = this.panelData.filter((item) => {
             return item.id == panelId;
           });
-          this.panelName2 = temp[0].name;
         }
         this.isedit = true;
         this.editInfo = data;
@@ -1088,27 +1081,7 @@
                   legend: this.legends[index],
                 });
               });
-              console.info(elements)
-              /*this.elementTarget.forEach((elem,index) => {
-                if(elem.type==='normal'){
-                  const metricStr = bus.tagsToString(elem.metric,elem.selectedTagList);
-                  elements.push({
-                    //id:index+1,
-                    //metric: elem.metric,//指标名称
-                    expression: metricStr,//指标对应Label及Value组成的表达式字符串
-                    type:elem.type,//指标类型
-                    legend:elem.legend,//配置的legend
-                  });
-                }else if(elem.type==='expert'){
-                  elements.push({
-                    //id:index+1,
-                    //metric: elem.metric,//指标名称
-                    expression: elem.expression,//指标对应Label及Value组成的表达式字符串
-                    type:elem.type,//指标类型
-                    legend:elem.legend,//配置的legend
-                  });
-                }
-              });*/
+              //console.info(elements)
               params.elements = elements;
               if (valid) {
                 this.$refs.chartsPreview.show(params);
@@ -1133,18 +1106,9 @@
                 params.id = this.editChart.id;
               }
               this.$refs.chartsPreview.show(params);
-              /*
-                if (this.isedit) {
-                  params.id = this.editChart.id;
-                  this.updateCharts(params);
-                } else {
-                  this.addCharts(params);
-                }
-              */
             }
           });
         }
-        //this.$refs.chartForm.validate();
       },
       //preview--end
       initElements() {
@@ -1175,7 +1139,20 @@
         immediate: true,
         handler(n) {
           this.editChart = JSON.parse(JSON.stringify(n));
+          if (n.type === 'url') {
+            this.setIsUrl();
+          } else if(n.type === 'alertList'){
+            this.setIsAlertList();
+          } else if(n.type === 'singleStat'){
+            this.setIsSingleStat();
+            this.resetElements();
+          } else {
+            this.setIsOtherChart();
+          }
           this.$set(this.editChart, "panelName", this.showPanel.name);
+          if (this.showPanel.id) {
+            this.panelId = this.showPanel.id;
+          }
           if (n.id) {
             this.editData(this.editChart, this.showPanel.id);
           } else {
@@ -1185,11 +1162,12 @@
       },
       editChart: {
         deep: true,
+        immediate: true,
         handler(n) {
           let panel = this.panelData.find(p => {
             return p.name == n.panelName;
           });
-          this.panelId = panel.id;
+          panel && (this.panelId = panel.id);
         }
       }
       /*panelData: {
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index 4f73378d6..c95fe4e29 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -325,7 +325,7 @@
       },
       // 图表创建成功，回调panel页面，进行图表的刷新
       createSuccess(msg, data, params, panel) {
-        this.filter.panelId = this.panel.id;
+        this.filter.panelId = this.showPanel.id;
         this.getData(this.filter);
       },
       // 获取数据,用在子页面
@@ -375,8 +375,7 @@
           }
         });
       },
-      getTableData: function (clearShowPanel) {
-
+      getTableData(clearShowPanel) {
         this.$get('panel?type=dashboard').then(response => {
           if (response.code === 200) {
             this.panelData = response.data.list;
@@ -648,7 +647,7 @@
     created() {
       this.getTableData();
     },
-    mounted: function () {
+    mounted() {
       this.onScroll();
       document.querySelector("#tableList").addEventListener("mouseenter", () => {
         this.tableHover = true;
@@ -657,19 +656,8 @@
         this.tableHover = false;
       });
     },
-    computed: {
-      refreshPanel() {
-        return this.$store.state.panelListReload;
-      },
-    },
     watch: {
-      refreshPanel(n, o) {
-        if (n) {
-          this.getTableData();
-          this.$store.commit('panelListChange', false);
-        }
-      },
-      'filter.searchName':function(n,o){
+      'filter.searchName': function(n,o){
         let temp=this;
         setTimeout(function(){
           temp.search();