From 8009c38bd839f3d3695c49eaed5462015d26c22e Mon Sep 17 00:00:00 2001
From: preschooler <preschool@139.com>
Date: Mon, 19 Aug 2024 10:53:46 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=8C=88=20style:=E8=A7=84=E8=8C=83styl?=
 =?UTF-8?q?e=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/theme.scss     | 11 -----------
 src/views/Login/Login.vue | 12 ++++++++++++
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/styles/theme.scss b/src/styles/theme.scss
index 149002cf5..39b03b3dd 100644
--- a/src/styles/theme.scss
+++ b/src/styles/theme.scss
@@ -4,14 +4,3 @@
 // .dark .dark\:text-color {
 //   color: rgba(255, 255, 255, var(--dark-text-color));
 // }
-
-// 登录页
-.dark .login-form {
-  .el-divider__text {
-    background-color: var(--login-bg-color);
-  }
-
-  .el-card {
-    background-color: var(--login-bg-color);
-  }
-}
diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue
index e12457572..868d5a3f7 100644
--- a/src/views/Login/Login.vue
+++ b/src/views/Login/Login.vue
@@ -104,3 +104,15 @@ $prefix-cls: #{$namespace}-login;
   }
 }
 </style>
+
+<style lang="scss">
+.dark .login-form {
+  .el-divider__text {
+    background-color: var(--login-bg-color);
+  }
+
+  .el-card {
+    background-color: var(--login-bg-color);
+  }
+}
+</style>
\ No newline at end of file
-- 
Gitee


From edf6ed162a4a7e4b69b394fad1514a7f615e7c00 Mon Sep 17 00:00:00 2001
From: preschooler <preschool@139.com>
Date: Mon, 19 Aug 2024 13:49:27 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=90=9E=20fix:=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=A0=8F=E9=AB=98=E5=BA=A6=EF=BC=88=E8=A2=AB?=
 =?UTF-8?q?box-sizing=E5=92=8Cscrollbar=5F=5Fview=E7=9A=84height:=2099%?=
 =?UTF-8?q?=E5=B9=B2=E6=89=B0=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/TagsView/src/TagsView.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/layout/components/TagsView/src/TagsView.vue b/src/layout/components/TagsView/src/TagsView.vue
