From f8f5bc476bbffdeae8e034371e1f47c88c158db6 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Fri, 15 Dec 2023 00:14:48 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=9C=AA=E8=AF=BB?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=9C=BA=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/pages/manage/components/DialogItem.vue | 41 ++++++++-----------
 .../pages/manage/components/DialogWrapper.vue | 20 ++++++++-
 2 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/resources/assets/js/pages/manage/components/DialogItem.vue b/resources/assets/js/pages/manage/components/DialogItem.vue
index a749f627f..99bb1e127 100644
--- a/resources/assets/js/pages/manage/components/DialogItem.vue
+++ b/resources/assets/js/pages/manage/components/DialogItem.vue
@@ -104,10 +104,10 @@ export default {
             type: Number,
             default: 0
         },
-    },
-
-    mounted() {
-        this.checkWatch()
+        msgReady: {
+            type: Boolean,
+            default: false
+        },
     },
 
     computed: {
@@ -121,7 +121,7 @@ export default {
             return this.simpleView || this.msgId === this.source.id
         },
 
-        isNoWatch() {
+        isNoRead() {
             return this.isRightMsg || this.source.read_at
         },
 
@@ -148,32 +148,25 @@ export default {
     },
 
     watch: {
-        source() {
+        msgReady() {
             this.msgRead();
         },
-        windowActive(active) {
-            if (!active) {
-               return
-            }
+        windowActive() {
             this.msgRead();
-        }
+        },
+        scrollIng() {
+            this.msgRead();
+        },
     },
 
     methods: {
-        checkWatch() {
-            if (this.isNoWatch) {
-                return
-            }
-            const watchr = this.$watch("scrollIng", _ => {
-                if (this.isNoWatch) {
-                    watchr()
-                    return
-                }
-                this.msgRead()
-            })
-        },
-
         msgRead() {
+            if (this.isNoRead) {
+                return;
+            }
+            if (!this.msgReady) {
+                return;
+            }
             if (!this.windowActive) {
                 return;
             }
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index ffe7c3cd8..e952ed949 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -155,7 +155,7 @@
             :data-component="msgItem"
 
             :item-class-add="itemClassAdd"
-            :extra-props="{dialogData, operateVisible, operateItem, isMyDialog, msgId, unreadMsgId, scrollIng}"
+            :extra-props="{dialogData, operateVisible, operateItem, isMyDialog, msgId, unreadMsgId, scrollIng, msgReady}"
             :estimate-size="dialogData.type=='group' ? 105 : 77"
             :keeps="25"
             :disabled="scrollDisabled"
@@ -658,6 +658,7 @@ export default {
             approvaUserStatus: '',
 
             positionLoad: 0,            // 定位跳转加载中
+            msgReady: false,            // 消息准备完成
             unreadMsgId: 0,             // 最早未读消息id
             toBottomReGetMsg: false,    // 滚动到底部重新获取消息
         }
@@ -997,6 +998,7 @@ export default {
                     this.msgNew = 0
                     this.msgType = ''
                     this.searchShow = false
+                    this.msgReady = false
                     this.unreadMsgId = 0
                     this.toBottomReGetMsg = false
                     //
@@ -1010,6 +1012,7 @@ export default {
                         msg_type: this.msgType,
                     }).then(_ => {
                         this.openId = dialog_id;
+                        this.onMsgReady()
                         setTimeout(this.onSearchMsgId, 100)
                     }).catch(_ => {});
                     //
@@ -1462,6 +1465,21 @@ export default {
             return true
         },
 
+        onMsgReady() {
+            let count = 0;
+            let offsetA = this.scrollInfo().offset
+            const func = () => {
+                const offsetB = this.scrollInfo().offset
+                if (++count > 10 || offsetA == offsetB) {
+                    this.msgReady = true
+                    return
+                }
+                offsetA = offsetB
+                setTimeout(func, 200);
+            }
+            setTimeout(func, 200);
+        },
+
         onSearchMsgId() {
             if (this.dialogSearchMsgId > 0 && this.openId === this.dialogId) {
                 this.onPositionId(this.dialogSearchMsgId)