From 67504de85339f4c22564868fda590d9ba75f5e79 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Fri, 3 Jul 2020 19:23:58 +0800
Subject: [PATCH 1/6] =?UTF-8?q?NEZ-343=20perf:=20expr=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=A1=86=E8=87=AA=E5=8A=A8=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../page/dashboard/explore/editor.vue         | 24 ++++++++++++-------
 .../page/dashboard/explore/explore.vue        |  2 +-
 .../page/dashboard/explore/promqlInput.vue    | 13 +++++-----
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/nezha-fronted/src/components/page/dashboard/explore/editor.vue b/nezha-fronted/src/components/page/dashboard/explore/editor.vue
index 43fd31d99..5f7ba0549 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/editor.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/editor.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="metric-editor" v-clickoutside="clickout" :class="{'metric-editor-rb': styleType == 2}">
-    <div :id="id" class="editor-core" ref="editor" ></div>
+    <div :id="id" class="editor-core" ref="editor" :style="{height: styleType == 2 ? 'auto' : ''}"></div>
     <span class="nz-input-append editor-clear" style="display: none" @click="clearContent"><i class="el-icon-circle-close"></i></span>
     <div class="metric-editor-popper" :style="{left:popperPos.left+'px'}">
       <div class="metric-popper-main" v-show="showType&&Object.keys(showSuggestions).length>0">
