From 3cce9b67d4e48f3e4c34f4b13e69e698bb4804d1 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Thu, 14 Dec 2023 21:05:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E4=BB=A5=E4=B8=8B?=
 =?UTF-8?q?=E4=B8=BA=E6=96=B0=E6=B6=88=E6=81=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 language/original-web.txt                     |  2 ++
 .../js/pages/manage/components/DialogItem.vue | 12 +++++++++
 .../pages/manage/components/DialogWrapper.vue | 11 +++++++-
 .../sass/pages/components/dialog-wrapper.scss | 25 +++++++++++++++++++
 4 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/language/original-web.txt b/language/original-web.txt
index 62317e77b..d410a4ced 100644
--- a/language/original-web.txt
+++ b/language/original-web.txt
@@ -1411,3 +1411,5 @@ APP推送
 当前服务器
 你确定取消待办吗？
 取消成功
+
+以下为新消息
diff --git a/resources/assets/js/pages/manage/components/DialogItem.vue b/resources/assets/js/pages/manage/components/DialogItem.vue
index 464ec93e2..a749f627f 100644
--- a/resources/assets/js/pages/manage/components/DialogItem.vue
+++ b/resources/assets/js/pages/manage/components/DialogItem.vue
@@ -1,5 +1,8 @@
 <template>
     <div :class="classArray">
+        <div v-if="isUnreadStart" class="dialog-unread-label">
+            <em></em><span>{{$L('以下为新消息')}}</span><em></em>
+        </div>
         <div v-if="source.type === 'tag'" class="dialog-tag" @click="onViewTag">
             <div class="tag-user"><UserAvatar :userid="source.userid" :show-name="true" :show-icon="false"/></div>
             {{$L(source.msg.action === 'remove' ? '取消标注' : '标注了')}}
@@ -93,6 +96,10 @@ export default {
             type: Number,
             default: 0
         },
+        unreadMsgId: {
+            type: Number,
+            default: 0
+        },
         scrollIng: {
             type: Number,
             default: 0
@@ -118,6 +125,10 @@ export default {
             return this.isRightMsg || this.source.read_at
         },
 
+        isUnreadStart() {
+            return this.unreadMsgId === this.source.id
+        },
+
         hidePercentage() {
             return this.simpleView || this.isMyDialog || this.isReply
         },
@@ -130,6 +141,7 @@ export default {
             return {
                 'dialog-item': true,
                 'reply-item': this.isReply,
+                'unread-start': this.isUnreadStart,
                 'self': this.isRightMsg,
             }
         },
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index 2c3511a46..6fac88c31 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, scrollIng}"
+            :extra-props="{dialogData, operateVisible, operateItem, isMyDialog, msgId, unreadMsgId, scrollIng}"
             :estimate-size="dialogData.type=='group' ? 105 : 77"
             :keeps="25"
             :disabled="scrollDisabled"
@@ -570,6 +570,7 @@ export default {
             msgNew: 0,
             msgType: '',
             loadIng: 0,
+            unreadMsgId: 0,
 
             allMsgs: [],
             tempMsgs: [],
@@ -964,6 +965,7 @@ export default {
             }
             const item = $A.cloneJSON(position_msgs[0])
             if (item.label === '{UNREAD}') {
+                item.is_unread = unread > 1
                 item.label = this.$L(`未读消息${unread}条`)
             }
             return item
@@ -994,6 +996,7 @@ export default {
                     this.msgNew = 0
                     this.msgType = ''
                     this.searchShow = false
+                    this.unreadMsgId = 0
                     //
                     if (this.allMsgList.length > 0) {
                         this.allMsgs = this.allMsgList
@@ -1197,6 +1200,12 @@ export default {
                     requestAnimationFrame(this.onToBottom)
                 }
             }
+        },
+
+        positionMsg(msg) {
+            if (msg && msg.is_unread === true) {
+                this.unreadMsgId = msg.msg_id
+            }
         }
     },
 
diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss
index b2224528d..56310989b 100644
--- a/resources/assets/sass/pages/components/dialog-wrapper.scss
+++ b/resources/assets/sass/pages/components/dialog-wrapper.scss
@@ -1115,6 +1115,31 @@
 
             }
 
+            &.unread-start {
+                position: relative;
+                padding-top: 44px;
+                .dialog-unread-label {
+                    position: absolute;
+                    top: 4px;
+                    left: 0;
+                    right: 0;
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
+                    > em {
+                        height: 1px;
+                        background-color: #e9e9e9;
+                        flex: 1;
+                        margin: 0 12px;
+                        max-width: 60px;
+                    }
+                    > span {
+                        font-size: 12px;
+                        color: $primary-desc-color;
+                    }
+                }
+            }
+
             &.loading {
                 height: 20px;
                 box-sizing: content-box;