完善初始化DNS未就绪提示与手工公网地址生成

This commit is contained in:
xuans committed 2026-09-27 01:07:08 +08:00
1 parent 11985b38d4
commit 8bf13aaa68
6 files changed
+191 -31

No files matched your search

+42
View File
@@ -333,6 +333,48 @@
animation: pm-rise-in 0.46s var(--pm-ease-out);
}
.dns-address-controls {
flex-shrink: 0;
display: flex;
flex-direction: column;
gap: 6px;
}
.dns-address-form {
display: flex;
flex-wrap: wrap;
align-items: center;
gap: 8px;
font-size: 13px;
}
.dns-address-form .el-button + .el-button {
margin-left: 0;
}
.dns-address-input {
flex: 1 1 240px;
max-width: 360px;
}
.dns-address-note,
.dns-address-warning {
margin: 0;
font-size: 12px;
line-height: 1.5;
overflow-wrap: anywhere;
}
.dns-address-note {
color: var(--pm-text-secondary);
}
.dns-address-warning,
.dns-value.dns-value-unavailable {
color: var(--el-color-warning-dark-2, #b45309);
font-family: inherit;
}
.dns-header {
display: flex;
align-items: flex-start;
+40 -5
View File
@@ -119,6 +119,14 @@ export function usePage() {
const dnsChallengeNotice = ref("")
const dnsInfos = ref({})
const dnsMailIPv4 = ref('')
const dnsAppliedIPv4 = ref('')
const dnsLoading = ref(false)
const dnsError = ref('')
const dnsInputPending = computed(() => dnsMailIPv4.value.trim() !== dnsAppliedIPv4.value)
const hasUnavailableDNS = computed(() => Object.values(dnsInfos.value).some((records) =>
records.some((record) => record.unavailableReason || !record.value)
))
const hasDNSIPv6 = computed(() => Object.values(dnsInfos.value).some((records) =>
records.some((record) => record.type === 'AAAA')
@@ -304,15 +312,34 @@ export function usePage() {
}
}
const getDNSConfig = () => {
return setupRequest({"action": "get", "step": "dns"}).then((res) => {
const getDNSConfig = async () => {
if (dnsLoading.value) return null
dnsLoading.value = true
dnsError.value = ''
const mailIPv4 = dnsMailIPv4.value.trim()
try {
const res = await setupRequest({action: 'get', step: 'dns', mail_ipv4: mailIPv4})
assertSetupSuccess(res)
dnsInfos.value = res.data
dnsAppliedIPv4.value = mailIPv4
return res
}).catch((error) => {
showSetupError(error)
} catch (error) {
dnsInfos.value = {}
dnsError.value = showSetupError(error)
return null
})
} finally {
dnsLoading.value = false
}
}
const detectDNSConfig = () => {
dnsMailIPv4.value = ''
return getDNSConfig()
}
const copyDNSRecord = (record) => {
if (dnsLoading.value || dnsInputPending.value || record.unavailableReason || !record.value) return
return copyDNSValue(record.value)
}
const copyDNSValue = async (value) => {
@@ -736,6 +763,13 @@ export function usePage() {
port,
proxyHTTPS,
dnsInfos,
dnsMailIPv4,
dnsAppliedIPv4,
dnsLoading,
dnsError,
dnsInputPending,
hasUnavailableDNS,
detectDNSConfig,
hasDNSIPv6,
addDomain,
setPassword,
@@ -748,6 +782,7 @@ export function usePage() {
clearDatabaseError,
getDNSConfig,
formatDNSRecordTTL,
copyDNSRecord,
copyDNSValue,
getSSLConfig,
setSSLConfig,
+34 -3
View File
@@ -205,7 +205,29 @@
</div>
</div>
<div v-if="Object.keys(dnsInfos).length > 0" class="dns-domain-list">
<div class="dns-address-controls">
<div class="dns-address-form">
<label for="dns-mail-ipv4">邮件服务器公网 IPv4</label>
<el-input
id="dns-mail-ipv4"
v-model="dnsMailIPv4"
class="dns-address-input"
placeholder="留空自动探测,失败时可手工填写"
:disabled="dnsLoading"
clearable
@keyup.enter="getDNSConfig()"
/>
<el-button type="primary" :loading="dnsLoading" @click="getDNSConfig()">生成记录</el-button>
<el-button :disabled="dnsLoading" @click="detectDNSConfig()">重新自动探测</el-button>
</div>
<p class="dns-address-note">仅生成解析建议,不会修改真实 DNS;后台地址独立解析,MX、SPF、DKIM、DMARC 仍需保留。</p>
<p v-if="dnsError" class="dns-address-warning" role="alert">{{ dnsError }}</p>
<p v-else-if="dnsInputPending" class="dns-address-warning" role="status">地址已修改,请生成记录后再复制。</p>
<p v-else-if="hasUnavailableDNS" class="dns-address-warning" role="status">部分记录尚未就绪,已禁用复制。请补充公网 IP 或检查后台域名解析;已自行配置 DNS 的用户仍可继续。</p>
<p v-else-if="dnsAppliedIPv4" class="dns-address-note" role="status">当前建议使用手工地址:{{ dnsAppliedIPv4 }}。请确认它是邮件服务器实际使用的公网地址。</p>
</div>
<div v-if="Object.keys(dnsInfos).length > 0" class="dns-domain-list" :aria-busy="dnsLoading">
<section class="dns-domain-card" v-for="(info, domain) in dnsInfos" :key="domain">
<div class="dns-domain-header">
<div>
@@ -253,7 +275,10 @@
>
<template #default="scope">
<div class="dns-value-cell">
<el-tooltip :content="scope.row.tips" placement="top" v-if="scope.row.tips">
<span v-if="scope.row.unavailableReason || !scope.row.value" class="dns-value dns-value-unavailable">
{{ scope.row.unavailableReason || '记录尚未就绪' }}
</span>
<el-tooltip :content="scope.row.tips" placement="top" v-else-if="scope.row.tips">
<span :class="['dns-value', { 'dns-value-long': scope.row.value.length > 80 }]">
{{ scope.row.value }}
</span>
@@ -261,7 +286,13 @@
<span v-else :class="['dns-value', { 'dns-value-long': scope.row.value.length > 80 }]">
{{ scope.row.value }}
</span>
<el-button class="dns-copy-button" link type="primary" @click.stop="copyDNSValue(scope.row.value)">
<el-button
class="dns-copy-button"
link
type="primary"
:disabled="dnsLoading || dnsInputPending || !!scope.row.unavailableReason || !scope.row.value"
@click.stop="copyDNSRecord(scope.row)"
>
{{ lang.dns_copy }}
</el-button>
</div>