From 2f3f374fa0f83ad7cc951e2ee4f1d2888fb741a2 Mon Sep 17 00:00:00 2001
From: Hooray <304327508@qq.com>
Date: Wed, 26 Mar 2025 22:38:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=90=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E8=BF=87=E6=B8=A1=E6=95=88=E6=9E=9C=EF=BC=8C=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E4=B8=A4=E5=A5=97=E5=AE=9E=E7=8E=B0=E6=96=B9=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/components/Menu/sub.vue | 77 +++++++++++++++--------------
 1 file changed, 40 insertions(+), 37 deletions(-)

diff --git a/src/layouts/components/Menu/sub.vue b/src/layouts/components/Menu/sub.vue
index b76696ea..c87d0164 100644
--- a/src/layouts/components/Menu/sub.vue
+++ b/src/layouts/components/Menu/sub.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { SubMenuProps } from './types'
+import { cn } from '@/utils'
 import { useTimeoutFn } from '@vueuse/core'
 import Item from './item.vue'
 import { rootMenuInjectionKey } from './types'
@@ -45,40 +46,42 @@ const transitionEvent = computed(() => {
           el.style.overflow = ''
         },
       }
-    : {
-        enter(el: HTMLElement) {
-          requestAnimationFrame(() => {
-            el.dataset.height = el.offsetHeight.toString()
-            el.style.maxHeight = '0'
-            void el.offsetHeight
-            el.style.maxHeight = `${el.dataset.height}px`
+    : CSS.supports('height', 'calc-size(auto, size)')
+      ? {}
+      : {
+          enter(el: HTMLElement) {
+            requestAnimationFrame(() => {
+              el.dataset.height = el.offsetHeight.toString()
+              el.style.maxHeight = '0'
+              void el.offsetHeight
+              el.style.maxHeight = `${el.dataset.height}px`
+              el.style.overflow = 'hidden'
+            })
+          },
+          afterEnter(el: HTMLElement) {
+            el.style.maxHeight = ''
+            el.style.overflow = ''
+          },
+          enterCancelled(el: HTMLElement) {
+            el.style.maxHeight = ''
+            el.style.overflow = ''
+          },
+          beforeLeave(el: HTMLElement) {
+            el.style.maxHeight = `${el.offsetHeight}px`
             el.style.overflow = 'hidden'
-          })
-        },
-        afterEnter(el: HTMLElement) {
-          el.style.maxHeight = ''
-          el.style.overflow = ''
-        },
-        enterCancelled(el: HTMLElement) {
-          el.style.maxHeight = ''
-          el.style.overflow = ''
-        },
-        beforeLeave(el: HTMLElement) {
-          el.style.maxHeight = `${el.offsetHeight}px`
-          el.style.overflow = 'hidden'
-        },
-        leave(el: HTMLElement) {
-          el.style.maxHeight = '0'
-        },
-        afterLeave(el: HTMLElement) {
-          el.style.maxHeight = ''
-          el.style.overflow = ''
-        },
-        leaveCancelled(el: HTMLElement) {
-          el.style.maxHeight = ''
-          el.style.overflow = ''
-        },
-      }
+          },
+          leave(el: HTMLElement) {
+            el.style.maxHeight = '0'
+          },
+          afterLeave(el: HTMLElement) {
+            el.style.maxHeight = ''
+            el.style.overflow = ''
+          },
+          leaveCancelled(el: HTMLElement) {
+            el.style.maxHeight = ''
+            el.style.overflow = ''
+          },
+        }
 })
 
 const transitionClass = computed(() => {
@@ -93,11 +96,11 @@ const transitionClass = computed(() => {
       }
     : {
         enterActiveClass: 'ease-in-out duration-300',
-        enterFromClass: 'opacity-0 translate-y-4 scale-95 blur-4',
+        enterFromClass: cn('opacity-0 translate-y-4 scale-95 blur-4', CSS.supports('height', 'calc-size(auto, size)') && 'h-0'),
         enterToClass: 'opacity-100 translate-y-0 scale-100 blur-0',
         leaveActiveClass: 'ease-in-out duration-300',
         leaveFromClass: 'opacity-100 translate-y-0 scale-100 blur-0',
-        leaveToClass: 'opacity-0 translate-y-4 scale-95 blur-4',
+        leaveToClass: cn('opacity-0 translate-y-4 scale-95 blur-4', CSS.supports('height', 'calc-size(auto, size)') && 'h-0'),
       }
 })
 
@@ -140,7 +143,7 @@ function handleMouseenter() {
           top = el.getBoundingClientRect().top + el.scrollTop
           left = el.getBoundingClientRect().left + el.getBoundingClientRect().width
           if (top + subMenuEl.offsetHeight > window.innerHeight) {
-            top = window.innerHeight - subMenuEl.offsetHeight
+            top = Math.max(0, window.innerHeight - subMenuEl.offsetHeight)
           }
         }
         else {
@@ -188,7 +191,7 @@ function handleMouseleave() {
   <Teleport v-if="hasChildren" to="body" :disabled="!rootMenu.isMenuPopup">
     <Transition v-bind="transitionClass" v-on="transitionEvent">
       <FaScrollArea
-        v-if="opened" ref="subMenuRef" :scrollbar="false" :mask="rootMenu.isMenuPopup" class="sub-menu static rounded-lg" :class="{
+        v-if="opened" ref="subMenuRef" :scrollbar="false" :mask="rootMenu.isMenuPopup" class="sub-menu static h-[calc-size(auto,size)] rounded-lg" :class="{
           'bg-[var(--g-sub-sidebar-bg)]': rootMenu.isMenuPopup,
           'border shadow-xl fixed! z-3000 w-[200px]': rootMenu.isMenuPopup,
           'mx-1': rootMenu.isMenuPopup && (rootMenu.props.mode === 'vertical' || level !== 0),