From 9d995994ca213e0bcc8878f715579153745c455d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9B=AE=E6=A3=83?= <BT-Muli@outlook.com>
Date: Mon, 13 Jan 2025 14:25:34 +0800
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/app/t-gameNav.vue              |  3 +-
 src/components/app/t-mi-img.vue               | 42 +++++++++++++++++
 src/components/pageAnno/ta-card.vue           | 47 ++-----------------
 src/components/pageArchive/to-arcBrith.vue    |  5 +-
 src/components/pageHome/ph-calendar-birth.vue |  6 ++-
 src/components/pageHome/ph-comp-pool.vue      |  5 +-
 src/components/pageHome/ph-position-card.vue  |  4 +-
 src/components/viewPost/tp-avatar.vue         | 19 +++++++-
 src/components/viewPost/tp-emoticon.vue       | 34 ++++----------
 src/components/viewPost/tp-linkCard.vue       | 18 ++-----
 src/pages/Archive/Birthday.vue                |  3 +-
 src/pages/common/PostTopic.vue                |  3 +-
 src/views/t-post.vue                          |  3 +-
 13 files changed, 96 insertions(+), 96 deletions(-)
 create mode 100644 src/components/app/t-mi-img.vue

diff --git a/src/components/app/t-gameNav.vue b/src/components/app/t-gameNav.vue
index de39184a..46f74c18 100644
--- a/src/components/app/t-gameNav.vue
+++ b/src/components/app/t-gameNav.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="tgn-container">
     <div v-for="navItem in nav" :key="navItem.id" class="tgn-nav" @click="toNav(navItem)">
-      <img alt="navIcon" :src="navItem.icon" />
+      <TMiImg alt="navIcon" :src="navItem.icon" :ori="true" />
       <span>{{ navItem.name }}</span>
     </div>
     <div v-if="props.modelValue === 2 && hasNav" class="tgn-nav">
@@ -11,6 +11,7 @@
   </div>
 </template>
 <script lang="ts" setup>
+import TMiImg from "@comp/app/t-mi-img.vue";
 import showDialog from "@comp/func/dialog.js";
 import showSnackbar from "@comp/func/snackbar.js";
 import Mys from "@Mys/index.js";
diff --git a/src/components/app/t-mi-img.vue b/src/components/app/t-mi-img.vue
new file mode 100644
index 00000000..51357fc7
--- /dev/null
+++ b/src/components/app/t-mi-img.vue
@@ -0,0 +1,42 @@
+<template>
+  <img
+    :src="localUrl"
+    :alt="props.alt"
+    :title="props.title"
+    v-if="localUrl"
+    @click="emits('click')"
+    :class="props.class"
+  />
+  <v-progress-circular v-else indeterminate color="primary" size="25" />
+</template>
+<script lang="ts" setup>
+import { onMounted, onUnmounted, ref } from "vue";
+
+import { useAppStore } from "@/store/modules/app.js";
+import { saveImgLocal } from "@/utils/TGShare.js";
+
+type TMiImgProps = {
+  src: string;
+  alt: string;
+  title?: string;
+  class?: string;
+  ori?: boolean;
+};
+type TMiImgEmits = {
+  (e: "click"): void;
+};
+const props = defineProps<TMiImgProps>();
+const emits = defineEmits<TMiImgEmits>();
+
+const appStore = useAppStore();
+const localUrl = ref<string>();
+
+onMounted(async () => {
+  const link = props.ori ? props.src : appStore.getImageUrl(props.src);
+  localUrl.value = await saveImgLocal(link);
+});
+
+onUnmounted(() => {
+  if (localUrl.value) URL.revokeObjectURL(localUrl.value);
+});
+</script>
diff --git a/src/components/pageAnno/ta-card.vue b/src/components/pageAnno/ta-card.vue
index 50cb86ae..302ac229 100644
--- a/src/components/pageAnno/ta-card.vue
+++ b/src/components/pageAnno/ta-card.vue
@@ -1,13 +1,7 @@
 <template>
   <div :id="`anno_card_${props.modelValue.id}`" class="anno-card">
     <div class="anno-cover" :title="props.modelValue.title" @click="createAnno">
