修复邮件详情失败展示并防止旧请求覆盖新邮件
This commit is contained in:
1 parent
742ba3e8dd
commit
3d4701f0e4
4 files changed
+226
-26
No files matched your search
@@ -47,6 +47,40 @@
|
||||
padding: 28px 30px;
|
||||
}
|
||||
|
||||
.mail-detail-state {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 12px;
|
||||
padding: 32px 20px;
|
||||
text-align: center;
|
||||
color: var(--pm-text-secondary);
|
||||
}
|
||||
|
||||
.mail-detail-state h1 {
|
||||
margin: 0;
|
||||
font-size: 22px;
|
||||
color: var(--pm-text-primary);
|
||||
}
|
||||
|
||||
.mail-detail-state p {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.mail-detail-state-actions {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: center;
|
||||
gap: 12px;
|
||||
margin-top: 12px;
|
||||
}
|
||||
|
||||
.mail-detail-state-actions .el-button + .el-button {
|
||||
margin-left: 0;
|
||||
}
|
||||
|
||||
.mail-subject {
|
||||
font-size: 36px;
|
||||
font-weight: 600;
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
import './EmailDetail.js'
|
||||
|
||||
import {ref} from 'vue'
|
||||
import {onBeforeUnmount, ref, watch} from 'vue'
|
||||
|
||||
import {useRoute, useRouter} from 'vue-router'
|
||||
|
||||
@@ -30,27 +28,69 @@ export function usePage() {
|
||||
const ccs = ref([])
|
||||
|
||||
const showCC = ref(false)
|
||||
|
||||
http.post("/api/v1/email/detail", {id: parseInt(route.params.id)}).then(res => {
|
||||
detailData.value = res.data || {}
|
||||
detailData.value.attachments = res.data.attachments || [];
|
||||
|
||||
if (res.data.to && res.data.to !== "") {
|
||||
try {
|
||||
tos.value = JSON.parse(res.data.to)
|
||||
} catch (error) {
|
||||
tos.value = []
|
||||
}
|
||||
|
||||
const loading = ref(false)
|
||||
const loadError = ref('')
|
||||
let requestSequence = 0
|
||||
|
||||
const parseAddresses = (value) => {
|
||||
try {
|
||||
const addresses = JSON.parse(value || '[]')
|
||||
return Array.isArray(addresses) ? addresses : []
|
||||
} catch {
|
||||
return []
|
||||
}
|
||||
if (res.data.cc && res.data.cc !== "") {
|
||||
try {
|
||||
ccs.value = JSON.parse(res.data.cc)
|
||||
} catch (error) {
|
||||
ccs.value = []
|
||||
}
|
||||
}
|
||||
|
||||
const loadDetail = async () => {
|
||||
const sequence = ++requestSequence
|
||||
detailData.value = {attachments: []}
|
||||
tos.value = []
|
||||
ccs.value = []
|
||||
showCC.value = false
|
||||
loadError.value = ''
|
||||
loading.value = true
|
||||
|
||||
const rawId = String(route.params.id || '')
|
||||
const id = Number(rawId)
|
||||
if (!/^\d+$/.test(rawId) || !Number.isSafeInteger(id) || id <= 0) {
|
||||
loadError.value = '邮件地址无效,请返回邮件列表'
|
||||
loading.value = false
|
||||
return
|
||||
}
|
||||
showCC.value = ccs.value && ccs.value.length > 0
|
||||
|
||||
try {
|
||||
const res = await http.post('/api/v1/email/detail', {id})
|
||||
// 切换邮件或离开页面后,旧请求不得覆盖当前状态。
|
||||
if (sequence !== requestSequence) return
|
||||
if (res?.errorNo !== 0) {
|
||||
loadError.value = res?.errorMsg || '读取邮件失败,请重试'
|
||||
return
|
||||
}
|
||||
const data = res.data
|
||||
if (!data || typeof data !== 'object' || Array.isArray(data) || Number(data.id) !== id) {
|
||||
loadError.value = '邮件不可用,请返回邮件列表'
|
||||
return
|
||||
}
|
||||
detailData.value = {...data, attachments: Array.isArray(data.attachments) ? data.attachments : []}
|
||||
tos.value = parseAddresses(data.to)
|
||||
ccs.value = parseAddresses(data.cc)
|
||||
showCC.value = ccs.value.length > 0
|
||||
} catch {
|
||||
if (sequence === requestSequence) {
|
||||
loadError.value = '网络连接失败,请稍后重试'
|
||||
}
|
||||
} finally {
|
||||
if (sequence === requestSequence) loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
watch(() => route.params.id, loadDetail, {immediate: true})
|
||||
onBeforeUnmount(() => {
|
||||
requestSequence++
|
||||
})
|
||||
|
||||
const backToList = () => router.push({name: 'list'})
|
||||
|
||||
const getInitial = (name) => {
|
||||
if (!name) return '?';
|
||||
@@ -67,7 +107,8 @@ export function usePage() {
|
||||
}
|
||||
|
||||
const handleDelete = () => {
|
||||
const id = detailData.value.id || parseInt(route.params.id);
|
||||
if (loading.value || loadError.value) return;
|
||||
const id = detailData.value.id;
|
||||
if (!id) return;
|
||||
|
||||
let tag = groupStore.tag;
|
||||
@@ -119,6 +160,10 @@ export function usePage() {
|
||||
tos,
|
||||
ccs,
|
||||
showCC,
|
||||
loading,
|
||||
loadError,
|
||||
loadDetail,
|
||||
backToList,
|
||||
getInitial,
|
||||
formatDetailDate,
|
||||
handleDelete
|
||||
|
||||
@@ -1,17 +1,28 @@
|
||||
<template>
|
||||
<div class="mail-detail-container">
|
||||
<div class="mail-detail-header">
|
||||
<el-button @click="$router.back()" plain class="back-btn">
|
||||
<el-button @click="backToList" plain class="back-btn" aria-label="返回邮件列表">
|
||||
<el-icon><Back /></el-icon>
|
||||
</el-button>
|
||||
<div class="action-buttons">
|
||||
<el-button plain @click="handleDelete">
|
||||
<div v-if="!loading && !loadError" class="action-buttons">
|
||||
<el-button plain @click="handleDelete" aria-label="删除邮件">
|
||||
<el-icon><Delete /></el-icon>
|
||||
</el-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="mail-detail-content">
|
||||
<div v-if="loading" class="mail-detail-state" role="status" aria-live="polite">
|
||||
<p>正在读取邮件…</p>
|
||||
</div>
|
||||
<div v-else-if="loadError" class="mail-detail-state" role="alert">
|
||||
<h1>邮件暂时无法查看</h1>
|
||||
<p>{{ loadError }}</p>
|
||||
<div class="mail-detail-state-actions">
|
||||
<el-button type="primary" @click="loadDetail">重试</el-button>
|
||||
<el-button @click="backToList">返回邮件列表</el-button>
|
||||
</div>
|
||||
</div>
|
||||
<div v-else class="mail-detail-content">
|
||||
<h1 class="mail-subject">{{ detailData.subject }}</h1>
|
||||
|
||||
<div class="mail-meta-card">
|
||||
@@ -72,6 +83,10 @@ import { usePage, Back, Delete, Document, Download } from './EmailDetail.js'
|
||||
|
||||
const {
|
||||
handleDelete,
|
||||
loading,
|
||||
loadError,
|
||||
loadDetail,
|
||||
backToList,
|
||||
detailData,
|
||||
getInitial,
|
||||
lang,
|
||||
|
||||
Reference in new issue
Block a user