From a08883fdb3dfa2ad46961acd842ae57f249e9fbd Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Mon, 12 Aug 2024 13:58:25 +0800
Subject: [PATCH]  * [refac bug #53698]

---
 module/message/css/ajaxgetdropmenu.ui.css          | 2 +-
 module/message/view/ajaxgetdropmenuforold.html.php | 2 +-
 www/js/my.full.js                                  | 2 --
 www/js/zui3/zin.js                                 | 2 --
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/module/message/css/ajaxgetdropmenu.ui.css b/module/message/css/ajaxgetdropmenu.ui.css
index 2683ef2a91..141ca9fe6a 100644
--- a/module/message/css/ajaxgetdropmenu.ui.css
+++ b/module/message/css/ajaxgetdropmenu.ui.css
@@ -1,3 +1,3 @@
 #messageTabs .tabs-header{border-bottom-width: 1px;}
-#header .messageDropdownBox{z-index:100 !important;}
+#header #dropdownMessageMenu{background-color: #fff; overflow-y: auto; max-height: calc(100vh - 50px); min-height: 280px}
 #messageTabs .label-dot{width:5px; height:5px; vertical-align: middle;}
diff --git a/module/message/view/ajaxgetdropmenuforold.html.php b/module/message/view/ajaxgetdropmenuforold.html.php
index 4cb9e5eddb..667c092d80 100644
--- a/module/message/view/ajaxgetdropmenuforold.html.php
+++ b/module/message/view/ajaxgetdropmenuforold.html.php
@@ -110,7 +110,7 @@ $buildMessageList = function($messageGroup) use ($lang, $noDataHtml)
 .switch>label:hover:before { border-color: gba(235, 237, 243); }
 .switch>input:checked+label:after { color: #3883fa; left: 18px; }
 
-#header .messageDropdownBox{z-index:100 !important;}
+#header #dropdownMessageMenu{background-color: #fff; overflow-y: auto; max-height: calc(100vh - 50px); min-height: 280px;}
 </style>
 
 <div id='messageTabs' class='text-black pt-10px px-5 pb-5 relative' style='width:400px; background-color:#fff; color: rgb(49, 60, 82)'>
diff --git a/www/js/my.full.js b/www/js/my.full.js
index 9f38846281..a59be89a6f 100755
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -1341,7 +1341,6 @@ function fetchMessage(force, fetchUrl)
 {
     let $this     = $('#messageBar');
     let $dropmenu = $("#dropdownMessageMenu");
-    let maxHeight = $(window).height() - $('#header').height() - 5;
     let isOpen    = $this.hasClass('open');
 
     if(typeof(force) === 'undefined' || typeof(force) === 'object') force = false;
@@ -1353,6 +1352,5 @@ function fetchMessage(force, fetchUrl)
     }
     if(isOpen && !force) return;
 
-    $dropmenu.css('height', maxHeight).css('max-height', maxHeight).css('overflow-y', 'auto').css('background-color', '#fff');
     $dropmenu.load(fetchUrl);
 }
diff --git a/www/js/zui3/zin.js b/www/js/zui3/zin.js
index a99b9e25c5..d2f9c6c13f 100644
--- a/www/js/zui3/zin.js
+++ b/www/js/zui3/zin.js
@@ -1562,7 +1562,6 @@
     {
         let $this     = $('#messageBar');
         let $dropmenu = $("#dropdownMessageMenu");
-        let maxHeight = $(window).height() - $('#header').height() - 5;
 
         if(typeof(force) === 'undefined' || typeof(force) === 'object') force = false;
         if(typeof(fetchUrl) === 'undefined') fetchUrl = $this.attr('data-fetcher');
@@ -1574,7 +1573,6 @@
             if(dropdown) isOpen = dropdown.shown;
             if(!isOpen && !force) return;
 
-            $dropmenu.css('height', maxHeight).css('max-height', maxHeight).css('overflow-y', 'auto').css('background-color', '#fff');
             $dropmenu.load(fetchUrl);
         }, 100);
     }