From 5e53baf09139c1cc79e004468ca7f157bb8f0e2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9B=AE=E6=A3=83?= <BT-Muli@outlook.com>
Date: Tue, 3 Sep 2024 14:27:42 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=92=84=20=E6=B7=BB=E5=8A=A0=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=8D=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/postReply/tpr-main.vue  |  3 +--
 src/components/postReply/tpr-reply.vue | 31 +++++++++++++++++++++-----
 src/plugins/Mys/types/Reply.d.ts       |  4 ++--
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/components/postReply/tpr-main.vue b/src/components/postReply/tpr-main.vue
index 6959ad2c..e3caa6cf 100644
--- a/src/components/postReply/tpr-main.vue
+++ b/src/components/postReply/tpr-main.vue
@@ -6,7 +6,6 @@
       v-model="showOverlay"
       :persistent="true"
       :no-click-animation="true"
-      z-index="0"
     >
       <template #activator="{ props }">
         <v-btn
@@ -44,7 +43,7 @@
           </v-btn>
         </div>
         <v-list class="tpr-reply-list">
-          <TprReply v-for="(item, index) in reply" :key="index" :modelValue="item" />
+          <TprReply v-for="(item, index) in reply" :key="index" :modelValue="item" mode="main" />
           <div v-if="isLast" class="tpr-list-item">
             <v-chip color="info" label>没有更多了</v-chip>
           </div>
diff --git a/src/components/postReply/tpr-reply.vue b/src/components/postReply/tpr-reply.vue
index 6c4188d8..de34ce57 100644
--- a/src/components/postReply/tpr-reply.vue
+++ b/src/components/postReply/tpr-reply.vue
@@ -52,10 +52,14 @@
             location="end"
             :close-on-content-click="false"
             v-model="showSub"
-            z-index="0"
           >
             <v-list class="tpr-reply-sub" width="300px" max-height="400px">
-              <TprReply v-for="(reply, index) in subReplies" :key="index" :modelValue="reply" />
+              <TprReply
+                v-for="(reply, index) in subReplies"
+                :key="index"
+                :modelValue="reply"
+                mode="sub"
+              />
               <div v-if="isLast" class="tpr-list-item">
                 <v-chip color="info" label>没有更多了</v-chip>
               </div>
@@ -67,9 +71,12 @@
         </span>
       </div>
     </div>
-    <div class="tpr-extra">
-      <span>{{ props.modelValue.reply.reply_id }}</span>
-      <span>{{ props.modelValue.reply.floor_id }}F</span>
+    <div class="tpr-extra" :title="`ID:${props.modelValue.reply.reply_id}`">
+      <span v-if="props.modelValue.r_user" class="tpr-reply-user">
+        <span>回复</span>
+        <span>{{ props.modelValue.r_user.nickname }}</span>
+      </span>
+      <span v-if="props.mode === 'main'">{{ props.modelValue.reply.floor_id }}F</span>
     </div>
   </div>
 </template>
@@ -81,6 +88,7 @@ import showSnackbar from "../func/snackbar.js";
 import TpParser from "../post/tp-parser.vue";
 
 interface TprReplyProps {
+  mode: "main" | "sub";
   modelValue: TGApp.Plugins.Mys.Reply.ReplyFull;
 }
 
@@ -279,6 +287,19 @@ async function loadSub(): Promise<void> {
   opacity: 0.3;
 }
 
+.tpr-reply-user {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 5px;
+
+  :last-child {
+    color: #00c3ff;
+    text-decoration: underline solid #00c3ff;
+    text-underline-position: under;
+  }
+}
+
 .tpr-reply-sub {
   position: relative;
   display: flex;
diff --git a/src/plugins/Mys/types/Reply.d.ts b/src/plugins/Mys/types/Reply.d.ts
index 224f4552..708a381a 100644
--- a/src/plugins/Mys/types/Reply.d.ts
+++ b/src/plugins/Mys/types/Reply.d.ts
@@ -113,7 +113,7 @@ declare namespace TGApp.Plugins.Mys.Reply {
    * @property {Array<ReplyFull>} sub_replies - 子回复数据
    * @property {boolean} is_lz - 是否楼主
    * @property {number} sub_reply_count - 子回复数量
-   * @property {unknown} r_user - 未知数据
+   * @property {TGApp.Plugins.Mys.User.Reply} r_user - 回复用户数据
    * @property {unknown} r_reply - 未知数据
    * @property {unknown} r_post - 未知数据
    * @property {unknown} user_game_info - 未知数据
@@ -129,7 +129,7 @@ declare namespace TGApp.Plugins.Mys.Reply {
     sub_replies: Array<ReplyFull>;
     is_lz: boolean;
     sub_reply_count: number;
-    r_user: unknown;
+    r_user: TGApp.Plugins.Mys.User.Reply | null;
     r_reply: unknown;
     r_post: unknown;
     user_game_info: unknown;