From 5fad0014686cd836a0703ba768bc4e892b49dce0 Mon Sep 17 00:00:00 2001
From: preschooler <preschool@139.com>
Date: Mon, 19 Aug 2024 15:12:57 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=90=9E=20fix:=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A8=E5=B1=80box-sizing:=20border-box;=EF=BC=8C=E6=AD=A4?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=9C=A8=E5=B8=83=E5=B1=80=E4=B8=AD=E6=9C=80?=
 =?UTF-8?q?=E4=B8=BA=E5=90=88=E7=90=86=EF=BC=8C=E4=B8=94=E6=80=BB=E4=BC=9A?=
 =?UTF-8?q?=E6=9C=89=E7=BB=84=E4=BB=B6=E5=85=A8=E5=B1=80=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?box-sizing=E5=AF=BC=E8=87=B4=E4=B8=AD=E9=80=94=E5=BD=B1?=
 =?UTF-8?q?=E5=93=8D=E5=B8=83=E5=B1=80=EF=BC=88=E5=A6=82=EF=BC=9A=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5=E6=B5=81=E7=A8=8B=E6=A8=A1=E5=9E=8B=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=A0=87=E7=AD=BE=E6=A0=8F=E9=AB=98=E5=BA=A6?=
 =?UTF-8?q?=E3=80=81=E4=B8=BB=E5=AE=B9=E5=99=A8=E5=AE=BD=E5=BA=A6=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=89=EF=BC=9B=E5=8F=AF=E8=83=BD=E8=BD=BB=E5=BE=AE?=
 =?UTF-8?q?=E5=BD=B1=E5=93=8D=E6=9F=90=E4=BA=9B=E5=B8=83=E5=B1=80=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=91=E7=8E=B0=E5=90=8E=E4=BF=AE=E5=A4=8D=E5=8D=B3=E5=8F=AF?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/AppView.vue | 15 +++++++--------
 src/styles/var.css                |  6 ++++++
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/layout/components/AppView.vue b/src/layout/components/AppView.vue
index 44341873..d708b71b 100644
--- a/src/layout/components/AppView.vue
+++ b/src/layout/components/AppView.vue
@@ -36,26 +36,25 @@ provide('reload', reload)
 <template>
   <section
     :class="[
-      'p-[var(--app-content-padding)] w-[calc(100%-var(--app-content-padding)-var(--app-content-padding))] bg-[var(--app-content-bg-color)] dark:bg-[var(--el-bg-color)]',
+      '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-content-padding)-var(--app-content-padding)-var(--app-footer-height))]':
+        '!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-content-padding)-var(--app-content-padding)-var(--app-footer-height)-var(--tags-view-height))]':
+        '!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(--app-content-padding)-var(--app-content-padding)-var(--top-tool-height)-var(--app-footer-height))]':
+        '!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-content-padding)-var(--app-content-padding)-var(--app-footer-height))]':
+        '!min-h-[calc(100%-var(--tags-view-height)-var(--app-footer-height))]':
           !fixedHeader && layout === 'topLeft' && footer,
 
-        '!min-h-[calc(100%-var(--top-tool-height)-var(--app-content-padding)-var(--app-content-padding))]':
-          fixedHeader && layout === 'cutMenu' && footer,
+        '!min-h-[calc(100%-var(--top-tool-height))]': fixedHeader && layout === 'cutMenu' && footer,
 
-        '!min-h-[calc(100%-var(--top-tool-height)-var(--app-content-padding)-var(--app-content-padding)-var(--tags-view-height))]':
+        '!min-h-[calc(100%-var(--top-tool-height)-var(--tags-view-height))]':
           !fixedHeader && layout === 'cutMenu' && footer
       }
     ]"
diff --git a/src/styles/var.css b/src/styles/var.css
index 63459ba6..abdd8450 100644
--- a/src/styles/var.css
+++ b/src/styles/var.css
@@ -64,3 +64,9 @@ body {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
+
+* {
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
+}

From ca6b61f55300a041afc7606e27e3b0fd96f09b70 Mon Sep 17 00:00:00 2001
From: preschooler <preschool@139.com>
Date: Wed, 21 Aug 2024 15:12:14 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=8E=88=20perf:=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E9=80=89=E6=8B=A9=E5=BC=B9=E7=AA=97=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Icon/src/IconSelect.vue | 6 +++---
 src/views/system/menu/MenuForm.vue     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/Icon/src/IconSelect.vue b/src/components/Icon/src/IconSelect.vue
index d4a5b074..4b1f8ea2 100644
--- a/src/components/Icon/src/IconSelect.vue
+++ b/src/components/Icon/src/IconSelect.vue
@@ -122,7 +122,7 @@ watch(
             placement: 'auto'
           }"
           :visible="visible"
-          :width="350"
+          :width="355"
           popper-class="pure-popper"
           trigger="click"
         >
@@ -147,7 +147,7 @@ watch(
             >
               <ElDivider border-style="dashed" class="tab-divider" />
               <ElScrollbar height="220px">
-                <ul class="ml-2 flex flex-wrap px-2">
+                <ul class="ml-2 flex flex-wrap">
                   <li
                     v-for="(item, key) in pageList"
                     :key="key"
@@ -171,7 +171,7 @@ watch(
             background
             class="h-10 flex items-center justify-center"
             layout="prev, pager, next"
-            small
+            size="small"
             @current-change="onCurrentChange"
           />
         </ElPopover>
diff --git a/src/views/system/menu/MenuForm.vue b/src/views/system/menu/MenuForm.vue
index 2b4a90d1..ba3de87b 100644
--- a/src/views/system/menu/MenuForm.vue
+++ b/src/views/system/menu/MenuForm.vue
@@ -25,7 +25,7 @@
           <el-radio-button
             v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_MENU_TYPE)"
             :key="dict.label"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio-button>

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 3/3] =?UTF-8?q?=F0=9F=90=9E=20fix:=E5=88=A0=E9=99=A4scroll?=
 =?UTF-8?q?bar=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;