From 37407cdbac9361ab532830ccd1bbc1cef77a97fc Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Wed, 1 May 2024 15:17:58 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E8=BD=AC=E5=8F=91?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/WebSocketDialogMsg.php                          | 5 +++++
 resources/assets/sass/pages/components/dialog-wrapper.scss | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/app/Models/WebSocketDialogMsg.php b/app/Models/WebSocketDialogMsg.php
index 901a9cbb3..d60db901c 100644
--- a/app/Models/WebSocketDialogMsg.php
+++ b/app/Models/WebSocketDialogMsg.php
@@ -390,6 +390,11 @@ class WebSocketDialogMsg extends AbstractModel
             $forwardData = is_array($msgData['forward_data']) ? $msgData['forward_data'] : [];
             $forwardId = $forwardData['id'] ?: $this->id;
             $forwardUserid = $forwardData['userid'] ?: $this->userid;
+            if ($forwardData['show'] === 0) {
+                // 如果上一条消息不显示原发送者信息，则转发的消息原始数据为当前消息
+                $forwardId = $this->id;
+                $forwardUserid = $this->userid;
+            }
             $msgData['forward_data'] = [
                 'id' => $forwardId,                 // 转发的消息ID（原始）
                 'userid' => $forwardUserid,         // 转发的消息会员ID（原始）
diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss
index 27523163f..ea7600122 100644
--- a/resources/assets/sass/pages/components/dialog-wrapper.scss
+++ b/resources/assets/sass/pages/components/dialog-wrapper.scss
@@ -1935,6 +1935,10 @@ body:not(.window-touch) {
                                     max-width: 100%;
                                     margin: 0;
 
+                                    &.record {
+                                        width: auto;
+                                    }
+
                                     .dialog-head {
                                         width: 100%;
                                         border-radius: 8px;