From acd9a8f099158c3b89f7dc88e7e7bd2a3d91252f Mon Sep 17 00:00:00 2001
From: dreamhunter2333 <dreamhunter2333@gmail.com>
Date: Sat, 4 Jul 2026 16:03:07 +0800
Subject: [PATCH] refactor: remove manual external image loading

---
 CHANGELOG.md                                   |  2 +-
 CHANGELOG_EN.md                                |  2 +-
 .../src/components/MailContentRenderer.vue     | 18 ++----------------
 frontend/src/i18n/locales/source/de.ts         |  1 -
 frontend/src/i18n/locales/source/es.ts         |  1 -
 frontend/src/i18n/locales/source/ja.ts         |  1 -
 frontend/src/i18n/locales/source/ptBR.ts       |  1 -
 frontend/src/i18n/message-registry.ts          |  4 ----
 8 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f067112..feea7c8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@
 
 ### Features
 
-- feat: |Frontend| 外观设置新增“自动加载外部图片”开关，关闭后邮件 HTML 中的外链图片默认以占位图显示，并可在单封邮件中手动加载（issue #1073）
+- feat: |Frontend| 外观设置新增“自动加载外部图片”开关，关闭后邮件 HTML 中的外链图片默认以占位图显示（issue #1073）
 
 ### Bug Fixes
 
diff --git a/CHANGELOG_EN.md b/CHANGELOG_EN.md
index 17ec4571..f2d5bbd8 100644
--- a/CHANGELOG_EN.md
+++ b/CHANGELOG_EN.md
@@ -10,7 +10,7 @@
 
 ### Features
 
