From c5f8ebd01e0574aa72ef63c54334303242b3fa42 Mon Sep 17 00:00:00 2001
From: ajaxzheng <894103554@qq.com>
Date: Wed, 26 Mar 2025 17:27:14 +0800
Subject: [PATCH 1/2] fix(calendar-view): [calendar-view] increase the maximum
 height and overflow handling of calendar-view tooltip content to optimize
 display effect

---
 packages/theme-saas/src/calendar-view/index.less    | 2 ++
 packages/theme/src/calendar-view/index.less         | 5 +++++
 packages/vue/src/calendar-view/src/mobile-first.vue | 2 +-
 packages/vue/src/tooltip/src/mobile-first.vue       | 8 +++++++-
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/packages/theme-saas/src/calendar-view/index.less b/packages/theme-saas/src/calendar-view/index.less
index fd498ea686..4d8299c7fe 100644
--- a/packages/theme-saas/src/calendar-view/index.less
+++ b/packages/theme-saas/src/calendar-view/index.less
@@ -630,6 +630,8 @@
   @apply ~'max-w-[theme(spacing.80)]';
 
   .tooltip-main{
+    @apply overflow-auto;
+    @apply max-h-[80vh];
     @apply p-2;
 
     .title{
diff --git a/packages/theme/src/calendar-view/index.less b/packages/theme/src/calendar-view/index.less
index 71d2803fa6..0607305eed 100644
--- a/packages/theme/src/calendar-view/index.less
+++ b/packages/theme/src/calendar-view/index.less
@@ -630,12 +630,17 @@
   .inject-CalendarView-vars();
   position: absolute;
   max-width: 320px;
+
   .tooltip-main {
+    overflow: auto;
+    max-height: 80vh;
     padding: var(--tv-CalendarView-tooltip-title-font-size);
+
     .title {
       font-size: var(--tv-CalendarView-tooltip-title-font-size);
       font-weight: var(--tv-CalendarView-tooltip-title-font-weight);
     }
+
     .date {
       margin: 6px 0;
       color: var(--tv-CalendarView-tooltip-date-text-color);
diff --git a/packages/vue/src/calendar-view/src/mobile-first.vue b/packages/vue/src/calendar-view/src/mobile-first.vue
index e5e8f654d3..2fc31fbfd5 100644
--- a/packages/vue/src/calendar-view/src/mobile-first.vue
+++ b/packages/vue/src/calendar-view/src/mobile-first.vue
@@ -3,7 +3,7 @@
     <tiny-tooltip
       ref="tooltip"
       v-model="state.eventTipVisible"
-      popper-class="absolute max-w-[theme(spacing.80)]"
+      popper-class="absolute max-w-[theme(spacing.80)] max-h-[80vh] overflow-auto"
       :manual="true"
       effect="light"
       placement="right"
diff --git a/packages/vue/src/tooltip/src/mobile-first.vue b/packages/vue/src/tooltip/src/mobile-first.vue
index fdb36505b4..be2cafd4fd 100644
--- a/packages/vue/src/tooltip/src/mobile-first.vue
+++ b/packages/vue/src/tooltip/src/mobile-first.vue
@@ -136,6 +136,8 @@ export default defineComponent({
                 component: {
                   render: () => {
                     let content = getContent(this)
+                    // 当内容为纯文本时，添加一层wrapper，其他情况（插槽、renderContent）原样输出
+                    const addWrapper = typeof content === 'string'
                     let propsData = { on: { 'after-leave': this.doDestroy } }
                     let mouseenter = () => this.setExpectedState(true)
                     let mouseleave = () => {
@@ -163,7 +165,11 @@ export default defineComponent({
                         aria-hidden={this.disabled || !this.state.showPopper ? 'true' : 'false'}
                         onMouseenter={() => mouseenter()}
                         onMouseleave={() => mouseleave()}>
-                        <div style={`overflow:auto; max-height:${this.contentMaxHeight}`}>{content}</div>
+                        {addWrapper ? (
+                          <div style={`overflow:auto;max-height:${this.contentMaxHeight}`}>{content}</div>
+                        ) : (
+                          content
+                        )}
                         {this.visibleArrow ? (
                           <div
                             x-arrow

From 05c7bcf93b6a056ce565bfcfbb435f47cde160d9 Mon Sep 17 00:00:00 2001
From: ajaxzheng <894103554@qq.com>
Date: Wed, 26 Mar 2025 17:49:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(calendar-view):=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E6=97=A5=E5=8E=86=E8=A7=86=E5=9B=BE=E5=B7=A5=E5=85=B7=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E5=86=85=E5=AE=B9=E7=9A=84=E6=9C=80=E5=A4=A7=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6=E5=92=8C=E6=BA=A2=E5=87=BA=E5=A4=84=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A5=E4=BC=98=E5=8C=96=E6=98=BE=E7=A4=BA=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/vue/src/calendar-view/src/mobile-first.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/vue/src/calendar-view/src/mobile-first.vue b/packages/vue/src/calendar-view/src/mobile-first.vue
index 2fc31fbfd5..cd8e05d450 100644
--- a/packages/vue/src/calendar-view/src/mobile-first.vue
+++ b/packages/vue/src/calendar-view/src/mobile-first.vue
@@ -3,13 +3,13 @@
     <tiny-tooltip
       ref="tooltip"
       v-model="state.eventTipVisible"
-      popper-class="absolute max-w-[theme(spacing.80)] max-h-[80vh] overflow-auto"
+      popper-class="absolute max-w-[theme(spacing.80)]"
       :manual="true"
       effect="light"
       placement="right"
     >
       <template #content>
-        <div class="p-2">
+        <div class="p-2 max-h-[80vh] overflow-auto">
           <div class="px-1.5 mb-1.5 border-l-2 border-color-brand">{{ state.eventTipContent.title }}</div>
           <div class="mb-1.5 px-2 text-color-text-placeholder">
             {{ state.eventTipContent.startDay }} {{ state.eventTipContent.startTime }} ~