From 5bff9ff1ffb7d2218c97f208848ceff7b96c9e51 Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Mon, 22 Jan 2024 11:15:58 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-3388=20fix:UI=20=E5=88=97=E8=A1=A8=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E5=88=97=E7=8A=B6=E6=80=81=E6=9C=AA=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/page/alert/alertRule.vue        | 3 ++-
 nezha-fronted/src/components/page/asset/asset.vue            | 5 ++---
 nezha-fronted/src/components/page/config/dc.vue              | 4 ++--
 nezha-fronted/src/components/page/config/terminalLog.vue     | 4 ++--
 nezha-fronted/src/components/page/config/user.vue            | 4 ++--
 .../src/components/page/monitor/endpoint/endpointList.vue    | 4 ++--
 .../src/components/page/monitor/module/moduleList.vue        | 4 ++--
 nezha-fronted/src/components/page/notebook/notebook.vue      | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/nezha-fronted/src/components/page/alert/alertRule.vue b/nezha-fronted/src/components/page/alert/alertRule.vue
index 3862af9e8..0a3ea64e2 100644
--- a/nezha-fronted/src/components/page/alert/alertRule.vue
+++ b/nezha-fronted/src/components/page/alert/alertRule.vue
@@ -2,7 +2,7 @@
   <div>
     <nzDetailView
       v-my-loading="detailViewLoading || tools.loading"
-      v-if="detailType !== 'list'"
+      v-if="detailType !== 'list' "
       :api="url"
       ref="detailList"
       :layout="['searchInput', 'elementSet', 'pagination','detailViewSet']"
@@ -72,6 +72,7 @@
     <nz-data-list
       ref="dataList"
       :api="url"
+      v-if="detailType === 'list' "
       :custom-table-title.sync="tools.customTableTitle"
       :from="fromRoute.alertRule"
       :layout="['searchInput', 'elementSet', 'pagination','detailViewSet']"
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index b8d59862d..d0220e1e5 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -2,7 +2,7 @@
   <div style="height: 100%" id="asset-batch-table" v-my-loading="preferenceLoading">
     <nzDetailView
       v-my-loading="detailViewLoading || tools.loading"
-      v-if="detailType !== 'list'&&!preferenceLoading"
+      v-if="detailType !== 'list' "
       :api="url"
       ref="detailList"
       :layout="dataListLayout"
@@ -73,8 +73,7 @@
       </template>
     </nzDetailView>
     <nz-data-list
-      v-my-loading="detailViewLoading"
-      v-if="detailType === 'list'&&!preferenceLoading"
+      v-if="detailType === 'list' "
       ref="dataList"
       :api="url"
       :custom-table-title.sync="tools.customTableTitle"
diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue
index f925aebe3..c46496c0f 100644
--- a/nezha-fronted/src/components/page/config/dc.vue
+++ b/nezha-fronted/src/components/page/config/dc.vue
@@ -2,7 +2,7 @@
   <div v-my-loading="preferenceLoading">
     <nzDetailView
       v-my-loading="detailViewLoading || tools.loading"
-      v-if="detailType !== 'list'&&!preferenceLoading"
+      v-if="detailType !== 'list' "
       :api="url"
       ref="detailList"
       :layout="['searchInput', 'elementSet', 'pagination','detailViewSet']"
@@ -74,7 +74,7 @@
     <nz-data-list
       ref="dataList"
       :api="url"
-      v-if="detailType === 'list'&&!preferenceLoading"
+      v-if="detailType === 'list' "
       :layout="['searchInput', 'elementSet', 'pagination','detailViewSet']"
       :custom-table-title.sync="tools.customTableTitle"
       :from="fromRoute.dc"
diff --git a/nezha-fronted/src/components/page/config/terminalLog.vue b/nezha-fronted/src/components/page/config/terminalLog.vue
index 701795c78..7aa21165d 100644
--- a/nezha-fronted/src/components/page/config/terminalLog.vue
+++ b/nezha-fronted/src/components/page/config/terminalLog.vue
@@ -2,7 +2,7 @@
   <div v-my-loading="preferenceLoading">
     <nzDetailView
       v-my-loading="detailViewLoading || tools.loading"
-      v-if="detailType !== 'list'&&!preferenceLoading"
+      v-if="detailType !== 'list' "
       :api="url"
       ref="detailList"
       :layout="['searchInput', 'elementSet', 'pagination','detailViewSet']"
@@ -54,7 +54,7 @@
     <nz-data-list
       ref="dataList"
       :api="url"
