From f8b16c0f977f079c17f6f36301d6f9a17f8fdce7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9B=AE=E6=A3=83?= <BT-Muli@outlook.com>
Date: Fri, 4 Oct 2024 18:29:44 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=92=84=20=E5=88=97=E8=A1=A8=E7=BC=A9?=
 =?UTF-8?q?=E8=BF=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/common/Announcements.vue | 10 ++--------
 src/views/t-anno.vue               | 15 ++-------------
 src/web/utils/annoParser.ts        | 17 +++++++++++++++--
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/src/pages/common/Announcements.vue b/src/pages/common/Announcements.vue
index 5964efea..c56c3e68 100644
--- a/src/pages/common/Announcements.vue
+++ b/src/pages/common/Announcements.vue
@@ -130,10 +130,7 @@ watch(curRegion, async (value) => {
   const name = getRegionName(value);
   await TGLogger.Info(`[Announcements][watch][curRegionName] 切换服务器：${name}`);
   await loadData();
-  showSnackbar({
-    text: `服务器切换为：${name}`,
-    color: "success",
-  });
+  showSnackbar({ text: `服务器切换为：${name}`, color: "success" });
 });
 
 watch(curLang, async (value) => {
@@ -141,10 +138,7 @@ watch(curLang, async (value) => {
   const name = getLangName(value);
   await TGLogger.Info(`[Announcements][watch][curLangName] 切换语言：${name}`);
   await loadData();
-  showSnackbar({
-    text: `语言切换为：${name}`,
-    color: "success",
-  });
+  showSnackbar({ text: `语言切换为：${name}`, color: "success" });
 });
 
 onMounted(async () => {
diff --git a/src/views/t-anno.vue b/src/views/t-anno.vue
index 8291bcf3..3945f74e 100644
--- a/src/views/t-anno.vue
+++ b/src/views/t-anno.vue
@@ -23,7 +23,7 @@
 </template>
 <script lang="ts" setup>
 import { app, webviewWindow } from "@tauri-apps/api";
-import { ref, onMounted, watch, onUnmounted } from "vue";
+import { ref, onMounted, watch } from "vue";
 import { useRoute } from "vue-router";
 
 import TaParser from "../components/anno/ta-parser.vue";
@@ -87,9 +87,7 @@ onMounted(async () => {
   // 打开 json
   const isDev = useAppStore().devMode ?? false;
   if (isDev) await createAnnoJson(annoId, region, lang);
-  setTimeout(() => {
-    loading.value = false;
-  }, 200);
+  loading.value = false;
 });
 
 watch(loadShare, (value) => {
@@ -114,15 +112,6 @@ async function createAnnoJson(annoId: number, region: AnnoServer, lang: AnnoLang
   const jsonTitle = `Anno_${region}_${annoId}_${lang}_JSON`;
   await createTGWindow(jsonPath, "Dev_JSON", jsonTitle, 960, 720, false, false);
 }
-
-onUnmounted(() => {
-  document
-    .querySelector(".anno-body")
-    ?.querySelectorAll("img")
-    .forEach((img) => {
-      if (img.src.startsWith("blob:")) URL.revokeObjectURL(img.src);
-    });
-});
 </script>
 <style lang="css" scoped>
 .anno-info {
diff --git a/src/web/utils/annoParser.ts b/src/web/utils/annoParser.ts
index bcfccf78..704d989a 100644
--- a/src/web/utils/annoParser.ts
+++ b/src/web/utils/annoParser.ts
@@ -1,7 +1,7 @@
 /**
  * @file web/utils/annoParser.ts
  * @description 解析游戏内公告数据
- * @since Beta v0.5.5
+ * @since Beta v0.6.0
  */
 
 import { h, render } from "vue";
@@ -105,7 +105,7 @@ export function parseAnnoContent(
 
 /**
  * @description 解析公告节点
- * @since Beta v0.5.3
+ * @since Beta v0.6.0
  * @param {Node} node - 节点
  * @param {Record<string, string>} attr - 属性
  * @returns {TGApp.Plugins.Mys.SctPost.Base} 结构化数据
@@ -146,6 +146,19 @@ function parseAnnoNode(
     Array.from(element.children).forEach((child) => {
       res.push(...parseAnnoNode(child, attr));
     });
+    for (const comp of res) {
+      if (comp.children) {
+        for (const child of comp.children) {
+          if (child.insert !== "" && child.insert !== "\n") {
+            child.insert = ` ${child.insert}`;
+          }
+        }
+      } else {
+        if (comp.insert !== "" && comp.insert !== "\n") {
+          comp.insert = ` ${comp.insert}`;
+        }
+      }
+    }
     return res;
   }
   if (element.tagName === "DETAILS") {