diff --git a/fe/src/views/Setup/Setup.css b/fe/src/views/Setup/Setup.css index fc7f1c5e..e6c39f5d 100644 --- a/fe/src/views/Setup/Setup.css +++ b/fe/src/views/Setup/Setup.css @@ -284,6 +284,23 @@ line-height: 1.5; } +.ssl-dns-value-cell { + display: flex; + align-items: flex-start; + gap: 12px; + min-width: 0; +} + +.ssl-dns-value-cell .ssl-dns-value { + flex: 1 1 auto; + min-width: 0; +} + +.ssl-dns-copy-button { + flex: none; + margin-top: 0; +} + .ssl-storage-path { margin-top: 5px; color: var(--pm-text-primary); diff --git a/fe/src/views/Setup/Setup.js b/fe/src/views/Setup/Setup.js index 993fe907..86a24829 100644 --- a/fe/src/views/Setup/Setup.js +++ b/fe/src/views/Setup/Setup.js @@ -91,7 +91,7 @@ export function usePage() { const sslSettings = reactive({ "type": "0", - "challenge": "dns", + "challenge": "", "key_path": "./config/ssl/private.key", "crt_path": "./config/ssl/public.crt", "paramsList": [], @@ -352,10 +352,9 @@ export function usePage() { sslSettings.type = res.data.type if (sslSettings.type === "2") { sslSettings.type = "0" - sslSettings.challenge = "dns" } if (sslSettings.type === "0") { - sslSettings.challenge = "dns" + sslSettings.challenge = "" } sslRuntime.value = res.data || {} return res @@ -611,6 +610,9 @@ export function usePage() { if (dnsChecking.value) { resetDNSChallenge() } + if (sslSettings.type === "0") { + sslSettings.challenge = "" + } } const handleSSLChallengeChange = (challenge) => { diff --git a/fe/src/views/Setup/Setup.vue b/fe/src/views/Setup/Setup.vue index e17cf29e..73701091 100644 --- a/fe/src/views/Setup/Setup.vue +++ b/fe/src/views/Setup/Setup.vue @@ -309,7 +309,7 @@
{{ lang.ssl_auto_storage_title }}
{{ lang.ssl_auto_storage_desc }}
- {{ lang.ssl_dns_desc }} + {{ sslSettings.paramsList.length === 0 ? lang.ssl_dns_waiting : lang.ssl_dns_ready }}
{{ lang.ssl_auto_certificate_path }}
{{ lang.ssl_auto_private_key_path }}
@@ -337,8 +337,6 @@

{{ lang.ssl_dns_title }}

-

{{ lang.ssl_dns_waiting }}

-

{{ lang.ssl_dns_ready }}

{{ sslSettings.paramsList.length }} 条记录 @@ -357,7 +355,17 @@