diff --git a/packages/ui-vue/components/date-picker/src/components/calendar-navbar/calendar-navbar.component.tsx b/packages/ui-vue/components/date-picker/src/components/calendar-navbar/calendar-navbar.component.tsx
index 5102b2890af9e682113a6b6e867ae96040b87dcd..9346b013b81afbf117f29f7360a3574521f1e90b 100644
--- a/packages/ui-vue/components/date-picker/src/components/calendar-navbar/calendar-navbar.component.tsx
+++ b/packages/ui-vue/components/date-picker/src/components/calendar-navbar/calendar-navbar.component.tsx
@@ -186,7 +186,7 @@ export default defineComponent({
             }
 
             return (
-                <div class={navbarClass.value}>
+                <div class={navbarClass.value} style="height:40px; overflow:hidden;">
                     <div class="f-datepicker-prev-btn">
                         <button type="button" class={prePageButtonClass.value} onClick={navigateToPreviousPage}>
                             <i class="f-icon f-icon-arrow-double-60-left"></i>
diff --git a/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.component.tsx b/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.component.tsx
index 7c24b3cce5060570061213907ef1d42f9fae6157..ebdad418a1d5b5c6befa4774d6c7a819b8755f3a 100644
--- a/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.component.tsx
+++ b/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.component.tsx
@@ -729,7 +729,7 @@ export default defineComponent({
                     {props.showTime && <div
                         class="f-datepicker-content position-relative datepicker-content-has-timer"
                         style="width:200px">
-                        <div style="height: 41px;
+                        <div style="height: 40px;
                                 border-bottom: 1px solid #E4E7EF;
                                 text-align: center;
                                 line-height: 40px;
diff --git a/packages/ui-vue/components/message-box/exception-message.scss b/packages/ui-vue/components/message-box/exception-message.scss
index 18c8589f4d9c9d20cfa35b177f9547f28f57be7c..f74503b85df9404b53c297ed95cda14b417bd7fe 100644
--- a/packages/ui-vue/components/message-box/exception-message.scss
+++ b/packages/ui-vue/components/message-box/exception-message.scss
@@ -7,63 +7,6 @@
 
 .exception_error_msg {
     line-height: 1.5;
-    /* 设置最大高度2行，超过隐藏 */
-    max-height: 3em;
     overflow: hidden;
     min-height: 66px;
-    text-overflow: ellipsis;
-    -webkit-line-clamp: 3;
-    -webkit-box-orient: vertical;
-    display: -webkit-box;
-}
-
-.exception_error_msg::before {
-    content: '';
-    float: right;
-    width: 0;
-    height: 100%;
-    margin-bottom: -24px;
-}
-
-.exception_error_msg::after {
-    /* 给exception_error_msg添加一个伪元素，在文本后面，并将背景色设置白色，起到遮盖住‘展开收起’按钮的作用，需要注意的是，展开后需要把伪元素遮盖层隐藏，并且将省略号置为空 */
-    content: '';
-    width: 100%;
-    height: 100%;
-    position: absolute;
-    background-color: #fff;
-}
-
-.exception_wrap .swith {
-    float: right;
-    clear: both;
-    color: #2A87FF;
-}
-
-
-
-.exception_wrap .swith::after {
-    content: '展开';
-    padding-left: 15px;
-    cursor: pointer;
-}
-
-
-.exp_switch:checked+.exception_error_msg {
-    max-height: 480px;
-    -webkit-line-clamp: 20!important;
-}
-
-.exp_switch:checked+.exception_error_msg .swith::after {
-    content: '收起';
-    cursor: pointer;
-}
-
-.exp_switch:checked+.exception_error_msg::after {
-    /* 避免点击展开按钮后导致收起按钮被遮挡而无法切换回去的问题 */
-    visibility: hidden;
-}
-
-.exp_switch:checked+.exception_error_msg .swith::before {
-    content: '';
 }
\ No newline at end of file
diff --git a/packages/ui-vue/components/message-box/src/components/message-detail/exception-message.component.tsx b/packages/ui-vue/components/message-box/src/components/message-detail/exception-message.component.tsx
index a375a20d4eae6471471f5c9034bf68af842a2006..ec68478bba0c3f56dc807dc87be1d3193ea6cb7b 100644
--- a/packages/ui-vue/components/message-box/src/components/message-detail/exception-message.component.tsx
+++ b/packages/ui-vue/components/message-box/src/components/message-detail/exception-message.component.tsx
@@ -3,8 +3,48 @@ import { ExceptionInfo } from "../../message-box.props";
 
 export default function (exception: Ref<ExceptionInfo | null>) {
 
-    // const showLines = ref(3);
-    // const exceptionMessageMaxHeight = ref(480);
+    function getRealLength(value: string){
+        if (value == null) {
+            return 0;
+        }
+
+        let strLength = 0; // 记录str的总长度
+        for(let i=0;i< value.length;i++){
+            const charCode = value.charCodeAt(i);// 使用charCodeAt返回单个字符的Unicode编码
+            if(charCode>=0 && charCode<=128){
+                strLength++; // 英文字符加1
+            }else {
+                strLength= strLength+2;// 中文字符加2
+            }
+        }
+        return strLength;
+    }
+
+    function subStrNum(value: string, substringLeng: number) {
+        if (value !== '' && value !== undefined && value !== null) {
+            value = '' + value;
+            const strLen = value.length;
+            let strCut = '';
+            let strLength =0;
+            for(let i=0;i<strLen;i++){
+                const charStr = value.charAt(i); // 使用charAt获取单个字符；
+                strLength++;
+                if(encodeURI(charStr).length>4){ // 使用encodeURI获取编码长度
+                    strLength++;
+                }
+                strCut = strCut.concat(charStr); // 单个字符进行合并
+                if(strLength >= substringLeng){
+                    strCut = strCut.concat('...'); // 大于指定长度后合并'...'并返回此字符串
+                    return strCut;
+                }
+            }
+            if(strLength<substringLeng){
+                return value;
+            }
+        }
+
+        return  '';
+    }
 
     const shouldShowExceptionDate = computed(() => {
         return !!exception.value && !!exception.value.date;
@@ -19,92 +59,48 @@ export default function (exception: Ref<ExceptionInfo | null>) {
         return !!exception.value && !!exception.value.detail;
     });
 
+    const shouldShowExpandHandle = computed(() => {
+        return  exception.value? (getRealLength(exception.value.detail) > 160): false;
+    });
+
+
+    const showDetailInfo = ref(false);
+    const toggleDetailText = computed(() => {
+        return showDetailInfo.value ? '收起' : '展开';
+    });
+
+    
     const safeExceptionMessage = computed(() => {
-        const safeMessage = (exception.value && exception.value.detail) || '';
-        return '详细信息 : ' + safeMessage;
+        const safeMessage = '详细信息 : ' + (exception.value && exception.value.detail) || '';
+        return showDetailInfo.value? safeMessage: subStrNum(safeMessage, 160);
     });
 
-    const exceptionMessageId = 'exp_switch_' + new Date().getTime();
-
-    // const exceptionMessageStyle = computed(() => {
-    //     const maxHeight = `${exceptionMessageMaxHeight.value}px`;
-    //     const styleObject = {
-    //         overflow: 'hidden',
-    //         'text-overflow': 'ellipsis',
-    //         display: '-webkit-box',
-    //         '-webkit-box-orient': 'vertical',
-    //         '-webkit-line-clamp': showLines.value,
-    //         'max-height': maxHeight
-    //     };
-    //     return styleObject;
-    // });
-
-    // const shouldShowExpandHandle = computed(() => {
-    //     return true;
-    // });
-
-    // const expandExceptionMessage = ref(false);
-    // const expandText = ref('展开');
-    // const collapseText = ref('收起');
-    // const expandHandleStyle = computed(() => {
-    //     const styleObject = {
-    //         display: 'block',
-    //         color: '#2A87FF'
-    //     } as Record<string, any>;
-    //     styleObject['text-align'] = expandExceptionMessage.value ? '' : 'right';
-    //     return styleObject;
-    // });
-
-    // function toggalExceptionMessage(expand: boolean, $event: Event) {
-    //     expandExceptionMessage.value = !expandExceptionMessage.value;
-    //     showLines.value = expandExceptionMessage.value ? 20 : 3;
-    // }
-
-    // function onClickExpand(payload: MouseEvent) {
-    //     return toggalExceptionMessage(true, payload);
-    // }
-
-    // function onClickCollapse(payload: MouseEvent) {
-    //     return toggalExceptionMessage(true, payload);
-    // }
+    const toggleDetailButtonStyles = computed(() => {
+        return {
+            position: 'absolute',
+            right: 0,
+            bottom:  showDetailInfo.value?0 : '2px',
+            color: '#2A87FF',
+            cursor: 'pointer'
+        };
+    });
+
+    function toggleDetail() {
+        showDetailInfo.value = !showDetailInfo.value;
+    }
 
     return () => {
         return (
             <div class="toast-msg-detail">
                 {shouldShowExceptionDate.value && <div>{exceptionDateMessage.value}</div>}
                 {shouldShowExceptionMessage.value && (
-                    /* <div id="exception_error_msg" class="exception_error_msg" ref="exceptionMessageRef" style={exceptionMessageStyle.value}>
-                        <input type="checkbox" id="exp_switch" class="d-none exp_switch" />
-                        <div>详细信息:
-                            <label class="swith" for="exp_switch"></label>
-                            <span v-html={safeExceptionMessage.value}></span>
-                        </div>
-                    </div> */
-
-                    <div class="exception_wrap">
-                        <input type="checkbox" id={exceptionMessageId} class="d-none exp_switch" />
+                     <div class="exception_wrap">
                         <div class="exception_error_msg">
-                            <label class="swith" htmlFor={exceptionMessageId}></label>
                             <div v-html={safeExceptionMessage.value}></div>
+                            {shouldShowExpandHandle.value && <span style={toggleDetailButtonStyles.value} onClick={toggleDetail}>{toggleDetailText.value}</span>}
                         </div>
                     </div>
-
-
                 )}
-                {/* {shouldShowExpandHandle.value && (
-                    <span style={expandHandleStyle.value}>
-                        {expandExceptionMessage.value && (
-                            <span onClick={onClickExpand} style="cursor: pointer;">
-                                {collapseText.value}
-                            </span>
-                        )}
-                        {!expandExceptionMessage.value && (
-                            <span onClick={onClickCollapse} style="cursor: pointer;">
-                                {expandText.value}
-                            </span>
-                        )}
-                    </span>
-                )} */}
             </div>
         );
     };
diff --git a/packages/ui-vue/components/modal/src/composition/modal.service.tsx b/packages/ui-vue/components/modal/src/composition/modal.service.tsx
index 2339bf9910ce67df36eb9467db29119fc6ef0fdd..cd551838aeed98156d4771bbaf00d47fbad23b06 100644
--- a/packages/ui-vue/components/modal/src/composition/modal.service.tsx
+++ b/packages/ui-vue/components/modal/src/composition/modal.service.tsx
@@ -271,7 +271,7 @@ export default class ModalService {
             update,
             destroy,
             modalRef: this.activeModalInstance,
-            close: this.close
+            close: () => this.close()
         };
     }
 }
diff --git a/packages/ui-vue/components/tooltip/src/tooltip.directive.tsx b/packages/ui-vue/components/tooltip/src/tooltip.directive.tsx
index 5372be26b708de299fd690852d94ae487d174fb3..a11f0e0d59249d4bf4867f787f1dd70811b16ae6 100644
--- a/packages/ui-vue/components/tooltip/src/tooltip.directive.tsx
+++ b/packages/ui-vue/components/tooltip/src/tooltip.directive.tsx
@@ -134,7 +134,8 @@ function triggerByClick(element: any, binding: Record<string, any>) {
             farrisTooltipInstances.delete(element);
         }
     });
-    !tooltipClickHandler && document.body.addEventListener('click', tooltipClickHandler = ($event: MouseEvent) => {
+    document.body.removeEventListener('click', tooltipClickHandler, true);
+    document.body.addEventListener('click', tooltipClickHandler = ($event: MouseEvent) => {
         const target = $event.target as any;
         const tooltipElement = target.closest(`.${tooltipDirectiveClass}`);
         if (tooltipElement && farrisTooltipInstances.has(tooltipElement)) {
@@ -156,6 +157,16 @@ function storePropertyToElement(element: any, binding: Record<string, any>) {
     }
 }
 
+function destoryTooltip(element: any, binding: any) {
+    if (binding.value.trigger === 'click') {
+        document.body.removeEventListener('click', tooltipClickHandler, true);
+    } else {
+        // 修复没有来得及执行mouseleave的元素
+        deleteTooltipInstance(element);
+    }
+}
+
+
 const tooltipDirective = {
     mounted: (element: any, binding: Record<string, any>, vnode: any) => {
         element.classList.add(tooltipDirectiveClass);
@@ -170,15 +181,12 @@ const tooltipDirective = {
                 triggerByHover(element, binding);
             }
         }
-
+    },
+    beforeUnmount: (element: any, binding: Record<string, any>, vnode: any) => {
+        destoryTooltip(element, binding);
     },
     unmounted: (element: any, binding: Record<string, any>, vnode: any) => {
-        if (binding.value.trigger === 'click') {
-            document.body.removeEventListener('click', tooltipClickHandler, true);
-        } else {
-            // 修复没有来得及执行mouseleave的元素
-            deleteTooltipInstance(element);
-        }
+        destoryTooltip(element, binding);
     },
     beforeUpdate: (element: any, binding: Record<string, any>) => {
         storePropertyToElement(element, binding);