From b8301e57c0f5afd7e59f641021202a8981e24360 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 24 Oct 2022 13:44:32 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=89=B9=E9=87=8F=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/bottomBox/tabs/cabinetTab.vue       | 4 ++--
 nezha-fronted/src/components/common/deleteButton.vue          | 2 +-
 .../src/components/common/table/settings/cabinetTable.vue     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
index eca2d3daa..0403f49ec 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
@@ -58,8 +58,8 @@
                 <delete-button
                   ref="deleteButton"
                   :from="'cabinetTab'"
-                  :single="false"
-                  :forceDeleteShow="false"
+                  :single="true"
+                  :forceDeleteShow="true"
                   :type="'link'"
                   :title="$t('overall.batchDel')"
                   id="asset-model-batch-delete"
diff --git a/nezha-fronted/src/components/common/deleteButton.vue b/nezha-fronted/src/components/common/deleteButton.vue
index 1be890103..30effb9c4 100644
--- a/nezha-fronted/src/components/common/deleteButton.vue
+++ b/nezha-fronted/src/components/common/deleteButton.vue
@@ -52,7 +52,7 @@
                 <i :class="selectIcon(item.type)"/>
                 <span class="text-ellipsis batch-delete-item-text" :title="item.name">{{item.name}}</span>
                 <el-collapse-transition>
-                  <div v-show="item.showChildren && item.relates.length">
+                  <div v-show="item.showChildren && item.relates && item.relates.length">
                     <div v-for="(relate,i) in item.relates" :key = 'i' class="tree-body-item tree-body-children" @click="showChild(relate)" :style="i === item.relates.length-1?'margin-bottom: 0':''">
                       <i class="nz-icon nz-icon-caret-right" :class="relate.showChildren ? 'rotate90': '' " :style="relate.relates && relate.relates.length ? '' : 'opacity: 0'"/>
                       <i :class="selectIcon(relate.type)"/>
diff --git a/nezha-fronted/src/components/common/table/settings/cabinetTable.vue b/nezha-fronted/src/components/common/table/settings/cabinetTable.vue
index 9d99ae906..c3bf74737 100644
--- a/nezha-fronted/src/components/common/table/settings/cabinetTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/cabinetTable.vue
@@ -44,7 +44,7 @@
                   <delete-button
                   ref="deleteButton"
                   :from="'cabinet'"
-                  :forceDeleteShow="false"
+                  :forceDeleteShow="true"
                   id="cabinet-delete"
                   :type="'link'"
                   :title="$t('overall.delete')"