index cdd7494d5..902288d86 100644
--- a/src/layout/components/TagsView/src/TagsView.vue
+++ b/src/layout/components/TagsView/src/TagsView.vue
@@ -280,7 +280,7 @@ watch(
     </span>
     <div class="flex-1 overflow-hidden">
       <ElScrollbar ref="scrollbarRef" class="h-full" @scroll="scroll">
-        <div class="h-full flex">
+        <div class="h-[var(--tags-view-height)] flex">
           <ContextMenu
             :ref="itemRefs.set"
             :schema="[
@@ -515,7 +515,7 @@ $prefix-cls: #{$namespace}-tags-view;
 
   &__item {
     position: relative;
-    top: 2px;
+    top: 3px;
     height: calc(100% - 6px);
     padding-right: 15px;
     margin-left: 4px;
@@ -523,6 +523,7 @@ $prefix-cls: #{$namespace}-tags-view;
     cursor: pointer;
     border: 1px solid #d9d9d9;
     border-radius: 2px;
+    box-sizing: border-box;
 
     &--close {
       position: absolute;
@@ -560,10 +561,11 @@ $prefix-cls: #{$namespace}-tags-view;
   }
 
   &__item--immerse {
-    top: 3px;
+    top: 2px;
+    height: calc(100% - 3px);
     padding-right: 35px;
     margin: 0 -10px;
-    border: 1px solid transparent;
+    border: none !important;
     -webkit-mask-box-image: url("data:image/svg+xml,%3Csvg width='68' height='34' viewBox='0 0 68 34' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='m27,0c-7.99582,0 -11.95105,0.00205 -12,12l0,6c0,8.284 -0.48549,16.49691 -8.76949,16.49691l54.37857,-0.11145c-8.284,0 -8.60908,-8.10146 -8.60908,-16.38546l0,-6c0.11145,-12.08445 -4.38441,-12 -12,-12l-13,0z' fill='%23409eff'/%3E%3C/svg%3E")
       12 27 15;
     .#{$prefix-cls}__item--label {
-- 
Gitee


From a059013c39ef80b84a9fe7568f8085b3006c0b7b Mon Sep 17 00:00:00 2001
From: preschooler <preschool@139.com>
Date: Mon, 19 Aug 2024 15:12:57 +0800
Subject: [PATCH 3/4] =?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 443418732..d708b71bd 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 63459ba63..abdd84508 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;
+}
-- 
Gitee


From 0cc3d4884fc9bff5ee8c2c96a4508480601fa660 Mon Sep 17 00:00:00 2001
From: preschooler <preschool@139.com>
Date: Mon, 19 Aug 2024 16:52:43 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=90=9E=20fix:top=E5=B8=83=E5=B1=80?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=8B=E4=B8=BB=E5=AE=B9=E5=99=A8=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6=E3=80=81=E5=B7=A5=E5=85=B7=E6=A0=8F=E9=AB=98=E5=87=BA?=
 =?UTF-8?q?1px?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/useRenderLayout.tsx | 26 +++++++----------------
 uno.config.ts                             |  2 +-
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/layout/components/useRenderLayout.tsx b/src/layout/components/useRenderLayout.tsx
index 1110cd866..5fa570630 100644
--- a/src/layout/components/useRenderLayout.tsx
+++ b/src/layout/components/useRenderLayout.tsx
@@ -126,7 +126,7 @@ export const useRenderLayout = () => {
 
           <ToolHeader class="flex-1"></ToolHeader>
         </div>
-        <div class="absolute left-0 top-[var(--logo-height)+1px] h-[calc(100%-1px-var(--logo-height))] w-full flex">
+        <div class="absolute left-0 top-[var(--logo-height)] h-[calc(100%-var(--logo-height))] w-full flex">
           <Menu class="relative layout-border__right !h-full"></Menu>
           <div
             class={[
@@ -157,9 +157,9 @@ export const useRenderLayout = () => {
                     'layout-border__bottom absolute',
                     {
                       '!fixed top-0 left-0 z-10': fixedHeader.value,
-                      'w-[calc(100%-var(--left-menu-min-width))] !left-[var(--left-menu-min-width)] mt-[calc(var(--logo-height)+1px)]':
+                      'w-[calc(100%-var(--left-menu-min-width))] !left-[var(--left-menu-min-width)] mt-[var(--logo-height)]':
                         collapse.value && fixedHeader.value,
-                      'w-[calc(100%-var(--left-menu-max-width))] !left-[var(--left-menu-max-width)] mt-[calc(var(--logo-height)+1px)]':
+                      'w-[calc(100%-var(--left-menu-max-width))] !left-[var(--left-menu-max-width)] mt-[var(--logo-height)]':
                         !collapse.value && fixedHeader.value
                     }
                   ]}
@@ -190,24 +190,14 @@ export const useRenderLayout = () => {
           <Menu class="h-[var(--top-tool-height)] flex-1 px-10px"></Menu>
           <ToolHeader></ToolHeader>
         </div>
-        <div
-          class={[
-            `${prefixCls}-content`,
-            'w-full',
-            {
-              'h-[calc(100%-var(--app-footer-height))]': !fixedHeader.value,
-              'h-[calc(100%-var(--tags-view-height)-var(--app-footer-height))]': fixedHeader.value
-            }
-          ]}
-        >
+        <div class={[`${prefixCls}-content`, 'w-full h-[calc(100%-var(--top-tool-height))]']}>
           <ElScrollbar
             v-loading={pageLoading.value}
             class={[
               `${prefixCls}-content-scrollbar`,
               {
-                'mt-[var(--tags-view-height)] !pb-[calc(var(--tags-view-height)+var(--app-footer-height))]':
-                  fixedHeader.value,
-                'pb-[var(--app-footer-height)]': !fixedHeader.value
+                '!h-[calc(100%-var(--tags-view-height))] mt-[calc(var(--tags-view-height))]':
+                  fixedHeader.value
               }
             ]}
           >
@@ -216,7 +206,7 @@ export const useRenderLayout = () => {
                 class={[
                   'layout-border__bottom layout-border__top relative',
                   {
-                    '!fixed w-full top-[calc(var(--top-tool-height)+1px)] left-0': fixedHeader.value
+                    '!fixed w-full top-[var(--top-tool-height)] left-0': fixedHeader.value
                   }
                 ]}
                 style="transition: width var(--transition-time-02), left var(--transition-time-02);"
@@ -238,7 +228,7 @@ export const useRenderLayout = () => {
 
           <ToolHeader class="flex-1"></ToolHeader>
         </div>
-        <div class="absolute left-0 top-[var(--logo-height)] h-[calc(100%-var(--logo-height))] w-[calc(100%-2px)] flex">
+        <div class="absolute left-0 top-[var(--logo-height)] h-[calc(100%-var(--logo-height))] w-full flex">
           <TabMenu></TabMenu>
           <div
             class={[
diff --git a/uno.config.ts b/uno.config.ts
index d14673195..e52457ac3 100644
--- a/uno.config.ts
+++ b/uno.config.ts
@@ -12,7 +12,7 @@ export default defineConfig({
 ${selector} {
   display: flex;
   height: 100%;
-  padding: 1px 10px 0;
+  padding: 0 10px;
   cursor: pointer;
   align-items: center;
   transition: background var(--transition-time-02);
-- 
Gitee