From 6daada63733e8927a115d1cf6787d99f3254a63a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=8A=B2=E6=9D=BE?= <chenjinsong@zdjizhi.com>
Date: Mon, 20 Apr 2020 17:21:52 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E5=A4=8D=E6=9C=89=E4=BA=9B?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=BB=84=E6=9C=89=E7=A9=BA=E7=99=BD=E9=97=B4?=
 =?UTF-8?q?=E9=9A=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/stylus/main.scss     | 15 +++++++--
 .../bottomBox/tabs/endpointQueryTab.vue       |  4 +--
 .../common/rightBox/addEndpointBox.vue        | 32 +++++++++----------
 3 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss
index f01de1dc5..1f17fdc68 100644
--- a/nezha-fronted/src/assets/stylus/main.scss
+++ b/nezha-fronted/src/assets/stylus/main.scss
@@ -258,7 +258,7 @@ li{
 }
 .nz-btn-group {
   border-radius: 4px;
-  display: inline-block;
+  display: flex;
 }
 .nz-btn-group-size-small {
   max-height: 24px;
@@ -314,11 +314,14 @@ li{
   padding: 0 5px;
   font-size: 12px;
 }
+.input-x-mini-22 .el-input__icon {
+  line-height: 22px;
+}
 .input-x-mini-24 .el-input__inner {
   height: 24px;
   line-height: 24px;
   padding: 0 10px;
-  font-size: 13px;
+  font-size: 12px;
 }
 .input-x-mini-24 .el-input__icon {
   line-height: 24px;
@@ -1642,7 +1645,13 @@ li{
 .el-table__fixed-body-wrapper {
   height: calc(100% - 42px) !important;
 }
-
+.ant-table-scroll {
+  max-height: unset !important;
+  height: 100%;
+}
+.ant-table-scroll .el-table {
+  height: 100% !important;
+}
 /*model侧滑中下拉框*/
 .autocomplete-dropdown {
   display: flex;
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
index df3c9ce68..7036001a5 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
@@ -49,7 +49,7 @@
       </div>
     </div>
     <div class="table-header-inner" @click="clearSelectedMetrics"><span><i style="font-size: 12px;margin-left: 2px;" class="nz-icon nz-icon-close " :class="{'control-icon-unchecked':selectedEndpoints.length<1,'control-icon-checked':selectedEndpoints.length>0}"></i></span></div>
-    <pl-table :row-height="28" use-virtual :datas="tableData" border :empty-text="$t('config.mib.noData')" :header-cell-class-name="cellClass" :height="$tableHeight.noPagination"
+    <pl-table :row-height="28" use-virtual :datas="tableData" border :empty-text="$t('config.mib.noData')" :header-cell-class-name="cellClass" :style="{height: $tableHeight.noPagination}"
               class="nz-table endpoint-query-table" style="width: 100%;" v-loading="loading" v-scrollBar:el-table="'large'" :pagination-show="false" ref="endpointQueryTable"
               @selection-change="selectChange">
       <pl-table-column
@@ -75,7 +75,7 @@
             <span slot="reference"><i class="nz-icon nz-icon-info-normal metric-tip-icon"></i></span>
           </el-popover>
           <span v-html="hideSameLabels?scope.row.colorSimpleElement: scope.row.colorElement"></span>
-          &lt;!&ndash;            <span>{{hideSameLabels?scope.row.simpleElement: scope.row.element}}</span>&ndash;&gt;
+          <span>{{hideSameLabels?scope.row.simpleElement: scope.row.element}}</span>
         </template>
       </pl-table-column>
       <pl-table-column
diff --git a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
index 2e3425f86..065b0e6b7 100644
--- a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
@@ -32,22 +32,21 @@
               <div class="right-child-box-title">{{$t('asset.asset')}}</div>
               <!--end--标题-->
               <!--begin--搜索框-->
-              <div class="nz-btn-group nz-btn-group-size-small nz-btn-group-light endpoint-asset-search">
-                <button id="search-asset-drop" type="button" class="nz-btn nz-btn-size-small nz-btn-style-light nz-btn-style-square nz-input-group-prepend" @click="assetSearch.dropdownShow = !assetSearch.dropdownShow">
-                  <span class="endpoint-asset-label-txt">{{assetSearch.label}}</span>
-                  <span>
-                    <i v-if="assetSearch.dropdownShow" class="el-icon-caret-top"></i>
-                    <i v-if="!assetSearch.dropdownShow" class="el-icon-caret-bottom"></i>
-                  </span>
-                </button><div
-                class="endpoint-asset-search-input">
-                  <el-input class="input-x-mini-22 nz-input-group-middle" placeholder="" v-model="assetSearch.text"></el-input>
-                </div><button
-                type="button" class="nz-btn nz-btn-size-small nz-btn-style-light nz-btn-style-square nz-input-group-append" id="search-asset"><i @click="searchAsset" class="el-icon-search"></i></button>
+              <div style="display: inline-block">
+                <div class="nz-btn-group nz-btn-group-size-small nz-btn-group-light endpoint-asset-search">
+                  <button id="search-asset-drop" type="button" class="nz-btn nz-btn-size-small nz-btn-style-light nz-btn-style-square nz-input-group-prepend" @click="assetSearch.dropdownShow = !assetSearch.dropdownShow">
+                    <span class="endpoint-asset-label-txt">{{assetSearch.label}}</span>
+                    <span>
+                      <i v-if="assetSearch.dropdownShow" class="el-icon-caret-top"></i>
+                      <i v-if="!assetSearch.dropdownShow" class="el-icon-caret-bottom"></i>
+                    </span>
+                  </button><el-input style="width: 100px;" class="input-x-mini-24 nz-input-group-middle" placeholder="" v-model="assetSearch.text"></el-input><button
+                  type="button" class="nz-btn nz-btn-size-small nz-btn-style-light nz-btn-style-square nz-input-group-append" id="search-asset"><i @click="searchAsset" class="el-icon-search"></i></button>
 
-                <div class="endpoint-asset-search-dropdown" v-if="assetSearch.dropdownShow">
-                  <div @click="dropdownSelect('IP')" class="endpoint-asset-search-dropdown-item" id="search-asset-ip">IP</div>
-                  <div @click="dropdownSelect('SN')" class="endpoint-asset-search-dropdown-item" id="search-asset-sn">SN</div>
+                  <div class="endpoint-asset-search-dropdown" v-if="assetSearch.dropdownShow">
+                    <div @click="dropdownSelect('IP')" class="endpoint-asset-search-dropdown-item" id="search-asset-ip">IP</div>
+                    <div @click="dropdownSelect('SN')" class="endpoint-asset-search-dropdown-item" id="search-asset-sn">SN</div>
+                  </div>
                 </div>
               </div>
               <!--end--搜索框-->
@@ -824,12 +823,11 @@
   }
   /* begin--搜索框*/
   .endpoint-asset-search {
-    display: inline-block;
     position: relative;
     margin-left: 44px;
   }
   .endpoint-asset-search button {
-    height: 22px !important;
+    height: 24px !important;
   }
   .endpoint-asset-search-dropdown {
     position: absolute;