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;