From 45e663fcf886f8ec42fcfe1e193d737b15380c1f Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Thu, 24 Apr 2025 20:15:10 +0800
Subject: [PATCH] no message

---
 .../assets/js/components/DropdownMenu.vue     |  6 ++--
 .../manage/components/ChatInput/index.vue     |  5 +--
 .../pages/manage/components/DialogWrapper.vue | 32 +++++++++++++------
 resources/mobile                              |  2 +-
 4 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/resources/assets/js/components/DropdownMenu.vue b/resources/assets/js/components/DropdownMenu.vue
index 70e30af70..f81d00c49 100644
--- a/resources/assets/js/components/DropdownMenu.vue
+++ b/resources/assets/js/components/DropdownMenu.vue
@@ -79,7 +79,7 @@ export default {
                 const eventRect = data.event.target.getBoundingClientRect();
                 this.styles = {
                     left: `${eventRect.left}px`,
-                    top: `${eventRect.top}px`,
+                    top: `${eventRect.top + this.windowScrollY}px`,
                     width: `${eventRect.width}px`,
                     height: `${eventRect.height}px`,
                 }
@@ -109,7 +109,7 @@ export default {
             const eventRect = this.menuTarget.getBoundingClientRect();
             this.styles = {
                 left: `${eventRect.left}px`,
-                top: `${eventRect.top}px`,
+                top: `${eventRect.top + this.windowScrollY}px`,
                 width: `${eventRect.width}px`,
                 height: `${eventRect.height}px`,
             };
@@ -188,7 +188,7 @@ export default {
             }
             this.styles = {
                 left: `${eventRect.left}px`,
-                top: `${eventRect.top}px`,
+                top: `${eventRect.top + this.windowScrollY}px`,
                 width: `${eventRect.width}px`,
                 height: `${eventRect.height}px`,
             };
diff --git a/resources/assets/js/pages/manage/components/ChatInput/index.vue b/resources/assets/js/pages/manage/components/ChatInput/index.vue
index 489805846..2ff4d2e44 100755
--- a/resources/assets/js/pages/manage/components/ChatInput/index.vue
+++ b/resources/assets/js/pages/manage/components/ChatInput/index.vue
@@ -24,7 +24,7 @@
             </EPopover>
         </div>
 
-        <div ref="inputWrapper" class="chat-input-wrapper" @click.stop="focus">
+        <div ref="inputWrapper" class="chat-input-wrapper">
             <!-- 回复、修改 -->
             <div v-if="quoteData" class="chat-quote">
                 <div v-if="quoteUpdate" class="quote-label">{{$L('编辑消息')}}</div>
@@ -78,7 +78,7 @@
                     </ETooltip>
                 </li>
 
-                <!-- 图片文件 -->
+                <!-- 加号更多 -->
                 <li>
                     <EPopover
                         ref="more"
@@ -1305,6 +1305,7 @@ export default {
         onClickEditor() {
             this.clearSearchKey()
             this.updateEmojiQuick(this.value)
+            this.focus()
             inputLoadAdd(this._uid)
         },
 
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index ace5c558f..15c1be44c 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -235,15 +235,8 @@
         </div>
 
         <!--底部输入-->
-        <div ref="footer" class="dialog-footer" @click="onActive">
-            <div
-                v-if="scrollTail > 500 || (msgNew > 0 && allMsgs.length > 0)"
-                class="dialog-goto"
-                v-touchclick="onToBottom">
-                <Badge :overflow-count="999" :count="msgNew">
-                    <i class="taskfont">&#xe72b;</i>
-                </Badge>
-            </div>
+        <div ref="footer" class="dialog-footer" @click="onClickFooter">
+            <!--上传组件-->
             <DialogUpload
                 ref="chatUpload"
                 class="chat-upload"
@@ -252,6 +245,18 @@
                 @on-progress="chatFile('progress', $event)"
                 @on-success="chatFile('success', $event)"
                 @on-error="chatFile('error', $event)"/>
+
+            <!--滚动到底部-->
+            <div
+                v-if="scrollTail > 500 || (msgNew > 0 && allMsgs.length > 0)"
+                class="dialog-goto"
+                v-touchclick="onToBottom">
+                <Badge :overflow-count="999" :count="msgNew">
+                    <i class="taskfont">&#xe72b;</i>
+                </Badge>
+            </div>
+
+            <!--待办-->
             <div v-if="todoShow" class="chat-bottom-menu">
                 <div class="bottom-menu-label">{{$L('待办')}}:</div>
                 <ul class="scrollbar-hidden">
@@ -260,6 +265,8 @@
                     </li>
                 </ul>
             </div>
+
+            <!--菜单-->
             <div v-else-if="quickShow" class="chat-bottom-menu">
                 <ul class="scrollbar-hidden">
                     <li v-for="item in quickMsgs" @click.stop="sendQuick(item, $event)">
@@ -267,6 +274,8 @@
                     </li>
                 </ul>
             </div>
+
+            <!--禁言、停用、输入-->
             <div v-if="isMute" class="chat-mute">
                 {{$L('禁言发言')}}
             </div>
@@ -2518,6 +2527,11 @@ export default {
             this.$emit("on-active");
         },
 
+        onClickFooter() {
+            this.$refs.input?.focus();
+            this.onActive();
+        },
+
         onToBottom() {
             this.msgNew = 0;
             const scroller = this.$refs.scroller;
diff --git a/resources/mobile b/resources/mobile
index 722f44028..6f1927596 160000
--- a/resources/mobile
+++ b/resources/mobile
@@ -1 +1 @@
-Subproject commit 722f44028ab1afeb32ce33ff1dad9b11e26f863b
+Subproject commit 6f1927596166ba861579f645281e12f68af4f0c5