From e152ce08ca6c6e95180933c82e612cfb233a6511 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Thu, 2 Sep 2021 18:23:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?NEZ-969=20fix:=20=E4=BF=AE=E5=A4=8Dlocation?=
 =?UTF-8?q?=E4=BC=A0=E5=8F=82=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/rightBox/asset/assetBox.vue | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
index 499213081..2bd65da57 100644
--- a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
@@ -527,15 +527,14 @@ export default {
       this.showAllTalonOption = true
     },
     setLocationData ({ cabinet, dc, u }) {
-      if (cabinet) {
-        this.editAsset.cabinetId = cabinet.id
-      }
-      if (dc) {
-        this.editAsset.dcId = dc.id
-      }
+      this.editAsset.cabinetId = cabinet ? cabinet.id : ''
+      this.editAsset.dcId = dc ? dc.id : ''
       if (u) {
         this.editAsset.cabinetStart = u[0]
         this.editAsset.cabinetEnd = u[1]
+      } else {
+        this.editAsset.cabinetStart = ''
+        this.editAsset.cabinetEnd = ''
       }
     },
     removeLabel (label) {

From cb1c77a0ef1404bb1747e1d86f886625ab800787 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Thu, 2 Sep 2021 21:05:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?NEZ-966=20fix:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=A1=B6=E9=83=A8=E7=AD=9B=E9=80=89=E6=A1=86=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/labelFilter/clickSearch.vue   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/common/labelFilter/clickSearch.vue b/nezha-fronted/src/components/common/labelFilter/clickSearch.vue
index c5ed5d98c..6a662d38f 100644
--- a/nezha-fronted/src/components/common/labelFilter/clickSearch.vue
+++ b/nezha-fronted/src/components/common/labelFilter/clickSearch.vue
@@ -10,6 +10,12 @@
             </template>
           </el-checkbox-group>
         </template>
+        <span v-show="contentWidth < data.width"
+              :style="{top: `${moreBtnTop(data.type)}px`}"
+              class="search-more"
+              @click="changShowMore(type)">
+          More <i :class="data.showMore ? 'arrow-up' : ''" class="el-icon-arrow-down arrow-down"/>
+        </span>
       </el-skeleton>
       <el-skeleton v-else-if="data.type === 'dropdownCheckBox'" :loading="!data.show" :rows="1" class="search-items">
         <template>
@@ -29,8 +35,8 @@
               :style="{top: `${moreBtnTop(data.type)}px`}"
               class="search-more"
               @click="changShowMore(type)">
-        More <i :class="data.showMore ? 'arrow-up' : ''" class="el-icon-arrow-down arrow-down"/>
-      </span>
+          More <i :class="data.showMore ? 'arrow-up' : ''" class="el-icon-arrow-down arrow-down"/>
+        </span>
       </el-skeleton>
     </div>
   </div>
@@ -318,8 +324,7 @@ export default {
     },
     changShowMore (type) {
       this.titleSearchListCopy[type].showMore = !this.titleSearchListCopy[type].showMore
-    },
-
+    }
   },
   destroyed () {
     window.removeEventListener('resize', this.needMore)