-      <img :src="localBanner" alt="cover" v-if="localBanner" />
-      <v-progress-circular
-        color="primary"
-        :indeterminate="true"
-        v-else-if="props.modelValue.banner !== ''"
-      />
-      <img src="/source/UI/defaultCover.webp" alt="cover" v-else />
+      <TMiImg :src="props.modelValue.banner" alt="cover" :ori="true" />
       <div class="anno-info">
         <div class="anno-time">
           <v-icon>mdi-clock-time-four-outline</v-icon>
@@ -19,55 +13,22 @@
       {{ parseTitle(props.modelValue.subtitle) }}
     </div>
     <div class="anno-label" :title="`标签：${props.modelValue.tagLabel}`">
-      <img :src="localTag" alt="tag" v-if="localTag" />
-      <v-icon v-else>mdi-tag</v-icon>
+      <TMiImg :src="props.modelValue.tagIcon" alt="tag" :ori="true" />
       <span>{{ props.modelValue.tagLabel }}</span>
     </div>
     <div class="anno-id">{{ props.modelValue.id }}</div>
   </div>
 </template>
 <script lang="ts" setup>
+import TMiImg from "@comp/app/t-mi-img.vue";
 import showSnackbar from "@comp/func/snackbar.js";
-import { onMounted, onUnmounted, ref, watch } from "vue";
 
 import TGLogger from "@/utils/TGLogger.js";
-import { generateShareImg, saveImgLocal } from "@/utils/TGShare.js";
+import { generateShareImg } from "@/utils/TGShare.js";
 import { createTGWindow } from "@/utils/TGWindow.js";
 
 type TAnnoCardProps = { region: string; modelValue: TGApp.App.Announcement.ListCard; lang: string };
 const props = defineProps<TAnnoCardProps>();
