From 4769731d529f95b9bda491c67b9bc323e0338430 Mon Sep 17 00:00:00 2001
From: BTMuli <BT-Muli@outlook.com>
Date: Fri, 26 May 2023 14:49:50 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9A=20t-loading=20=E2=86=92=20to-loadi?=
 =?UTF-8?q?ng?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Achievements.vue  |  4 ++--
 src/pages/Announcements.vue |  2 +-
 src/pages/Home.vue          |  4 ++--
 src/views/t-anno-json.vue   |  4 ++--
 src/views/t-anno.vue        |  8 +++-----
 src/views/t-post-json.vue   | 13 ++++++++-----
 src/views/t-post.vue        |  4 ++--
 7 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/pages/Achievements.vue b/src/pages/Achievements.vue
index 226f0589..25e29b76 100644
--- a/src/pages/Achievements.vue
+++ b/src/pages/Achievements.vue
@@ -22,7 +22,7 @@
       </v-btn>
     </template>
   </v-app-bar>
-  <TLoading v-model="loading" :title="loadingTitle" />
+  <TOLoading v-model="loading" :title="loadingTitle" />
   <div class="wrap">
     <!-- 左侧菜单 -->
     <div class="left-wrap">
@@ -108,7 +108,7 @@
 <script lang="ts" setup>
 // vue
 import { onMounted, ref, onBeforeMount, computed } from "vue";
-import TLoading from "../components/main/t-loading.vue";
+import TOLoading from "../components/overlay/to-loading.vue";
 // tauri
 import { dialog, fs } from "@tauri-apps/api";
 // Store
diff --git a/src/pages/Announcements.vue b/src/pages/Announcements.vue
index 6fc926fd..bd3a95ae 100644
--- a/src/pages/Announcements.vue
+++ b/src/pages/Announcements.vue
@@ -91,7 +91,7 @@
 // vue
 import { onMounted, ref } from "vue";
 import { useRouter } from "vue-router";
-import TLoading from "../components/main/t-loading.vue";
+import TLoading from "../components/overlay/to-loading.vue";
 // store
 import { useAppStore } from "../store/modules/app";
 // utils
diff --git a/src/pages/Home.vue b/src/pages/Home.vue
index d97e1404..73d77468 100644
--- a/src/pages/Home.vue
+++ b/src/pages/Home.vue
@@ -1,12 +1,12 @@
 <template>
-  <TLoading v-model="loading" :title="loadingTitle" :subtitle="loadingSubtitle" />
+  <TOLoading v-model="loading" :title="loadingTitle" :subtitle="loadingSubtitle" />
   <component :is="item" v-for="item in components" :key="item" :ref="setItemRef" />
 </template>
 
 <script lang="ts" setup>
 // vue
 import { markRaw, onMounted, onUnmounted, onUpdated, ref } from "vue";
-import TLoading from "../components/main/t-loading.vue";
+import TOLoading from "../components/overlay/to-loading.vue";
 import TPool from "../components/main/t-pool.vue";
 import TPosition from "../components/main/t-position.vue";
 import TCalendar from "../components/main/t-calendar.vue";
diff --git a/src/views/t-anno-json.vue b/src/views/t-anno-json.vue
index e5d1c9ed..dfefeb38 100644
--- a/src/views/t-anno-json.vue
+++ b/src/views/t-anno-json.vue
@@ -1,6 +1,6 @@
 <template>
   <TSwitchTheme />
-  <TLoading v-model="loading" :empty="loadingEmpty" :title="loadingTitle" />
+  <TOLoading v-model="loading" :empty="loadingEmpty" :title="loadingTitle" />
   <div class="anno-json">
     <div class="anno-title">
       活动列表 JSON
@@ -17,7 +17,7 @@
 import { ref, onMounted, reactive } from "vue";
 import { useRoute } from "vue-router";
 import JsonViewer from "vue-json-viewer";
