From 8a4be89b748d9a1bfd60986a7ba4de01f8e82744 Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Mon, 10 Jul 2023 15:47:43 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-2972=20fix=EF=BC=9A=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E8=BE=B9=E6=A1=86=E6=A0=B7=E5=BC=8F=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/css/common/tableCommon.scss       | 4 ++--
 .../assets/css/components/common/bottomBox/bottomBox.scss  | 7 +++----
 .../src/assets/css/components/page/config/mibBrowser.scss  | 4 ++++
 .../components/common/bottomBox/tabs/commentsBottomTab.vue | 2 +-
 .../components/common/table/asset/assetCommentTable.vue    | 1 -
 nezha-fronted/src/components/page/asset/asset.vue          | 2 +-
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/nezha-fronted/src/assets/css/common/tableCommon.scss b/nezha-fronted/src/assets/css/common/tableCommon.scss
index 181f7e06e..24f73b1fe 100644
--- a/nezha-fronted/src/assets/css/common/tableCommon.scss
+++ b/nezha-fronted/src/assets/css/common/tableCommon.scss
@@ -245,7 +245,7 @@
     width: 100%;
     box-sizing: border-box;
     flex: auto;
-    height: calc(100% - 58px);
+    height: calc(100% - 60px);
 
     .el-table:not(.chart-table) {
       width: 100%;
@@ -421,7 +421,7 @@
   /* end--覆盖el-table边框、gutter等样式 */
   .pagination-bottom {
     position: absolute;
-    bottom: 1px;
+    bottom: 0px;
     height: 48px;
     z-index: 1;
     width: calc(100% - 20px);
diff --git a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss
index b41086bf0..aa1ac73d3 100644
--- a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss
+++ b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss
@@ -22,7 +22,7 @@
   }
 }
 .bottom-data-list .sub-container {
-  height: calc(100% - 50px);
+  height: calc(100% - 45px);
   background-color: $--background-color-base;
   overflow-y: auto;
   & > div {
@@ -222,7 +222,7 @@
   bottom: 0;
 }
 .bottom-box .sub-container {
-  height: calc(100% - 50px);
+  height: calc(100% - 45px);
 }
 .bottom-box .sub-container .nz-table-list {
   height: calc(100% - 20px);
@@ -363,7 +363,7 @@
   .sub-container .nz-table-list {
     height: 100%;
     overflow-y: auto;
-    padding-bottom: 0 !important;
+    padding-bottom: 20px !important;
   }
   .textarea-box {
     overflow: hidden;
@@ -422,7 +422,6 @@
     }
   }
   #assetCommentTable {
-    height: calc(100% - 25px) !important;
     .descriptions-info {
       font-size: 14px;
       font-family: Roboto-Regular;
diff --git a/nezha-fronted/src/assets/css/components/page/config/mibBrowser.scss b/nezha-fronted/src/assets/css/components/page/config/mibBrowser.scss
index 3d0e89497..2c07c0bd0 100644
--- a/nezha-fronted/src/assets/css/components/page/config/mibBrowser.scss
+++ b/nezha-fronted/src/assets/css/components/page/config/mibBrowser.scss
@@ -56,6 +56,10 @@
     transform: translate(-6px, 6px);
   }
 
+  .nz-table-list{
+    padding-bottom: 20px !important; 
+  }
+
   .mib-browser-box {
     display: flex;
     height: calc(100% - 55px);
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/commentsBottomTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/commentsBottomTab.vue
index cd25352f2..94a596673 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/commentsBottomTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/commentsBottomTab.vue
@@ -29,7 +29,7 @@
           </div>
         </rich-text-editor>
       </div>
-      <div style="height:calc(100% - 45px)">
+      <div>
         <assetCommentTable
           ref="dataTable"
           :orderByFa="'id'"
diff --git a/nezha-fronted/src/components/common/table/asset/assetCommentTable.vue b/nezha-fronted/src/components/common/table/asset/assetCommentTable.vue
index f49afc022..33708c727 100644
--- a/nezha-fronted/src/components/common/table/asset/assetCommentTable.vue
+++ b/nezha-fronted/src/components/common/table/asset/assetCommentTable.vue
@@ -3,7 +3,6 @@
     id="assetCommentTable"
     ref="dataTable"
     :data="tableData"
-    :height="height"
     :show-header="false"
     tooltip-effect="light"
     class="resize-rich-text-editor-table"
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index af083ad79..3f7e3f773 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -243,7 +243,7 @@ export default {
       },
       silenceBoxShow: false,
       dataListLayout: localStorage.getItem('dataList-layout' + 'assetTable') ? JSON.parse(localStorage.getItem('dataList-layout' + 'assetTable')) : ['searchInput', 'elementSet', 'clickSearch', 'pagination', 'detailViewSet'],
-      assetNzTableHeightOffset: 283, // 包含click-search时nz-table的高度
+      assetNzTableHeightOffset: 287, // 包含click-search时nz-table的高度
       blankObject: {
         id: '',
         name: '',