From 87027f8a8c3d13fe755276a108ca7df14c89adcd Mon Sep 17 00:00:00 2001
From: hanhh <18330117883@163.com>
Date: Sat, 16 Oct 2021 10:53:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A8=E6=A0=BC=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/crontab/index.less |  2 +-
 src/pages/crontab/index.tsx  |  7 +++++--
 src/pages/env/index.tsx      |  6 ++++--
 src/utils/index.ts           | 10 +++++-----
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/pages/crontab/index.less b/src/pages/crontab/index.less
index 1decf2e9..c33e54f8 100644
--- a/src/pages/crontab/index.less
+++ b/src/pages/crontab/index.less
@@ -1,3 +1,3 @@
 .ant-table-pagination.ant-pagination {
-  margin-bottom: 0;
+  margin-bottom: 0 !important;
 }
diff --git a/src/pages/crontab/index.tsx b/src/pages/crontab/index.tsx
index eb1e000e..83ca9078 100644
--- a/src/pages/crontab/index.tsx
+++ b/src/pages/crontab/index.tsx
@@ -677,7 +677,8 @@ const Crontab = ({ headerStyle, isPhone }: any) => {
 
     setTimeout(() => {
       if (selectedRowIds.length === 0 || selectedIds.length === 0) {
-        setTableScrollHeight(getTableScroll());
+        const offset = isPhone ? 40 : 0;
+        setTableScrollHeight(getTableScroll() - offset);
       }
     });
   };
@@ -761,7 +762,8 @@ const Crontab = ({ headerStyle, isPhone }: any) => {
 
   useEffect(() => {
     setPageSize(parseInt(localStorage.getItem('pageSize') || '20'));
-    setTableScrollHeight(getTableScroll());
+    const offset = isPhone ? 40 : 0;
+    setTableScrollHeight(getTableScroll() - offset);
   }, []);
 
   return (
@@ -840,6 +842,7 @@ const Crontab = ({ headerStyle, isPhone }: any) => {
           onChange: onPageChange,
           pageSize: pageSize,
           showSizeChanger: true,
+          simple: isPhone,
           defaultPageSize: 20,
           showTotal: (total: number, range: number[]) =>
             `第 ${range[0]}-${range[1]} 条/总共 ${total} 条`,
diff --git a/src/pages/env/index.tsx b/src/pages/env/index.tsx
index 25f71fe3..0cd56e4a 100644
--- a/src/pages/env/index.tsx
+++ b/src/pages/env/index.tsx
@@ -366,7 +366,8 @@ const Env = ({ headerStyle, isPhone, theme }: any) => {
 
     setTimeout(() => {
       if (selectedRowIds.length === 0 || selectedIds.length === 0) {
-        setTableScrollHeight(getTableScroll({ extraHeight: 40 }));
+        const offset = isPhone ? 40 : 0;
+        setTableScrollHeight(getTableScroll({ extraHeight: 127 }) - offset);
       }
     });
   };
@@ -435,7 +436,8 @@ const Env = ({ headerStyle, isPhone, theme }: any) => {
   }, [searchText]);
 
   useEffect(() => {
-    setTableScrollHeight(getTableScroll({ extraHeight: 40 }));
+    const offset = isPhone ? 40 : 0;
+    setTableScrollHeight(getTableScroll({ extraHeight: 127 }) - offset);
   }, []);
 
   return (
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 09e2522b..57a0ed9c 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -182,7 +182,7 @@ export function getTableScroll({
 }: { extraHeight?: number; id?: string } = {}) {
   if (typeof extraHeight == 'undefined') {
     //  默认底部分页64 + 边距10
-    extraHeight = 80;
+    extraHeight = 167;
   }
   let tHeader = null;
   if (id) {
@@ -192,16 +192,16 @@ export function getTableScroll({
           .getElementsByClassName('ant-table-thead')[0]
       : null;
   } else {
-    tHeader = document.getElementsByClassName('ant-table-thead')[0];
+    tHeader = document.querySelector('.ant-pro-grid-content');
   }
 
   //表格内容距离顶部的距离
-  let tHeaderBottom = 0;
+  let mainTop = 0;
   if (tHeader) {
-    tHeaderBottom = tHeader.getBoundingClientRect().bottom;
+    mainTop = tHeader.getBoundingClientRect().top;
   }
 
   //窗体高度-表格内容顶部的高度-表格内容底部的高度
-  let height = document.body.clientHeight - tHeaderBottom - extraHeight;
+  let height = document.body.clientHeight - mainTop - extraHeight;
   return height;
 }