From 67f89dd9984ff1c5ead76e5b78ee327855534499 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9B=AE=E6=A3=83?= <BT-Muli@outlook.com>
Date: Wed, 4 Sep 2024 22:00:59 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=E7=89=B9?=
 =?UTF-8?q?=E5=AE=9A=E6=83=85=E5=86=B5=E4=B8=8B=E7=9A=84=E6=B8=B2=E6=9F=93?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=EF=BC=8C=E8=B0=83=E6=95=B4z-index=EF=BC=8C?=
 =?UTF-8?q?=E5=AD=90=E5=9B=9E=E5=A4=8D=E6=8C=81=E4=B9=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/post/tp-parser.vue      | 14 ++++-----
 src/components/postReply/tpr-debug.vue |  2 +-
 src/components/postReply/tpr-main.vue  | 26 +++++++++-------
 src/components/postReply/tpr-reply.vue | 42 ++++++++++++++++++++++++--
 4 files changed, 61 insertions(+), 23 deletions(-)

diff --git a/src/components/post/tp-parser.vue b/src/components/post/tp-parser.vue
index b90fc9ce..f4e5c54a 100644
--- a/src/components/post/tp-parser.vue
+++ b/src/components/post/tp-parser.vue
@@ -58,24 +58,22 @@ function getParsedData(data: TGApp.Plugins.Mys.SctPost.Base[]): TGApp.Plugins.My
     let check = 0;
     for (let i = 0; i < parsedText.length; i++) {
       const text = parsedText[i];
-      child.push(parsedText[i]);
+      child.push(text);
       if (text.insert === "\n") {
-        if (child.length === 1) {
-          res.push(child[0]);
-          child = [];
-          continue;
-        }
+        check += child.length;
         cur = {
           insert: "",
           attributes: text.attributes,
           children: child,
         };
         res.push(cur);
-        check += child.length;
         child = [];
       }
     }
-    if (check !== parsedText.length - 1 && child.length > 1) res.push(...child);
+    if (check !== parsedText.length && check !== 0) {
+      res.push(...child);
+      child = [];
+    }
   }
   if (res.length === 0 && child.length > 0) res.push(...child);
   return res;
diff --git a/src/components/postReply/tpr-debug.vue b/src/components/postReply/tpr-debug.vue
index 58d40b73..d3392770 100644
--- a/src/components/postReply/tpr-debug.vue
+++ b/src/components/postReply/tpr-debug.vue
@@ -1,5 +1,5 @@
 <template>
-  <TOverlay v-model="visible" hide :to-click="onCancel" blur-val="5px">
+  <TOverlay v-model="visible" hide :to-click="onCancel" blur-val="0">
     <div class="tpr-debug-box">
       <div class="tpr-debug-title">
         <span>文件：</span>
diff --git a/src/components/postReply/tpr-main.vue b/src/components/postReply/tpr-main.vue
index 90d91ff8..386447cb 100644
--- a/src/components/postReply/tpr-main.vue
+++ b/src/components/postReply/tpr-main.vue
@@ -6,6 +6,7 @@
       v-model="showOverlay"
       :persistent="true"
       :no-click-animation="true"
+      z-index="40"
     >
       <template #activator="{ props }">
         <v-btn
@@ -21,13 +22,7 @@
       <div class="tpr-main-reply">
         <!-- 顶部负责显示回复条件&关闭按钮&刷新按钮 -->
         <div class="tpr-main-filter">
-          <v-chip
-            color="primary"
-            label
-            @click="handleDebug"
-            :style="{ cursor: appStore.devMode ? 'pointer' : 'not-allowed' }"
-            >回复列表
-          </v-chip>
+          <v-chip color="primary" label @click="handleDebug">回复列表</v-chip>
           <v-switch
             v-model="onlyLz"
             color="primary"
@@ -149,15 +144,24 @@ async function loadReply(): Promise<void> {
       text: "没有更多了",
       color: "info",
     });
+  } else {
+    showSnackbar({
+      text: `成功加载${resp.list.length}条回复`,
+      color: "success",
+    });
   }
 }
 
-function handleDebug(): void {
-  if (!appStore.devMode || showDebug.value) {
-    showDebug.value = false;
+async function handleDebug(): Promise<void> {
+  if (appStore.devMode) {
+    showDebug.value = true;
     return;
   }
-  showDebug.value = true;
+  if (showDebug.value) {
+    showDebug.value = false;
+  }
+  // 刷新回复
+  await reloadReply();
 }
 </script>
 <style lang="css" scoped>
diff --git a/src/components/postReply/tpr-reply.vue b/src/components/postReply/tpr-reply.vue
index 8ddec826..18d5b261 100644
--- a/src/components/postReply/tpr-reply.vue
+++ b/src/components/postReply/tpr-reply.vue
@@ -51,6 +51,7 @@
             location="end"
             :close-on-content-click="false"
             v-model="showSub"
+            :persistent="true"
           >
             <v-list class="tpr-reply-sub" width="300px" max-height="400px">
               <TprReply
@@ -71,7 +72,7 @@
       </div>
     </div>
     <div class="tpr-extra" :title="`ID:${props.modelValue.reply.reply_id}`">
-      <span class="tpr-debug" @click="exportData">
+      <span class="tpr-debug" @click="exportData" title="导出数据">
         <v-icon size="small">mdi-file-export</v-icon>
       </span>
       <span v-if="props.modelValue.r_user" class="tpr-reply-user">
@@ -83,10 +84,11 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { path } from "@tauri-apps/api";
+import { event, path } from "@tauri-apps/api";
+import { UnlistenFn, Event } from "@tauri-apps/api/event";
 import { save } from "@tauri-apps/plugin-dialog";
 import { writeTextFile } from "@tauri-apps/plugin-fs";
-import { toRaw, ref } from "vue";
+import { toRaw, ref, watch, onMounted, onUnmounted } from "vue";
 
 import Mys from "../../plugins/Mys/index.js";
 import showConfirm from "../func/confirm.js";
@@ -104,9 +106,43 @@ const subReplies = ref<Array<TGApp.Plugins.Mys.Reply.ReplyFull>>([]);
 const lastId = ref<string | undefined>(undefined);
 const isLast = ref<boolean>(false);
 const loading = ref<boolean>(false);
+let subListener: UnlistenFn | null = null;
 
 console.log("TprReply", toRaw(props.modelValue));
 
+onMounted(async () => {
+  if (props.mode === "main") {
+    subListener = await listenSub();
+  }
+});
+
+onUnmounted(() => {
+  if (subListener !== null) {
+    subListener();
+    subListener = null;
+  }
+});
+
+watch(
+  () => showSub.value,
+  async (value) => {
+    if (value) {
+      await event.emit("openReplySub", props.modelValue.reply.reply_id);
+      console.error("emit openReplySub");
+    }
+  },
+);
+
+async function listenSub(): Promise<UnlistenFn> {
+  return await event.listen("openReplySub", async (e: Event<string>) => {
+    if (e.payload !== props.modelValue.reply.reply_id) {
+      if (showSub.value) {
+        showSub.value = false;
+      }
+    }
+  });
+}
+
 function getTime(): string {
   const time = new Date(props.modelValue.reply.created_at * 1000);
   const now = new Date();