-import TLoading from "../components/main/t-loading.vue";
+import TOLoading from "../components/overlay/to-loading.vue";
 import TSwitchTheme from "../components/main/t-switchTheme.vue";
 // tauri
 import { appWindow } from "@tauri-apps/api/window";
diff --git a/src/views/t-anno.vue b/src/views/t-anno.vue
index 7e8a0175..793c2b33 100644
--- a/src/views/t-anno.vue
+++ b/src/views/t-anno.vue
@@ -1,7 +1,7 @@
 <!-- eslint-disable vue/no-v-html -->
 <template>
   <TSwitchTheme />
-  <TLoading v-model="loading" :title="loadingTitle" :empty="loadingEmpty" />
+  <TOLoading v-model="loading" :title="loadingTitle" :empty="loadingEmpty" />
   <div class="anno-body">
     <div class="anno-title">
       {{ annoData.title }}
@@ -17,7 +17,7 @@
 // vue
 import { ref, onMounted } from "vue";
 import { useRoute } from "vue-router";
-import TLoading from "../components/main/t-loading.vue";
+import TOLoading from "../components/overlay/to-loading.vue";
 import TSwitchTheme from "../components/main/t-switchTheme.vue";
 // tauri
 import { appWindow } from "@tauri-apps/api/window";
@@ -55,9 +55,7 @@ onMounted(async () => {
     loadingTitle.value = "公告不存在或解析失败";
     return;
   }
-  setTimeout(() => {
-    loading.value = false;
-  }, 1200);
+  loading.value = false;
 });
 </script>
 <style lang="css" src="../assets/css/anno-parser.css" scoped />
diff --git a/src/views/t-post-json.vue b/src/views/t-post-json.vue
index 34fb97a1..ca894063 100644
--- a/src/views/t-post-json.vue
+++ b/src/views/t-post-json.vue
@@ -1,6 +1,6 @@
 <template>
   <TSwitchTheme />
-  <TLoading v-model="loading" :empty="loadingEmpty" :title="loadingTitle" />
+  <TOLoading v-model="loading" :empty="loadingEmpty" :title="loadingTitle" />
   <div class="post-json">
     <div class="post-title">
       帖子返回内容 JSON
@@ -13,7 +13,7 @@
 import { ref, onMounted, reactive } from "vue";
 import { useRoute } from "vue-router";
 import JsonViewer from "vue-json-viewer";
-import TLoading from "../components/main/t-loading.vue";
+import TOLoading from "../components/overlay/to-loading.vue";
 import TSwitchTheme from "../components/main/t-switchTheme.vue";
 // tauri
 import { appWindow } from "@tauri-apps/api/window";
@@ -39,10 +39,13 @@ onMounted(async () => {
   }
   // 获取数据
   loadingTitle.value = "正在获取数据...";
-  jsonData = await MysOper.Post.get(postId);
-  setTimeout(() => {
+  try {
+    jsonData = await MysOper.Post.get(postId);
     loading.value = false;
-  }, 200);
+  } catch (e) {
+    loadingTitle.value = "帖子不存在或解析失败";
+    loadingEmpty.value = true;
+  }
 });
 </script>
 <style>
diff --git a/src/views/t-post.vue b/src/views/t-post.vue
index 3aa92310..769d5f1f 100644
--- a/src/views/t-post.vue
+++ b/src/views/t-post.vue
@@ -1,14 +1,14 @@
 <!-- eslint-disable vue/no-v-html -->
 <template>
   <TSwitchTheme />
-  <TLoading v-model="loading" :empty="loadingEmpty" :title="loadingTitle" />
+  <TOLoading v-model="loading" :empty="loadingEmpty" :title="loadingTitle" />
   <div class="mys-post-body" v-html="postHtml" />
 </template>
 <script lang="ts" setup>
 // vue
 import { ref, onMounted } from "vue";
 import { useRoute } from "vue-router";
-import TLoading from "../components/main/t-loading.vue";
+import TOLoading from "../components/overlay/to-loading.vue";
 // tauri
 import { appWindow } from "@tauri-apps/api/window";
 // plugins