Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0

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)

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) {