From 77425043f639415b09b16feedca5d89b1efb7e89 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Thu, 21 May 2020 16:08:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:1.=E4=BF=AE=E5=A4=8Dasset=E6=9C=BA=E6=9F=9C?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=9B=9E=E6=98=BEnull=E7=9A=84bug=202.?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A1=86=E6=B7=BB=E5=8A=A0=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E7=A9=BA=E7=99=BD=E5=A4=84=E5=85=B3=E9=97=AD=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/rightBox/locationCascader.vue    | 3 ++-
 nezha-fronted/src/components/common/searchInput.vue        | 7 ++++++-
 .../src/components/page/dashboard/explore/explore.vue      | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/locationCascader.vue b/nezha-fronted/src/components/common/rightBox/locationCascader.vue
index 079fd3259..00823370e 100644
--- a/nezha-fronted/src/components/common/rightBox/locationCascader.vue
+++ b/nezha-fronted/src/components/common/rightBox/locationCascader.vue
@@ -368,11 +368,12 @@
     },
     computed:{
       inputShowInfo:function(){
+        console.log(this.selectedData)
         let idcName=this.selectedData.idc?this.selectedData.idc.name+'/':'';
 
         let cabinetName=this.selectedData.cabinet?this.selectedData.cabinet.name+'/':'';
 
-        let uValues=this.selectedData.u&&this.selectedData.u.length>0?this.selectedData.u[0]+'-'+this.selectedData.u[1]:'';
+        let uValues=this.selectedData.u&&this.selectedData.u.length>0&&this.selectedData.u[0]&&this.selectedData.u[1]?this.selectedData.u[0]+'-'+this.selectedData.u[1]:'';
 
         if(!this.selectedData.idc){
           return '';
diff --git a/nezha-fronted/src/components/common/searchInput.vue b/nezha-fronted/src/components/common/searchInput.vue
index 8e96fd2cb..acc48b903 100644
--- a/nezha-fronted/src/components/common/searchInput.vue
+++ b/nezha-fronted/src/components/common/searchInput.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="new-search" >
+    <div class="new-search"  v-clickoutside="clickout">
         <div class="search-input-all input-position" @click="stop_click">
 <!--            历史记录-->
             <div class="search-history">
@@ -449,6 +449,9 @@
               clearSearch() {
                 this.select_list = [];
               },
+              clickout(){
+                this.input_list=true;
+              },
               selectObject(column, selectItem, e) {
                 this.stop_click(e);
                 for (let i = 0; i < this.select_list.length; i++) {
@@ -798,6 +801,7 @@
                 }
                 this.input_list = true;
                 this.restructure_historyDate();
+
                 this.$emit("search", objectInfo);
             },
             //清空历史记录
@@ -1077,6 +1081,7 @@
             },
             //点击遮罩层
             zhezhao_click() {
+                console.log(111)
                 if(this.input_sreach!=''){
                   if(!this.searchMsg.zheze_none){
                     if (this.input_sreach!='') {
diff --git a/nezha-fronted/src/components/page/dashboard/explore/explore.vue b/nezha-fronted/src/components/page/dashboard/explore/explore.vue
index ed7ecd0dc..162275f4e 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/explore.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/explore.vue
@@ -314,7 +314,7 @@ instance_cpu_time_ns{app="fox", proc="widget", rev="4d3a513", env="prod", job="c
                       })
                       if(result.metric&&Object.keys(result.metric).length>0){
                         let metric = Object.assign({}, result.metric);
-                        seriesItem.name += metric.__name__ + '{';
+                        seriesItem.name += metric.__name__?metric.__name__:''+ '{';
                         delete metric.__name__;
                         for (let key in metric) {
                           seriesItem.name += key + "=" + '"' + metric[key] + '",';