From 9574f189a32a6b59fd7c75142971a3ca490c8ca5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=8A=B2=E6=9D=BE?= <523037378@qq.com>
Date: Thu, 20 Feb 2020 11:38:23 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96endpoint=E4=BE=A7?=
 =?UTF-8?q?=E6=BB=91=E5=86=85asset=E5=88=97=E8=A1=A8=E3=80=81asset?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=BC=B9=E6=A1=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.asset搜索框样式优化
2.asset列表内asset不可选状态的样式优化
---
 nezha-fronted/src/assets/stylus/main.scss     |  7 ++++---
 .../src/components/common/header.vue          |  2 ++
 .../common/rightBox/addEndpointBox.vue        | 19 +++++++++++++------
 .../common/rightBox/editEndpointBox.vue       |  7 ++++---
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss
index d92c33097..42760c024 100644
--- a/nezha-fronted/src/assets/stylus/main.scss
+++ b/nezha-fronted/src/assets/stylus/main.scss
@@ -161,8 +161,8 @@ li{
 }
 .nz-btn.nz-btn-size-normal:not(.nz-btn-size-alien) {
   font-size: 12px;
-  padding: 4px 8px;
-  max-height: 24px;
+  height: 24px;
+  padding: 0 8px;
 }
 .nz-btn.nz-btn-size-small {
   font-size: 12px;
@@ -172,7 +172,8 @@ li{
   font-size: 12px;
 }
 .nz-btn-size-large {
-  padding: 6px 15px;
+  padding: 0 15px;
+  height: 28px;
 }
 .nz-btn.nz-btn-size-normal.nz-btn-size-alien { //弹框顶部异形按钮
   height: 40px;
diff --git a/nezha-fronted/src/components/common/header.vue b/nezha-fronted/src/components/common/header.vue
index 09fd3354b..6eb14993e 100644
--- a/nezha-fronted/src/components/common/header.vue
+++ b/nezha-fronted/src/components/common/header.vue
@@ -116,6 +116,8 @@
     <module-box :currentProject="currentProject" :module="editModule" @reload="" ref="moduleBox"></module-box>
     <!--<asset-box :currentProject="currentProject" :currentModule="currentModule" @reload=""
                       ref="addEndpointBox"></asset-box>-->
+    <add-endpoint-box :currentProject="currentProject" :currentModule="currentModule" @reload=""
+                      ref="addEndpointBox"></add-endpoint-box>
     <asset-add-unit :add-unit-show='addUnitShow' @refreshData="refreshAsset" ref="assetAddUnit"
                     @sendStateData="closeAsset"></asset-add-unit>
     <alert-config-box :parentAlertRule="alertRule" @reload="" ref="alertConfigBox"></alert-config-box>
diff --git a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
index 233204b09..0d51998df 100644
--- a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
@@ -32,7 +32,7 @@
               <div class="right-child-box-title">{{$t('asset.asset')}}</div>
               <!--end--标题-->
               <!--begin--搜索框-->
-              <div class="endpoint-asset-search">
+              <div class="nz-btn-group nz-btn-group-size-normal 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>
@@ -60,8 +60,8 @@
                 </div>
                 <div class="line-100"></div>
                 <div class="endpoint-sub-table-body">
-                  <div v-if="!currentModuleCopy.id" class="endpoint-sub-table-body-dialog"></div>
                   <div @click="selectAsset(item, index)" :data="item.id" v-for="item,index in assetList" class="endpoint-sub-table-row" :id="'select-asset-'+item.id">
+                    <div :id="index" @click.stop v-if="!currentModuleCopy.id" class="endpoint-sub-table-body-dialog"></div>
                     <div class="endpoint-sub-table-col">{{item.host}}</div>
                     <el-popover trigger="hover" placement="right-start" :content="item.sn" >
                       <div slot="reference" class="endpoint-sub-table-col">{{item.sn}}</div>
@@ -783,9 +783,11 @@
   /* begin--搜索框*/
   .endpoint-asset-search {
     display: inline-block;
-    float: right;
-    padding: 7px 8px 0 0;
     position: relative;
+    margin-left: 50px;
+  }
+  .endpoint-asset-search button {
+    height: 22px !important;
   }
   .endpoint-asset-search-dropdown {
     position: absolute;
@@ -822,6 +824,7 @@
     display: inline-block;
     width: 100px;
     vertical-align: top;
+    border-right: 1px solid rgba(162,162,162,0.5);
   }
   /* end--搜索框*/
 
@@ -841,6 +844,7 @@
     line-height: 28px;
     height: 30px;
     color: #656565;
+    position: relative;
   }
   .endpoint-sub-table-row:hover {
     background-color: #dadada;
@@ -876,9 +880,8 @@
   .endpoint-sub-table-body-dialog {
     width: 100%;
     height: 100%;
-    background-color: #e9ebec;
+    background-color: rgba(255, 255, 255, 0.7);
     position: absolute;
-    opacity: 0.2;
   }
   .endpoints-clear-btn {
     margin: 6px 0 0 7px;
@@ -920,4 +923,8 @@
   .endpoints-box-endpoints .el-form-item.is-error {
     margin-bottom: 22px;
   }
+  .endpoint-asset-search input {
+    border-radius: 0 !important;
+    border: 0;
+  }
 </style>
diff --git a/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue b/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue
index fbcce70ec..145e9087d 100644
--- a/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue
@@ -56,7 +56,7 @@
                   <!---->
                   <div class="pop-item-wider " >
                     <!-- begin--搜索框-->
-                    <div class="endpoint-asset-search">
+                    <div class="nz-btn-group nz-btn-group-size-normal nz-btn-group-light endpoint-asset-search">
                       <button 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>
@@ -443,11 +443,12 @@
 /* begin--搜索框*/
 .endpoint-asset-search {
   display: inline-block;
-  float: right;
-  padding: 7px 8px 0 0;
   position: relative;
   margin-top: -16px;
 }
+.endpoint-asset-search button {
+  height: 22px !important;
+}
 .endpoint-asset-search-dropdown {
   position: absolute;
   top: 34px;