From 4e15b9892b20a8dc0853065143cc202818b971b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=8A=B2=E6=9D=BE?= <523037378@qq.com>
Date: Mon, 2 Mar 2020 18:46:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dasset=E4=BE=A7?=
 =?UTF-8?q?=E6=BB=91=E9=87=8C=E4=B8=8B=E6=8B=89=E6=A1=86=E7=9A=84=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E3=80=81=E7=82=B9=E5=87=BB=E4=BA=8B=E4=BB=B6=E9=97=AE?=
 =?UTF-8?q?=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     |  6 ++-
 .../components/common/rightBox/assetBox.vue   | 48 +++++++++----------
 nezha-fronted/src/main.js                     |  2 +-
 3 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss
index b939763bc..3b181c593 100644
--- a/nezha-fronted/src/assets/stylus/main.scss
+++ b/nezha-fronted/src/assets/stylus/main.scss
@@ -12,6 +12,8 @@ li{
 }
 .content-box {
   height: 100%;
+  min-width: 1430px;
+  overflow-x: scroll;
 }
 
 .nz-icon-gear:before {
@@ -418,6 +420,8 @@ li{
   margin-left: 201px;
   padding: 0 15px;
   background-color: $content-right-background-color;
+  min-width: 1200px;
+  overflow-x: scroll;
 }
 .content-right-option {
   cursor: pointer;
@@ -989,7 +993,7 @@ li{
   width: 490px;
 }
 .asset-dropdown {
-  width: 400px;
+  width: 370px;
 }
 .asset-dropdown .el-select-dropdown__item {
   position: relative;
diff --git a/nezha-fronted/src/components/common/rightBox/assetBox.vue b/nezha-fronted/src/components/common/rightBox/assetBox.vue
index e39a8e391..aa8952d26 100644
--- a/nezha-fronted/src/components/common/rightBox/assetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/assetBox.vue
@@ -35,7 +35,7 @@
           </el-form-item>
           <el-form-item :label="this.$t('asset.createAssetTab.state')">
             <div v-if="!tabView" class="select-style">
-              <el-select size="small" v-model="assetData.state" placeholder="">
+              <el-select size="small" v-model="assetData.state" placeholder="" popper-class="asset-dropdown" >
                 <el-option
                   :id="'asset-edit-state-op-'+item.value"
                   v-for="item in assetStateOption"
@@ -74,15 +74,15 @@
                 :value="item.code"
                 :label="item.value"
               >
-                <span class="config-dropdown-label-txt" v-if="!item.isEdit">{{ item.value }}</span>
-                <span class="config-dropdown-label-input" v-if="item.isEdit" @click.stop="editing(item)">
+                <span class="asset-dropdown-label-txt" v-if="!item.isEdit">{{ item.value }}</span>
+                <span class="asset-dropdown-label-input" v-if="item.isEdit" @click.stop="editing(item)">
                   <el-input type="text" v-model="item.value" size="small"/>
                 </span>
-                <div class="config-dropdown-label-icons">
-                  <span class="config-dropdown-btn config-dropdown-btn-delete" @click.stop="delOptionData(item)" :id="'asset-edit-type-op-del-'+item.id">
+                <div class="asset-dropdown-label-icons">
+                  <span class="asset-dropdown-btn asset-dropdown-btn-delete" @click.stop="delOptionData(item)" :id="'asset-edit-type-op-del-'+item.id">
                     <i class="el-icon-delete"></i>
                   </span>
-                  <span class="config-dropdown-btn" @click.stop="editOptionData(item,'type')" :id="'asset-edit-type-op-edit-'+item.id">
+                  <span class="asset-dropdown-btn" @click.stop="editOptionData(item,'type')" :id="'asset-edit-type-op-edit-'+item.id">
                     <i class="nz-icon nz-icon-edit" v-if="!item.isEdit"></i>
                     <i class="el-icon-check" v-if="item.isEdit"
                        @click="editData('sys/dict/update',item)"></i>
@@ -131,17 +131,17 @@
                                 :key="index">
                               <div class="pop-item-contain">
                                 <span v-if="!item.isEdit">{{ item.value }}</span>
-                                <span class="config-dropdown-label-input" v-if="item.isEdit" @click.stop="editing">
+                                <span class="asset-dropdown-label-input" v-if="item.isEdit" @click.stop="editing">
                                   <el-input class="input-x-mini-24" v-model="item.value"/>
                                 </span>
                                 <div class="pop-item-icons">
-                                  <span class="config-dropdown-btn config-dropdown-btn-delete" :id="'asset-edit-sub-type-op-del-'+index"
+                                  <span class="asset-dropdown-btn asset-dropdown-btn-delete" :id="'asset-edit-sub-type-op-del-'+index"
                                     @click.stop="deleteData('/sys/dict/delete',item.id)"><i class="el-icon-delete"></i>
                                   </span>
-                                  <span v-if="!item.isEdit" class="config-dropdown-btn" @click.stop="editOptionData(item,'type',index)" :id="'asset-edit-sub-type-op-edit-'+index">
+                                  <span v-if="!item.isEdit" class="asset-dropdown-btn" @click.stop="editOptionData(item,'type',index)" :id="'asset-edit-sub-type-op-edit-'+index">
                                     <i class="nz-icon nz-icon-edit"></i>
                                   </span>
-                                  <span v-if="item.isEdit"  class="config-dropdown-btn" @click.stop="editData('sys/dict/update',item, 'assetType')" :id="'asset-edit-sub-type-op-save-'+index">
+                                  <span v-if="item.isEdit"  class="asset-dropdown-btn" @click.stop="editData('sys/dict/update',item, 'assetType')" :id="'asset-edit-sub-type-op-save-'+index">
                                     <i class="el-icon-check"></i>
                                   </span>
                                 </div>
@@ -215,14 +215,14 @@
                                   :key="index">
                                 <div class="pop-item-contain">
                                   <span v-if="!item.isEdit">{{ item.value }}</span>
-                                  <span class="config-dropdown-label-input" v-if="item.isEdit" @click.stop="editing">
+                                  <span class="asset-dropdown-label-input" v-if="item.isEdit" @click.stop="editing">
                                     <el-input class="input-x-mini-24" v-model="item.value"/>
                                   </span>
                                   <div class="pop-item-icons">
-                                    <span class="config-dropdown-btn config-dropdown-btn-delete" @click.stop="deleteData('/sys/dict/delete',item.id)" :id="'asset-edit-sub-vendor-op-del-'+index">
+                                    <span class="asset-dropdown-btn asset-dropdown-btn-delete" @click.stop="deleteData('/sys/dict/delete',item.id)" :id="'asset-edit-sub-vendor-op-del-'+index">
                                       <i class="el-icon-delete"></i>
                                     </span>
-                                    <span class="config-dropdown-btn" @click.stop="editVendorOptionData(item,'vendor',index)" :id="'asset-edit-sub-vendor-op-edit-'+index">
+                                    <span class="asset-dropdown-btn" @click.stop="editVendorOptionData(item,'vendor',index)" :id="'asset-edit-sub-vendor-op-edit-'+index">
                                       <i class="nz-icon nz-icon-edit" v-if="!item.isEdit"></i>
                                       <i class="el-icon-check" v-if="item.isEdit" @click="editData('sys/dict/update',item)" :id="'asset-edit-sub-vendor-op-save-'+index"></i>
                                     </span>
@@ -255,15 +255,15 @@
                                   :key="index">
                                 <div class="pop-item-contain">
                                   <span v-if="!item.isEdit">{{ item.name }}</span>
-                                  <span class="config-dropdown-label-input" v-if="item.isEdit" @click.stop="editing">
+                                  <span class="asset-dropdown-label-input" v-if="item.isEdit" @click.stop="editing">
                                     <el-input class="input-x-mini-24" v-model="item.name"/>
                                   </span>
                                   <div class="pop-item-icons">
-                                    <span class="config-dropdown-btn config-dropdown-btn-delete"
+                                    <span class="asset-dropdown-btn asset-dropdown-btn-delete"
                                           @click.stop="deleteData('model',item.id)" :id="'asset-edit-sub-model-op-del-'+index">
                                       <i class="el-icon-delete"></i>
                                     </span>
-                                    <span class="config-dropdown-btn" @click.stop="editOptionData(item,'model',index)" :id="'asset-edit-sub-model-op-edit-'+index">
+                                    <span class="asset-dropdown-btn" @click.stop="editOptionData(item,'model',index)" :id="'asset-edit-sub-model-op-edit-'+index">
                                       <i class="nz-icon nz-icon-edit" v-if="!item.isEdit"></i>
                                       <i class="el-icon-check" v-if="item.isEdit"
                                            @click="editData('model',item)" :id="'asset-edit-sub-model-op-save-'+index"></i>
@@ -310,12 +310,12 @@
                   :label="item.name"
                   :value="item.id"
                 >
-                  <span class="config-dropdown-label-txt">{{ item.name }}</span>
-<!--                  <div class="config-dropdown-label-icons">-->
-<!--                    <span class="config-dropdown-btn config-dropdown-btn-delete"-->
+                  <span class="asset-dropdown-label-txt">{{ item.name }}</span>
+<!--                  <div class="asset-dropdown-label-icons">-->
+<!--                    <span class="asset-dropdown-btn asset-dropdown-btn-delete"-->
 <!--                          @click.stop="deleteData('idc',item.id)" :id="'asset-edit-idc-op-del-'+item.id"><i-->
 <!--                      class="el-icon-delete"></i></span>-->
-<!--                    <idc-config-box :post-idc="popIdcData" placement="left" @after="getIDCOptionData" :button-class="'config-dropdown-btn'">-->
+<!--                    <idc-config-box :post-idc="popIdcData" placement="left" @after="getIDCOptionData" :button-class="'asset-dropdown-btn'">-->
 <!--                      <template v-slot:optionZone>-->
 <!--                        <i class="nz-icon nz-icon-edit" @click="getSingleIDCData(item.id,'edit', item)"></i>-->
 <!--                      </template>-->
@@ -355,13 +355,13 @@
                   :label="item.name"
                   :value="item.id"
                 >
-                  <span class="config-dropdown-label-txt">{{ item.name }}</span>
-<!--                  <div class="config-dropdown-label-icons">-->
-<!--                    <span class="config-dropdown-btn config-dropdown-btn-delete"-->
+                  <span class="asset-dropdown-label-txt">{{ item.name }}</span>
+<!--                  <div class="asset-dropdown-label-icons">-->
+<!--                    <span class="asset-dropdown-btn asset-dropdown-btn-delete"-->
 <!--                          @click.stop="deleteData('cabinet',item.id)" :id="'asset-edit-cabinet-op-del-'+item.id">-->
 <!--                      <i class="el-icon-delete"></i>-->
 <!--                    </span>-->
-<!--                    <cabinet-config-box placement="left" :post-cabinet="item" button-class="config-dropdown-btn" @after="getCabinetOptionData">-->
+<!--                    <cabinet-config-box placement="left" :post-cabinet="item" button-class="asset-dropdown-btn" @after="getCabinetOptionData">-->
 <!--                      <i slot="optionZone" class="nz-icon nz-icon-edit"></i>-->
 <!--                    </cabinet-config-box>-->
 <!--                  </div>-->
diff --git a/nezha-fronted/src/main.js b/nezha-fronted/src/main.js
index e6df1c1ed..11e404459 100644
--- a/nezha-fronted/src/main.js
+++ b/nezha-fronted/src/main.js
@@ -125,7 +125,7 @@ Vue.directive("scrollBar", {
   },
 });
 
-const exceptClassName = ["config-dropdown", "nz-pop", "el-picker", "chart-box-dropdown", 'metric-dropdown', 'el-cascader__dropdown']; //clickoutside排除的class(白名单)
+const exceptClassName = ["config-dropdown", "nz-pop", "el-picker", "chart-box-dropdown", 'metric-dropdown', 'el-cascader__dropdown', "asset-dropdown"]; //clickoutside排除的class(白名单)
 const clickoutside = {
   // 初始化指令
   bind(el, binding, vnode) {