From a3f56be2995b71fa4602aa8f99ee78cf733a01f0 Mon Sep 17 00:00:00 2001
From: whyour <imwhyour@gmail.com>
Date: Sun, 28 Aug 2022 00:38:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B4=E4=BD=93=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=EF=BC=8C=E5=87=8F=E5=B0=91=E6=97=A0=E7=94=A8=E9=97=B4?=
 =?UTF-8?q?=E9=9A=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/index.less         | 28 +++++++++++++++++++++++-----
 src/pages/crontab/index.tsx    |  2 +-
 src/pages/dependence/index.tsx |  2 +-
 src/pages/setting/index.tsx    |  2 +-
 src/utils/index.ts             |  4 ++--
 5 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/layouts/index.less b/src/layouts/index.less
index c65acadb..6fb61cfc 100644
--- a/src/layouts/index.less
+++ b/src/layouts/index.less
@@ -56,7 +56,13 @@
     overflow: auto;
     height: 100%;
     background-color: @component-background;
-    padding: 16px;
+    padding: 12px;
+  }
+}
+
+.ql-container-wrapper-has-tab {
+  .ant-pro-grid-content.wide .ant-pro-page-container-children-content {
+    padding-top: 0;
   }
 }
 
@@ -136,7 +142,7 @@
     flex: 1;
 
     .ant-pro-grid-content-children {
-      height: calc(100% - 36px);
+      height: 100%;
 
       > div,
       .log-container,
@@ -265,15 +271,23 @@
 }
 
 .ant-pro-page-container-children-content {
-  margin: 18px 18px 18px;
+  margin: 0;
 }
 
 .ant-pro-basicLayout-content {
-  margin: 18px;
+  margin: 12px;
 
   .ant-pro-page-container {
-    margin: -18px -18px -18px;
+    margin: -12px;
   }
+
+  .ant-pro-page-container-warp .ant-page-header {
+    border-bottom: 1px solid #eee;
+  }
+}
+
+.ant-pro-global-header {
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.03);
 }
 
 .ant-menu-item.ant-pro-sider-collapsed-button {
@@ -312,6 +326,10 @@
   background-color: #373739;
 }
 
+.ant-layout-sider {
+  border-right: 1px solid rgba(0, 0, 0, 0.06);
+}
+
 .ant-pro-sider-logo {
   padding: 16px 8px !important;
 
diff --git a/src/pages/crontab/index.tsx b/src/pages/crontab/index.tsx
index 66fe1a6b..57077fa0 100644
--- a/src/pages/crontab/index.tsx
+++ b/src/pages/crontab/index.tsx
@@ -964,7 +964,7 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
 
   return (
     <PageContainer
-      className="ql-container-wrapper crontab-wrapper"
+      className="ql-container-wrapper crontab-wrapper ql-container-wrapper-has-tab"
       title="定时任务"
       extra={[
         <Search
diff --git a/src/pages/dependence/index.tsx b/src/pages/dependence/index.tsx
index 7d1fa4bc..98d9c96b 100644
--- a/src/pages/dependence/index.tsx
+++ b/src/pages/dependence/index.tsx
@@ -444,7 +444,7 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
 
   return (
     <PageContainer
-      className="ql-container-wrapper dependence-wrapper"
+      className="ql-container-wrapper dependence-wrapper ql-container-wrapper-has-tab"
       title="依赖管理"
       extra={[
         <Search
diff --git a/src/pages/setting/index.tsx b/src/pages/setting/index.tsx
index 98c50ccf..41331c62 100644
--- a/src/pages/setting/index.tsx
+++ b/src/pages/setting/index.tsx
@@ -313,7 +313,7 @@ const Setting = ({
 
   return (
     <PageContainer
-      className="ql-container-wrapper"
+      className="ql-container-wrapper ql-container-wrapper-has-tab"
       title="系统设置"
       header={{
         style: headerStyle,
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 8aaee431..c09a8984 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -181,8 +181,8 @@ export function getTableScroll({
   id,
 }: { extraHeight?: number; id?: string } = {}) {
   if (typeof extraHeight == 'undefined') {
-    //  47 + 40 + 10 + 24
-    extraHeight = 121;
+    //  47 + 40 + 12
+    extraHeight = 99;
   }
   let tHeader = null;
   if (id) {