From 87ac19ef41a2a9cae6a8683939472f83a71e872d Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Thu, 13 Feb 2020 09:34:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:endpoint=20=E6=9C=80=E6=96=B0=E6=8C=87?=
 =?UTF-8?q?=E6=A0=87=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/page/project/metricSearch.vue  | 13 ++++++-
 .../src/components/page/project/project.vue   | 39 +++++++++++++------
 2 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/nezha-fronted/src/components/page/project/metricSearch.vue b/nezha-fronted/src/components/page/project/metricSearch.vue
index 55c03b290..cb784fe14 100644
--- a/nezha-fronted/src/components/page/project/metricSearch.vue
+++ b/nezha-fronted/src/components/page/project/metricSearch.vue
@@ -33,7 +33,14 @@
           ref="queryExpression"
         >
           <template slot-scope="{ item }">
-            <span>{{ item.key }}<!--:{{item.type}}--></span>
+            <el-popover
+              trigger="hover"
+              placement="left"
+            >
+              <span><span class="tip-line-font">[{{item.type}}]&nbsp;</span>{{ item.key }}</span>
+              <span slot="reference">{{ item.key }}<!--:{{item.type}}--></span>
+            </el-popover>
+
           </template>
         </el-autocomplete>
       </div>
@@ -214,6 +221,7 @@
 </script>
 
 <style scoped lang="scss">
+  @import '../../../assets/stylus/index';
   /*  .search-input-history{
     display: inline-block;
     border:1px solid  #e5e5e5;
@@ -243,6 +251,9 @@
     background: #f0f0f0;
     cursor:pointer;
   }
+  .tip-line-font{
+    color:$header-text-color;
+  }
  .new-search{
    display: flex;
    position: relative;
diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue
index ce38c2e8e..bebf0a7c7 100644
--- a/nezha-fronted/src/components/page/project/project.vue
+++ b/nezha-fronted/src/components/page/project/project.vue
@@ -1109,12 +1109,16 @@
           metric=expression.substr(0,expression.indexOf('{'));
           let labelStr=expression.substr(expression.indexOf('{')+1,expression.indexOf('}')-expression.indexOf('{')-1);
           let labelArr=labelStr.split(',');
-          labels=labelArr.map((item,index)=>{
-            let temp=item.split('=');
-            let label=temp[0]&&temp[0]!=''?temp[0]:null;
-            let value=temp[1]&&temp[1]!=''?temp[1]:null;
-            return label?{label:label,value:value}:null;
-          })
+
+          if(labelArr.length>0){
+            labels=labelArr.map((item,index)=>{
+              let temp=item.split('=');
+              let label=temp[0]&&temp[0]!=''?temp[0]:null;
+              let value=temp[1]&&temp[1]!=''?temp[1]:null;
+              return label?{label:label,value:value}:null;
+            })
+          }
+
         }else{
             metric=expression;
         }
@@ -1125,13 +1129,26 @@
           if(metricName.indexOf(metric)==-1){
             return false;
           }
-          for(let i in labels){
-            let label=labels[i];
-            let value=item.metric[label.label];
-            if(!value || value != label.value){
-              return false;
+
+          if(labels.length>0){
+            for(let i in labels){
+              let label=labels[i];
+              if(label&&label.label){
+                let value=item.metric[label.label];
+                let queryVal=label.value;
+                debugger
+                if(/^'.+'$/.test(queryVal)){
+                  queryVal=queryVal.substr(1,queryVal.length-2);
+                }
+                if(!value || value != queryVal){
+                  return false;
+                }
+              }else{
+                return true;
+              }
             }
           }
+
           return true;
         })
         for(let i in sourceData){