-const localBanner = ref<string>();
-const localTag = ref<string>();
-
-onMounted(async () => {
-  if (props.modelValue.banner !== "") {
-    localBanner.value = await saveImgLocal(props.modelValue.banner);
-  }
-  localTag.value = await saveImgLocal(props.modelValue.tagIcon);
-});
-
-watch(
-  () => props.modelValue,
-  async () => {
-    if (localBanner.value && localBanner.value.startsWith("blob:")) {
-      URL.revokeObjectURL(localBanner.value);
-      localBanner.value = undefined;
-    }
-    if (props.modelValue.banner !== "") {
-      localBanner.value = await saveImgLocal(props.modelValue.banner);
-    }
-    if (localTag.value && localTag.value.startsWith("blob:")) {
-      URL.revokeObjectURL(localTag.value);
-      localTag.value = undefined;
-    }
-    localTag.value = await saveImgLocal(props.modelValue.tagIcon);
-  },
-);
-
-onUnmounted(() => {
-  if (localBanner.value) URL.revokeObjectURL(localBanner.value);
-  if (localTag.value) URL.revokeObjectURL(localTag.value);
-});
 
 function parseTitle(title: string): string {
   const dom = new DOMParser().parseFromString(title, "text/html");
diff --git a/src/components/pageArchive/to-arcBrith.vue b/src/components/pageArchive/to-arcBrith.vue
index 76613ed8..827c6397 100644
--- a/src/components/pageArchive/to-arcBrith.vue
+++ b/src/components/pageArchive/to-arcBrith.vue
@@ -2,11 +2,11 @@
   <TOverlay v-model="visible" blur-val="5px">
     <div class="toab-container" v-if="props.data">
       <div class="toab-img">
-        <img :src="props.data.take_picture[Number(props.choice)]" alt="顶部图像" />
+        <TMiImg :ori="true" :src="props.data.take_picture[Number(props.choice)]" alt="顶部图像" />
         <div class="toab-dialog" v-show="showText">
           <div v-for="(item, index) in textParse" :key="index" class="toab-dialog-item">
             <div class="toab-dialog-item-icon" v-if="item.icon" :title="item.name">
-              <img :src="item.icon" alt="对白头像" />
+              <TMiImg :src="item.icon" alt="对白头像" :ori="true" />
             </div>
             <div v-else-if="item.name !== '未知'" class="toab-dialog-item-name">
               {{ item.name }}
@@ -33,6 +33,7 @@
   </TOverlay>
 </template>
 <script setup lang="ts">
+import TMiImg from "@comp/app/t-mi-img.vue";
 import TOverlay from "@comp/app/t-overlay.vue";
 import showSnackbar from "@comp/func/snackbar.js";
 import { fetch } from "@tauri-apps/plugin-http";
diff --git a/src/components/pageHome/ph-calendar-birth.vue b/src/components/pageHome/ph-calendar-birth.vue
index 7e382ec4..e0598142 100644
--- a/src/components/pageHome/ph-calendar-birth.vue
+++ b/src/components/pageHome/ph-calendar-birth.vue
@@ -6,20 +6,21 @@
     </div>
     <div class="tcb-top-active" v-else>
       <span>今天是</span>
-      <img
+      <TMiImg
         v-for="i in cur"
         :key="i.role_id"
         class="tcb-cur"
         :alt="i.name"
         :src="i.head_icon"
         :title="i.name"
+        :ori="true"
       />
       <span>的生日哦~</span>
       <img @click="toBirth(true)" src="/source/UI/act_birthday.png" alt="empty" class="active" />
     </div>
     <div>即将到来：{{ next[0].role_birthday }}</div>
     <div v-for="i in next" :key="i.role_id" class="tcb-item">
-      <img :src="i.head_icon" :alt="i.name" @click="toBirth(i)" :title="i.name" />
+      <TMiImg :src="i.head_icon" :alt="i.name" @click="toBirth(i)" :title="i.name" :ori="true" />
       <div class="tcb-item-info">
         <span>{{ i.name }} 所属：{{ i.belong === "" ? "未知" : i.belong }}</span>
         <span>{{ parseDesc(i.introduce) }}</span>
@@ -28,6 +29,7 @@
   </div>
 </template>
 <script lang="ts" setup>
+import TMiImg from "@comp/app/t-mi-img.vue";
 import TSAvatarBirth from "@Sqlite/modules/avatarBirth.js";
 import { storeToRefs } from "pinia";
 import { onBeforeMount, ref, shallowRef } from "vue";
diff --git a/src/components/pageHome/ph-comp-pool.vue b/src/components/pageHome/ph-comp-pool.vue
index 145d65df..078c6456 100644
--- a/src/components/pageHome/ph-comp-pool.vue
+++ b/src/components/pageHome/ph-comp-pool.vue
@@ -9,7 +9,7 @@
       <div class="pool-grid">
         <div v-for="pool in poolSelect" :key="pool.postId" class="pool-card">
           <div class="pool-cover" @click="createPost(pool.postId, pool.title)">
-            <img :src="pool.cover" alt="cover" />
+            <TMiImg :src="pool.cover" alt="cover" :ori="true" />
           </div>
           <div class="pool-bottom">
             <div class="pool-character">
@@ -25,7 +25,7 @@
                     v-if="character.info"
                     :model-value="getCBox(character.info)"
                   />
-                  <img v-else :src="character.icon" alt="character" />
+                  <TMiImg v-else :src="character.icon" alt="character" />
                 </div>
               </div>
             </div>
@@ -56,6 +56,7 @@
 </template>
 <script lang="ts" setup>
 import TItembox, { type TItemBoxData } from "@comp/app/t-itemBox.vue";
+import TMiImg from "@comp/app/t-mi-img.vue";
 import showSnackbar from "@comp/func/snackbar.js";
 import Mys from "@Mys/index.js";
 import { storeToRefs } from "pinia";
diff --git a/src/components/pageHome/ph-position-card.vue b/src/components/pageHome/ph-position-card.vue
index 9c2072b1..2e57c178 100644
--- a/src/components/pageHome/ph-position-card.vue
+++ b/src/components/pageHome/ph-position-card.vue
@@ -3,7 +3,7 @@
     <div class="top">
       <div class="main">
         <div class="left" @click="openPosition(props.position)">
-          <img :src="props.position.icon" alt="icon" />
+          <TMiImg :src="props.position.icon" alt="icon" />
         </div>
         <div class="right">
           <div class="title">{{ props.position.title }}</div>
@@ -38,6 +38,7 @@
   </div>
 </template>
 <script lang="ts" setup>
+import TMiImg from "@comp/app/t-mi-img.vue";
 import showSnackbar from "@comp/func/snackbar.js";
 import type { PositionItem } from "@comp/pageHome/ph-comp-position.vue";
 
@@ -102,6 +103,7 @@ async function openPosition(card: TGApp.Plugins.Mys.Position.RenderCard): Promis
       width: 40px;
       height: 40px;
       border-radius: 3px;
+      background: var(--box-bg-2);
       object-fit: contain;
 
       img {
diff --git a/src/components/viewPost/tp-avatar.vue b/src/components/viewPost/tp-avatar.vue
index 5988ec47..b5539a34 100644
--- a/src/components/viewPost/tp-avatar.vue
+++ b/src/components/viewPost/tp-avatar.vue
@@ -5,7 +5,7 @@
       <div :title="getAuthorDesc()">{{ getAuthorDesc() }}</div>
     </div>
     <div class="tpa-img">
-      <img :src="props.data.avatar_url" alt="avatar" class="tpa-icon" />
+      <img :src="avatarUrl" alt="avatar" class="tpa-icon" v-if="avatarUrl" />
       <img
         :src="props.data.pendant"
         alt="pendant"
@@ -28,11 +28,26 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { computed } from "vue";
+import { computed, onMounted, onUnmounted, ref } from "vue";
+
+import { useAppStore } from "@/store/modules/app.js";
+import { saveImgLocal } from "@/utils/TGShare.js";
 
 type TpAvatarProps = { data: TGApp.Plugins.Mys.User.Post; position: "left" | "right" };
 
 const props = defineProps<TpAvatarProps>();
+const appStore = useAppStore();
+const avatarUrl = ref<string>();
+const pendantUrl = ref<string>();
+
+onMounted(async () => {
+  avatarUrl.value = await saveImgLocal(appStore.getImageUrl(props.data.avatar_url));
+});
+
+onUnmounted(() => {
+  if (avatarUrl.value) URL.revokeObjectURL(avatarUrl.value);
+  if (pendantUrl.value) URL.revokeObjectURL(pendantUrl.value);
+});
 
 function getAuthorDesc(): string {
   if (props.data.certification.label !== "") return props.data.certification.label;
diff --git a/src/components/viewPost/tp-emoticon.vue b/src/components/viewPost/tp-emoticon.vue
index eabd7b4d..9943d2c1 100644
--- a/src/components/viewPost/tp-emoticon.vue
+++ b/src/components/viewPost/tp-emoticon.vue
@@ -1,6 +1,10 @@
 <template>
-  <div class="tp-emo-box" title="自定义表情" v-if="localUrl !== undefined">
-    <img :src="localUrl" :alt="props.data.insert.custom_emoticon.hash" />
+  <div class="tp-emo-box" title="自定义表情">
+    <TMiImg
+      :src="props.data.insert.custom_emoticon.url"
+      :alt="props.data.insert.custom_emoticon.hash"
+      :ori="true"
+    />
     <div
       class="tp-emo-info"
       v-if="props.data.insert.custom_emoticon.size.width > 100"
@@ -10,16 +14,13 @@
       自定义表情
     </div>
   </div>
-  <div v-else class="tp-emo-load" :title="getImageUrl()">
-    <v-progress-circular :indeterminate="true" color="primary" size="small" />
-    <span>加载中...</span>
-  </div>
 </template>
 <script lang="ts" setup>
+import TMiImg from "@comp/app/t-mi-img.vue";
 import showSnackbar from "@comp/func/snackbar.js";
-import { onMounted, onUnmounted, ref, shallowRef } from "vue";
+import { shallowRef } from "vue";
 
-import { getImageBuffer, saveCanvasImg, saveImgLocal } from "@/utils/TGShare.js";
+import { getImageBuffer, saveCanvasImg } from "@/utils/TGShare.js";
 import { bytesToSize } from "@/utils/toolFunc.js";
 
 type TpCustomEmoticon = {
@@ -37,27 +38,10 @@ type TpCustomEmoticon = {
 type TpEmoticonProps = { data: TpCustomEmoticon };
 
 const props = defineProps<TpEmoticonProps>();
-const localUrl = ref<string>();
 const buffer = shallowRef<Uint8Array | null>(null);
 
 console.log("tp-emoticon", props.data.insert.custom_emoticon);
 
-onMounted(async () => {
-  const link = getImageUrl();
-  localUrl.value = await saveImgLocal(link);
-});
-
-onUnmounted(() => {
-  if (localUrl.value) URL.revokeObjectURL(localUrl.value);
-});
-
-function getImageUrl(): string {
-  const img = props.data.insert.custom_emoticon.url;
-  const append = "?x-oss-process=image/format,png";
-  if (img.endsWith(".gif")) return img;
-  return img + append;
-}
-
 async function download(): Promise<void> {
   const image = props.data.insert.custom_emoticon.url;
   if (buffer.value === null) buffer.value = await getImageBuffer(image);
diff --git a/src/components/viewPost/tp-linkCard.vue b/src/components/viewPost/tp-linkCard.vue
index 3c703fef..bd7813d3 100644
--- a/src/components/viewPost/tp-linkCard.vue
+++ b/src/components/viewPost/tp-linkCard.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="tp-link-card-box">
-    <img :src="cover" alt="cover" @click="toLink()" v-if="cover" />
+    <TMiImg :src="props.data.insert.link_card.cover" alt="cover" @click="toLink()" />
     <div class="tp-link-card-content">
       <span>{{ props.data.insert.link_card.title }}</span>
       <div v-if="props.data.insert.link_card.price" class="tp-link-card-price">
@@ -11,13 +11,12 @@
   </div>
 </template>
 <script lang="ts" setup>
+import TMiImg from "@comp/app/t-mi-img.vue";
 import showSnackbar from "@comp/func/snackbar.js";
-import { computed, onMounted, onUnmounted, ref, toRaw } from "vue";
+import { computed, toRaw } from "vue";
 import { useRouter } from "vue-router";
 
-import { useAppStore } from "@/store/modules/app.js";
 import { parseLink, parsePost } from "@/utils/linkParser.js";
-import { saveImgLocal } from "@/utils/TGShare.js";
 
 type TpLinkCard = {
   insert: {
@@ -40,9 +39,7 @@ type TpLinkCardProps = { data: TpLinkCard };
 
 const props = defineProps<TpLinkCardProps>();
 const router = useRouter();
-const appStore = useAppStore();
 
-const cover = ref<string>();
 const btnText = computed<string>(() => {
   if (!props.data.insert.link_card.button_text || props.data.insert.link_card.button_text === "") {
     return "详情";
@@ -50,15 +47,6 @@ const btnText = computed<string>(() => {
   return props.data.insert.link_card.button_text;
 });
 
-onMounted(async () => {
-  const coverLink = appStore.getImageUrl(props.data.insert.link_card.cover);
-  cover.value = await saveImgLocal(coverLink);
-});
-
-onUnmounted(() => {
-  if (cover.value) URL.revokeObjectURL(cover.value);
-});
-
 console.log("tpLinkCard", props.data.insert.link_card.card_id, toRaw(props.data).insert.link_card);
 
 async function toLink(): Promise<void> {
diff --git a/src/pages/Archive/Birthday.vue b/src/pages/Archive/Birthday.vue
index 770ee1c3..12e5ef08 100644
--- a/src/pages/Archive/Birthday.vue
+++ b/src/pages/Archive/Birthday.vue
@@ -20,7 +20,7 @@
     <div class="ab-draw-grid">
       <div v-for="item in selectedItem" :key="item.op_id" class="ab-draw">
         <div class="ab-draw-cover" @click="showImg(item)">
-          <img :src="item.unread_picture[Number(isAether)]" :alt="item.word_text" />
+          <TMiImg :src="item.unread_picture[Number(isAether)]" :alt="item.word_text" />
           <div class="ab-draw-hide" />
           <v-icon class="ab-draw-icon">mdi-magnify</v-icon>
         </div>
@@ -33,6 +33,7 @@
   <ToArcBrith v-model="showOverlay" :data="current" :choice="isAether" />
 </template>
 <script lang="ts" setup>
+import TMiImg from "@comp/app/t-mi-img.vue";
 import ToArcBrith from "@comp/pageArchive/to-arcBrith.vue";
 import { computed, onMounted, ref, shallowRef, watch } from "vue";
 import { useRoute } from "vue-router";
diff --git a/src/pages/common/PostTopic.vue b/src/pages/common/PostTopic.vue
index ef761436..0e3b20bd 100644
--- a/src/pages/common/PostTopic.vue
+++ b/src/pages/common/PostTopic.vue
@@ -2,7 +2,7 @@
   <v-app-bar>
     <template #prepend>
       <div class="post-topic-top" v-if="topicInfo">
-        <img :src="topicInfo.topic.cover" alt="cover" />
+        <TMiImg :src="topicInfo.topic.cover" alt="cover" :ori="true" />
         <div class="post-topic-info">
           <span>{{ topicInfo.topic.name }}({{ topic }})</span>
           <span :title="topicInfo.topic.desc">{{ topicInfo.topic.desc }}</span>
@@ -60,6 +60,7 @@
 </template>
 <script lang="ts" setup>
 import TGameNav from "@comp/app/t-gameNav.vue";
+import TMiImg from "@comp/app/t-mi-img.vue";
 import TPostCard from "@comp/app/t-postcard.vue";
 import showLoading from "@comp/func/loading.js";
 import showSnackbar from "@comp/func/snackbar.js";
diff --git a/src/views/t-post.vue b/src/views/t-post.vue
index 3664cb3e..0e23c3ad 100644
--- a/src/views/t-post.vue
+++ b/src/views/t-post.vue
@@ -12,7 +12,7 @@
       <div class="tp-post-meta">
         <div class="mpm-forum" v-if="postData.forum" @click="toForum(postData.forum)">
           <img :src="getGameIcon(postData.forum.game_id)" alt="gameIcon" />
-          <img :src="postData.forum.icon" alt="forumIcon" />
+          <TMiImg :src="postData.forum.icon" alt="forumIcon" :ori="true" />
           <span>{{ postData.forum.name }}</span>
         </div>
         <div class="mpm-item" :title="`浏览数：${postData?.stat?.view_num}`">
@@ -83,6 +83,7 @@
   />
 </template>
 <script lang="ts" setup>
+import TMiImg from "@comp/app/t-mi-img.vue";
 import TPinWin from "@comp/app/t-pinWin.vue";
 import TShareBtn from "@comp/app/t-shareBtn.vue";
 import TSwitchTheme from "@comp/app/t-switchTheme.vue";