-- feat: |Frontend| Add an Appearance toggle for automatically loading external images; when disabled, HTML mail shows blocked-image placeholders by default with a per-mail manual load action (issue #1073)
+- feat: |Frontend| Add an Appearance toggle for automatically loading external images; when disabled, HTML mail shows blocked-image placeholders by default (issue #1073)
 
 ### Bug Fixes
 
diff --git a/frontend/src/components/MailContentRenderer.vue b/frontend/src/components/MailContentRenderer.vue
index 1dd18558..fdd9b2fd 100644
--- a/frontend/src/components/MailContentRenderer.vue
+++ b/frontend/src/components/MailContentRenderer.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref, watch } from "vue";
+import { computed, ref } from "vue";
 import { useScopedI18n } from '@/i18n/app'
 import { CloudDownloadRound, ReplyFilled, ForwardFilled, FullscreenRound } from '@vicons/material'
 import ShadowHtmlComponent from "./ShadowHtmlComponent.vue";
@@ -58,13 +58,7 @@ const showAttachments = ref(false);
 const curAttachments = ref([]);
 const attachmentLoding = ref(false);
 const showFullscreen = ref(false);
-const loadExternalImagesForCurrentMail = ref(false);
-const shouldLoadExternalImages = computed(() => autoLoadExternalImages.value || loadExternalImagesForCurrentMail.value);
-const mailHtmlContent = computed(() => applyExternalImagePolicy(props.mail.message, shouldLoadExternalImages.value));
-
-watch(() => props.mail.id, () => {
-  loadExternalImagesForCurrentMail.value = false;
-});
+const mailHtmlContent = computed(() => applyExternalImagePolicy(props.mail.message, autoLoadExternalImages.value));
 
 const handleDelete = () => {
   props.onDelete();
@@ -158,10 +152,6 @@ const handleSaveToS3 = async (filename, blob) => {
         {{ t('fullscreen') }}
       </n-button>
 
-      <n-button v-if="!showTextMail && !shouldLoadExternalImages" size="small" tertiary type="info"
-        @click="loadExternalImagesForCurrentMail = true">
-        {{ t('loadExternalImages') }}
-      </n-button>
     </n-space>
 
     <!-- AI 提取信息 -->
@@ -180,10 +170,6 @@ const handleSaveToS3 = async (filename, blob) => {
     style="height: 100vh;">
     <n-drawer-content :title="mail.subject" closable>
       <div class="fullscreen-mail-content" :class="{ 'dark-mode': isDark }">
-        <n-button v-if="!showTextMail && !shouldLoadExternalImages" size="small" tertiary type="info"
-          @click="loadExternalImagesForCurrentMail = true">
-          {{ t('loadExternalImages') }}
-        </n-button>
         <pre v-if="showTextMail" class="mail-text">{{ mail.text }}</pre>
         <iframe v-else-if="useIframeShowMail" :srcdoc="mailHtmlContent" class="mail-iframe">
         </iframe>
diff --git a/frontend/src/i18n/locales/source/de.ts b/frontend/src/i18n/locales/source/de.ts
index 3dc160ce..2e27c952 100644
--- a/frontend/src/i18n/locales/source/de.ts
+++ b/frontend/src/i18n/locales/source/de.ts
@@ -238,7 +238,6 @@ export const deMessages = {
   "views.admin.AccountSettings.forward_address_required": "Eine Weiterleitungsadresse ist erforderlich",
   "views.admin.AccountSettings.forward_placeholder": "forward@example.com",
   "components.MailContentRenderer.fullscreen": "Vollbild",
-  "components.MailContentRenderer.loadExternalImages": "Externe Bilder laden",
   "views.common.Login.generateName": "Zufälligen Namen erzeugen",
   "views.admin.Telegram.globalMailPushList": "Globale Mail-Push-Chat-ID-Liste",
   "views.common.Appearance.globalTabplacement": "Globale Tab-Position",
diff --git a/frontend/src/i18n/locales/source/es.ts b/frontend/src/i18n/locales/source/es.ts
index a6cf7397..84191183 100644
--- a/frontend/src/i18n/locales/source/es.ts
+++ b/frontend/src/i18n/locales/source/es.ts
@@ -238,7 +238,6 @@ export const esMessages = {
   "views.admin.AccountSettings.forward_address_required": "La dirección de reenvío es obligatoria",
   "views.admin.AccountSettings.forward_placeholder": "forward@example.com",
   "components.MailContentRenderer.fullscreen": "Pantalla completa",
-  "components.MailContentRenderer.loadExternalImages": "Cargar imágenes externas",
   "views.common.Login.generateName": "Generar nombre aleatorio",
   "views.admin.Telegram.globalMailPushList": "Lista global de chat ID para envío de correos",
   "views.common.Appearance.globalTabplacement": "Posición global de pestañas",
diff --git a/frontend/src/i18n/locales/source/ja.ts b/frontend/src/i18n/locales/source/ja.ts
index 36a17435..1ae1dd7f 100644
--- a/frontend/src/i18n/locales/source/ja.ts
+++ b/frontend/src/i18n/locales/source/ja.ts
@@ -238,7 +238,6 @@ export const jaMessages = {
   "views.admin.AccountSettings.forward_address_required": "転送先アドレスは必須です",
   "views.admin.AccountSettings.forward_placeholder": "forward@example.com",
   "components.MailContentRenderer.fullscreen": "全画面",
-  "components.MailContentRenderer.loadExternalImages": "外部画像を読み込む",
   "views.common.Login.generateName": "ランダム名を生成",
   "views.admin.Telegram.globalMailPushList": "グローバルメール通知 Chat ID 一覧",
   "views.common.Appearance.globalTabplacement": "全体タブ位置",
diff --git a/frontend/src/i18n/locales/source/ptBR.ts b/frontend/src/i18n/locales/source/ptBR.ts
index 164e72ac..05e83d96 100644
--- a/frontend/src/i18n/locales/source/ptBR.ts
+++ b/frontend/src/i18n/locales/source/ptBR.ts
@@ -238,7 +238,6 @@ export const ptBRMessages = {
   "views.admin.AccountSettings.forward_address_required": "O endereço de encaminhamento é obrigatório",
   "views.admin.AccountSettings.forward_placeholder": "forward@example.com",
   "components.MailContentRenderer.fullscreen": "Tela cheia",
-  "components.MailContentRenderer.loadExternalImages": "Carregar imagens externas",
   "views.common.Login.generateName": "Gerar nome aleatório",
   "views.admin.Telegram.globalMailPushList": "Lista global de chat ID para envio de e-mails",
   "views.common.Appearance.globalTabplacement": "Posição global das abas",
diff --git a/frontend/src/i18n/message-registry.ts b/frontend/src/i18n/message-registry.ts
index a9cf0536..f5daae79 100644
--- a/frontend/src/i18n/message-registry.ts
+++ b/frontend/src/i18n/message-registry.ts
@@ -186,10 +186,6 @@ export const MESSAGE_REGISTRY = {
       "en": "Fullscreen",
       "zh": "全屏"
     },
-    "loadExternalImages": {
-      "en": "Load External Images",
-      "zh": "加载外部图片"
-    },
     "reply": {
       "en": "Reply",
       "zh": "回复"