From ca3e47f6734eaf4e0c69bc32b0194a195531a3c4 Mon Sep 17 00:00:00 2001
From: preschooler <preschool@139.com>
Date: Thu, 22 Aug 2024 02:13:51 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix:=E5=88=A0=E9=99=A4scrollbar?=
 =?UTF-8?q?=5F=5Fview=E9=AB=98=E5=BA=A6=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                       |  4 ----
 src/layout/Layout.vue             |  3 ---
 src/layout/components/AppView.vue | 20 ++------------------
 src/styles/var.css                |  4 +++-
 4 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 1f5f36d7..7407d97a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -54,8 +54,4 @@ body {
 .#{$prefix-cls}-grey-mode {
   filter: grayscale(100%);
 }
-
-.scrollbar__view {
-  height: 99%!important;
-}
 </style>
diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
index af519707..d15025c6 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/Layout.vue
@@ -71,8 +71,5 @@ $prefix-cls: #{$namespace}-layout;
 
 .#{$prefix-cls} {
   background-color: var(--app-content-bg-color);
-  :deep(.#{$elNamespace}-scrollbar__view) {
-    height: 99% !important;
-  }
 }
 </style>
diff --git a/src/layout/components/AppView.vue b/src/layout/components/AppView.vue
index d708b71b..df720a11 100644
--- a/src/layout/components/AppView.vue
+++ b/src/layout/components/AppView.vue
@@ -38,24 +38,8 @@ provide('reload', reload)
     :class="[
       'p-[var(--app-content-padding)] w-full bg-[var(--app-content-bg-color)] dark:bg-[var(--el-bg-color)]',
       {
-        '!min-h-[calc(100%-var(--app-footer-height))]':
-          (fixedHeader &&
-            (layout === 'classic' || layout === 'topLeft' || layout === 'top') &&
-            footer) ||
-          (!tagsView && layout === 'top' && footer),
-        '!min-h-[calc(100%-var(--app-footer-height)-var(--tags-view-height))]':
-          tagsView && layout === 'top' && footer,
-
-        '!min-h-[calc(100%-var(--tags-view-height)-var(--top-tool-height)-var(--app-footer-height))]':
-          !fixedHeader && layout === 'classic' && footer,
-
-        '!min-h-[calc(100%-var(--tags-view-height)-var(--app-footer-height))]':
-          !fixedHeader && layout === 'topLeft' && footer,
-
-        '!min-h-[calc(100%-var(--top-tool-height))]': fixedHeader && layout === 'cutMenu' && footer,
-
-        '!min-h-[calc(100%-var(--top-tool-height)-var(--tags-view-height))]':
-          !fixedHeader && layout === 'cutMenu' && footer
+        '!min-h-[calc(100vh-var(--top-tool-height)-var(--tags-view-height)-var(--app-footer-height))] pb-0':
+          footer
       }
     ]"
   >
diff --git a/src/styles/var.css b/src/styles/var.css
index abdd8450..44f9405c 100644
--- a/src/styles/var.css
+++ b/src/styles/var.css
@@ -65,7 +65,9 @@ body {
   -moz-osx-font-smoothing: grayscale;
 }
 
-* {
+*,
+:after,
+:before {
   margin: 0;
   padding: 0;
   box-sizing: border-box;