-      v-if="detailType === 'list'&&!preferenceLoading"
+      v-if="detailType === 'list' "
       :layout="['searchInput', 'elementSet', 'pagination','detailViewSet']"
       :custom-table-title.sync="tools.customTableTitle"
       :from="fromRoute.terminalLog"
diff --git a/nezha-fronted/src/components/page/config/user.vue b/nezha-fronted/src/components/page/config/user.vue
index a32eb43fc..38b7321ea 100644
--- a/nezha-fronted/src/components/page/config/user.vue
+++ b/nezha-fronted/src/components/page/config/user.vue
@@ -2,7 +2,7 @@
   <div v-my-loading="preferenceLoading">
     <nzDetailView
       v-my-loading="detailViewLoading || tools.loading"
-      v-if="detailType !== 'list'&&!preferenceLoading"
+      v-if="detailType !== 'list' "
       :api="url"
       ref="detailList"
       :layout="['searchInput', 'elementSet', 'pagination','detailViewSet']"
@@ -53,7 +53,7 @@
     <nz-data-list
       ref="dataList"
       :api="url"
-      v-if="detailType === 'list'&&!preferenceLoading"
+      v-if="detailType === 'list' "
       :custom-table-title.sync="tools.customTableTitle"
       :from="fromRoute.user"
       :layout="['searchInput', 'elementSet', 'pagination','detailViewSet']"
diff --git a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
index f0c9f26fd..43c16141b 100644
--- a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
+++ b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
@@ -2,7 +2,7 @@
   <div id="endpoint-list" v-my-loading="preferenceLoading">
     <nzDetailView
       v-my-loading="detailViewLoading || tools.loading"
-      v-if="detailType !== 'list'&&!preferenceLoading"
+      v-if="detailType !== 'list' "
       :api="url"
       ref="detailList"
       :layout="dataListLayout"
@@ -71,7 +71,7 @@
     <nz-data-list
       v-my-loading="detailViewLoading"
       ref="dataList"
-      v-if="detailType === 'list'&&!preferenceLoading"
+      v-if="detailType === 'list' "
       :api="url"
       :custom-table-title.sync="tools.customTableTitle"
       :from="fromRoute.endpoint"
diff --git a/nezha-fronted/src/components/page/monitor/module/moduleList.vue b/nezha-fronted/src/components/page/monitor/module/moduleList.vue
index c9fe3ec4e..df6d02a81 100644
--- a/nezha-fronted/src/components/page/monitor/module/moduleList.vue
+++ b/nezha-fronted/src/components/page/monitor/module/moduleList.vue
@@ -2,7 +2,7 @@
   <div class="module-list" v-my-loading="preferenceLoading">
     <nzDetailView
       v-my-loading="detailViewLoading || tools.loading"
-      v-if="detailType !== 'list'&&!preferenceLoading"
+      v-if="detailType !== 'list' "
       :api="url"
       ref="detailList"
       :layout="['searchInput', 'elementSet', 'pagination','detailViewSet']"
@@ -72,7 +72,7 @@
       ref="dataList"
       :api="url"
       :tableId="tableId"
-      v-if="detailType === 'list'&&!preferenceLoading"
+      v-if="detailType === 'list' "
       :custom-table-title.sync="tools.customTableTitle"
       :from="fromRoute.module"
       :layout="['searchInput', 'elementSet', 'pagination','detailViewSet']"
diff --git a/nezha-fronted/src/components/page/notebook/notebook.vue b/nezha-fronted/src/components/page/notebook/notebook.vue
index 9804d5169..0af4244bb 100644
--- a/nezha-fronted/src/components/page/notebook/notebook.vue
+++ b/nezha-fronted/src/components/page/notebook/notebook.vue
@@ -2,7 +2,7 @@
   <div v-my-loading="preferenceLoading">
     <nzDetailView
       v-my-loading="detailViewLoading || tools.loading"
-      v-if="detailType !== 'list'&&!preferenceLoading"
+      v-if="detailType !== 'list' "
       :api="url"
       ref="detailList"
       :layout="['searchInput', 'elementSet', 'pagination','detailViewSet']"
@@ -75,7 +75,7 @@
     <nz-data-list
       ref="dataList"
       :api="url"
-      v-if="detailType === 'list'&&!preferenceLoading"
+      v-if="detailType === 'list' "
       :layout="['searchInput', 'elementSet', 'pagination','detailViewSet']"
       :custom-table-title.sync="tools.customTableTitle"
       :from="fromRoute.notebook"