From 7a02fe0d8edd7c2e295fe8552e9fc85fdcaabf34 Mon Sep 17 00:00:00 2001
From: hanhh <18330117883@163.com>
Date: Sun, 15 Aug 2021 15:45:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=86=85=E5=AE=B9=E5=8C=BA?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/index.less      | 7 ++++++-
 src/pages/setting/index.tsx | 7 +------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/layouts/index.less b/src/layouts/index.less
index 09a80f51..c0425d83 100644
--- a/src/layouts/index.less
+++ b/src/layouts/index.less
@@ -135,12 +135,13 @@ input:-webkit-autofill:active {
   display: flex;
   flex-direction: column;
   height: calc(100vh - 48px);
+  height: calc(100vh - var(--vh-offset, 0px) - 48px);
   .ant-pro-grid-content.wide {
     flex: 1;
     .ant-pro-grid-content-children {
       height: calc(100% - 48px);
+      height: calc(100% - var(--vh-offset, 0px) - 48px);
       > div,
-      .ant-pro-page-container-children-content,
       .log-container,
       .react-codemirror2,
       .CodeMirror {
@@ -178,6 +179,10 @@ input:-webkit-autofill:active {
   }
 }
 
+.ant-layout-content.ant-pro-basicLayout-content.ant-pro-basicLayout-has-header {
+  margin-bottom: 0 !important;
+}
+
 @media (min-width: 768px) {
   .ant-layout-content.ant-pro-basicLayout-content.ant-pro-basicLayout-has-header {
     min-height: calc(100vh - 72px);
diff --git a/src/pages/setting/index.tsx b/src/pages/setting/index.tsx
index 26ae123e..12da51ca 100644
--- a/src/pages/setting/index.tsx
+++ b/src/pages/setting/index.tsx
@@ -80,12 +80,7 @@ const Password = () => {
         style: headerStyle,
       }}
     >
-      <Tabs
-        defaultActiveKey="person"
-        size="small"
-        tabPosition="top"
-        style={{ height: 'calc(100vh - var(--vh-offset, 0px) - 128px)' }}
-      >
+      <Tabs defaultActiveKey="person" size="small" tabPosition="top">
         <Tabs.TabPane tab="个人设置" key="person">
           <Form onFinish={handleOk} layout="vertical">
             <Form.Item