From 9c6c7eb4c2c6b9c0147f82e5c46dbe061f5dca5d Mon Sep 17 00:00:00 2001
From: expdsn <18111002318@163.com>
Date: Tue, 19 Nov 2024 18:44:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9E=81=E7=AE=80=E6=A8=A1=E5=BC=8F=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=98=BE=E7=A4=BA=E4=BD=8D=E7=BD=AE=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/header/GlobalTime.tsx   | 41 ++++++++++++++++++++----------
 src/layout/header/search/index.tsx |  2 +-
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/layout/header/GlobalTime.tsx b/src/layout/header/GlobalTime.tsx
index 4d0eb15..d10287f 100644
--- a/src/layout/header/GlobalTime.tsx
+++ b/src/layout/header/GlobalTime.tsx
@@ -42,14 +42,21 @@ export default defineComponent({
       <div
         class={clsx(
           'absolute z-20 shadow-text tracking-widest    font-normal  transition-all ',
-          layout.isCompact ? 'text-[13px] flex  z-20 items-center pointer-events-none gap-x-2' : 'h-[110px]'
+          layout.isCompact && !layout.state.simple
+            ? 'text-[13px] flex  z-20 items-center pointer-events-none gap-x-2'
+            : 'h-[110px]'
         )}
         style={{
           color: 'white',
           transitionDuration: '.4s',
-          left: layout.isCompact ? '20px' : '50%',
-          top: layout.isCompact ? '20px' : layout.state.simple ? '100px' : '50px',
-          transform: layout.isCompact ? '' : 'translate(-50%,0)'
+          left: layout.isCompact && !layout.state.simple ? '20px' : '50%',
+          top:
+            layout.isCompact && !layout.state.simple
+              ? '20px'
+              : layout.state.simple
+                ? '100px'
+                : '50px',
+          transform: layout.isCompact && !layout.state.simple ? '' : 'translate(-50%,0)'
         }}
       >
         <Transition>
@@ -58,7 +65,7 @@ export default defineComponent({
                 <div
                   class={
                     'transition-all ' +
-                    (layout.isCompact
+                    (layout.isCompact && !layout.state.simple
                       ? 'text-[1.2rem] leading-[1.4rem]'
                       : 'text-[8vh] leading-[4rem]')
                   }
@@ -70,7 +77,7 @@ export default defineComponent({
                 <div
                   class={
                     'transition-all ' +
-                    (layout.isCompact
+                    (layout.isCompact && !layout.state.simple
                       ? 'text-[1.2rem] leading-[1.4rem]'
                       : 'text-[8vh] leading-[4rem]')
                   }
@@ -84,26 +91,32 @@ export default defineComponent({
             ? settings.state.simpleModeShowString.includes('showDate') && (
                 <div
                   class={
-                    'flex items-center gap-4  ' + (layout.isCompact ? 'text-[1.2rem]' : 'justify-center mt-4')
+                    'flex items-center gap-4  ' +
+                    (layout.isCompact && !layout.state.simple
+                      ? 'text-[1.2rem]'
+                      : 'justify-center mt-4')
                   }
                 >
                   {settings.state.timeOptions.includes('date') && <div>{text.value.dateStr}</div>}
                   <Transition>
-                    {!layout.isCompact && settings.state.timeOptions.includes('week') && (
-                      <div>星期{info.value.dayWeek}</div>
-                    )}
+                    {!(layout.isCompact && !layout.state.simple) &&
+                      settings.state.timeOptions.includes('week') && (
+                        <div>星期{info.value.dayWeek}</div>
+                      )}
                   </Transition>
                   <Transition>
-                    {!layout.isCompact && settings.state.timeOptions.includes('lunal') && (
-                      <div>{info.value.day}</div>
-                    )}
+                    {!(layout.isCompact && !layout.state.simple) &&
+                      settings.state.timeOptions.includes('lunal') && <div>{info.value.day}</div>}
                   </Transition>
                 </div>
               )
             : settings.state!.showTime && (
                 <div
                   class={
-                    'flex items-center gap-4 ' + (layout.isCompact ? ' text-[1.2rem]' : 'mt-4 justify-center')
+                    'flex items-center gap-4 ' +
+                    (layout.isCompact && !layout.state.simple
+                      ? ' text-[1.2rem]'
+                      : 'mt-4 justify-center')
                   }
                 >
                   {settings.state.timeOptions.includes('date') && <div>{text.value.dateStr}</div>}
diff --git a/src/layout/header/search/index.tsx b/src/layout/header/search/index.tsx
index 3898100..07acbb8 100644
--- a/src/layout/header/search/index.tsx
+++ b/src/layout/header/search/index.tsx
@@ -23,7 +23,7 @@ export default defineComponent(
           props.isMini
             ? {}
             : {
-              top: layout.isCompact ? '50px' : layout.state.simple ? '230px' : '172px',
+              top: layout.isCompact && !layout.state.simple ? '50px' : layout.state.simple ? '230px' : '172px',
               width: settings.state.searchWidth + 'rem'
             }
         }