@@ -71,6 +71,9 @@
       this.queryMetrics();
     },
     methods:{
+      test() {
+        console.info(1)
+      },
       userChange:function(char,operation,newContent,oldContent){
         this.changeSuggestions('type')
         this.dealSpecilChar(char,operation);
@@ -792,7 +795,10 @@
           $temp.getPosition();
           $temp.formatContent();
         }
-      })
+        //监听文本区域的高度
+        let lineHeight = 16;
+
+      });
       this.registerKeydown();
     },
     watch:{
@@ -904,18 +910,20 @@
     overflow: hidden;
   }
   .metric-editor.metric-editor-rb {
+    min-height: 32px;
+    border-radius: 4px;
+    height: auto;
+    border: 1px solid #DCDFE6;
+    box-sizing: border-box;
     .editor-clear {
       padding-top: 4px;
     }
-    height: 32px;
     .ql-container.ql-snow {
-      border-radius: 4px;
-      border: 1px solid #DCDFE6;
-      box-sizing: border-box;
+      border: none;
       .ql-editor {
-        padding: 6px 0 !important;
+        padding: 5px 0 !important;
         >p {
-          padding-left: 15px;
+          padding: 0 26px 0 15px;
           font-size: 12px;
           color: rgb(96, 98, 102);
         }
diff --git a/nezha-fronted/src/components/page/dashboard/explore/explore.vue b/nezha-fronted/src/components/page/dashboard/explore/explore.vue
index 67ca20388..ec51e3a30 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/explore.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/explore.vue
@@ -377,7 +377,7 @@ instance_cpu_time_ns{app="fox", proc="widget", rev="4d3a513", env="prod", job="c
                 if (res.length > 0) {
                   this.tableData = [];
                   this.tableLabels = [];
-                  console.log(111111111111111111111,res)
+                  //console.log(111111111111111111111,res)
                   res.forEach((response, index) => {
                     if (response.data&&response.status == 'success') {
                       let data = response.data.result;
diff --git a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
index 194dce8f0..e9fc679b6 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
@@ -1,17 +1,17 @@
 <template>
-    <div class="promqlInput" :style="{height:(errorMsg || appendMsg)?'50px':'36px'}">
+    <div class="promqlInput" :style="{height:(errorMsg || appendMsg)?'50px':'auto'}">
       <div class="query-row">
         <div class="query-input">
           <!--explore页面的样式-->
           <template v-if="styleType == 1">
-            <div class="metric-btn" v-if="plugins.indexOf('metric') > -1">
-              <el-dropdown class="metric-selector" >
+            <div class="metric-btn" v-if="plugins.indexOf('metric-selector') > -1">
+              <el-dropdown class="metric-selector">
                 <el-dropdown-menu style="display: none"></el-dropdown-menu>
                 <el-button class="metric-btn nz-btn nz-btn-size-normal nz-btn-style-light" @click="toggleDropdown">Metric &nbsp;<i class="el-icon-arrow-down"></i></el-button>
                 <el-cascader-panel v-show="dropDownVisible" v-model="cascaderValue"  slot="dropdown" ref="metricSelector" :props="{emitPath:false}" :options="metricOptions"  @change="metricChange"></el-cascader-panel>
               </el-dropdown>
             </div>
-            <div class="input-box" @click="dropDownVisible=false">
+            <div class="input-box" @click="dropDownVisible=false" v-if="plugins.indexOf('metric-input') > -1">
               <!--            <el-autocomplete :placeholder="$t('dashboard.metricPreview.inputTip')" :fetch-suggestions="filterInput" clearable @clear="clearExpression" :trigger-on-focus="false" v-model="expressionList[index]" @blur="expressionChange" style="width: 100%;height:36px"></el-autocomplete>-->
               <editor :styleType="styleType" :metric-list="metricStore" v-model="expressionList[index]" ref="editor" @on-enter="expressionChange" @on-blur="expressionChange" ></editor>
               <div class="append-msg error" v-if="errorMsg"><span>{{errorMsg}}</span></div>
@@ -29,7 +29,7 @@
                 </el-dropdown>
                 <label style="line-height: 30px;" v-else>{{$t("alert.config.expr")}}</label>
               </el-col>
-              <el-col style="width: calc(100% - 120px);">
+              <el-col style="width: calc(100% - 120px); height: 100%;">
                 <div class="input-box" @click="dropDownVisible=false" v-if="plugins.indexOf('metric-input') > -1">
                   <editor :styleType="styleType" :metric-list="metricStore" v-model="expressionList[index]" ref="editor" @on-enter="expressionChange" @on-blur="expressionChange" ></editor>
                   <div class="append-msg error" v-if="errorMsg"><span>{{errorMsg}}</span></div>
@@ -183,7 +183,7 @@
     height: 36px;
     width: 100%;
     display: flex;
-    margin-bottom: 10px;
+    margin-bottom: 18px;
   }
   .promqlInput .query-row{
     width: 100%;
@@ -223,6 +223,7 @@
   }
   .query-input .input-box{
     width: 100%;
+    height: 100%;
   }
   .metric-btn{
     height: 36px !important;

From 75d1bbdf5283a53d19f1c43c4d52e8c707e68b14 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Mon, 6 Jul 2020 10:47:36 +0800
Subject: [PATCH 2/6] =?UTF-8?q?feat:=E9=81=97=E6=BC=8F=E4=B8=AD=E6=96=87?=
 =?UTF-8?q?=E7=BF=BB=E8=AF=91=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/language/cn.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index df2641d6a..90e7a57f8 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -792,6 +792,13 @@ const cn = {
     }
   },
   project: {
+    chart: {
+      basicTitle: "基础信息",
+      alertStat: "告警状态",
+      endpointStat: "Endpoint状态",
+      projectInfo: "业务系统信息",
+      endpointInfo: "Endpoint信息"
+    },
     project: {
       project: "系统",
       projectName: "系统名称",

From c8beabe69a9a68b8facf18f26f6aa337559cf1c9 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Mon, 6 Jul 2020 10:54:32 +0800
Subject: [PATCH 3/6] =?UTF-8?q?feat:=E9=81=97=E6=BC=8F=E4=B8=AD=E6=96=87?=
 =?UTF-8?q?=E7=BF=BB=E8=AF=91=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/language/cn.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index 90e7a57f8..675a59334 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -19,6 +19,7 @@ const cn = {
     search: "搜索",
     add: "新增",
     option: "操作",
+    remark: "描述",
     clearAll: "清空",
     clear: "清除",
     name: "名称",

From 0d0878d44676d5170e01811617a57fffa07af030 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Mon, 6 Jul 2020 11:52:17 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix:=E4=B8=AD=E6=96=87=E7=BF=BB=E8=AF=91?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/language/cn.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index 675a59334..d11c1b485 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -35,7 +35,7 @@ const cn = {
     unavailable: "不可用",
     available: "可用",
     createChart: "新增图表",
-    createProject: "新增项目",
+    createProject: "新增业务系统",
     createAsset: "新增资产",
     createAlertRule: "新增告警规则",
     createAccount: "新增用户名",
@@ -263,7 +263,7 @@ const cn = {
         }
       },
       project: {
-        project: "项目",
+        project: "业务系统",
         name: "名称",
         module: "组件",
         endpoint: "Endpoint"

From 150f27894071dc8d09b10da6f3a0bc2ad6e6200e Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Mon, 6 Jul 2020 15:16:27 +0800
Subject: [PATCH 5/6] =?UTF-8?q?feat=EF=BC=9A=E4=B8=AD=E6=96=87=E7=BF=BB?=
 =?UTF-8?q?=E8=AF=91=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/language/cn.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index d11c1b485..166d0fc92 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -139,6 +139,9 @@ const cn = {
           },
           singleStat:{
             label:"SingleStat"
+          },
+          alertList:{
+            label:"告警列表"
           }
         },
         statisticsVal:{

From e9e1042c9a14d1aa89a840a0478430588d666ca9 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Mon, 6 Jul 2020 15:20:00 +0800
Subject: [PATCH 6/6] =?UTF-8?q?feat=EF=BC=9A=E4=B8=AD=E6=96=87=E7=BF=BB?=
 =?UTF-8?q?=E8=AF=91=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/language/cn.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index 166d0fc92..40b964218 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -163,6 +163,7 @@ const cn = {
         legendTip: "使用名称或表达式控制时间序列的名称。例如{{hostname}将替换为标签主机名的标签值。",
         option: "操作",
         alertParam:{
+          param:'参数',
           select:'选择',
           alertRule:'告警规则',
           level:'级别',