This commit is contained in:
parent
593a633689
commit
eeb00ea2c5
@ -596,13 +596,35 @@ export function usePage() {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const resetDNSChallenge = () => {
|
||||||
|
stopStatusCheck()
|
||||||
|
stopDNSChallengeTimer()
|
||||||
|
stopDNSParamsPolling()
|
||||||
|
dnsChecking.value = false
|
||||||
|
dnsChallengeNotice.value = ""
|
||||||
|
sslSettings.paramsList = []
|
||||||
|
fullscreenLoading.value = false
|
||||||
|
}
|
||||||
|
|
||||||
|
const handleSSLTypeChange = () => {
|
||||||
|
if (dnsChecking.value) {
|
||||||
|
resetDNSChallenge()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const handleSSLChallengeChange = (challenge) => {
|
const handleSSLChallengeChange = (challenge) => {
|
||||||
if (challenge !== "dns" || dnsChecking.value || fullscreenLoading.value) {
|
if (fullscreenLoading.value) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
dnsChallengeNotice.value = ""
|
if (challenge === "dns") {
|
||||||
return setSSLConfig()
|
dnsChallengeNotice.value = ""
|
||||||
|
return setSSLConfig()
|
||||||
|
}
|
||||||
|
|
||||||
|
if (dnsChecking.value) {
|
||||||
|
resetDNSChallenge()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const runStep = (action) => {
|
const runStep = (action) => {
|
||||||
@ -703,6 +725,7 @@ export function usePage() {
|
|||||||
getDomainConfig,
|
getDomainConfig,
|
||||||
setDbConfig,
|
setDbConfig,
|
||||||
handleDbTypeChange,
|
handleDbTypeChange,
|
||||||
|
handleSSLTypeChange,
|
||||||
clearDatabaseError,
|
clearDatabaseError,
|
||||||
getDNSConfig,
|
getDNSConfig,
|
||||||
formatDNSRecordTTL,
|
formatDNSRecordTTL,
|
||||||
|
|||||||
@ -289,7 +289,8 @@
|
|||||||
<div class="form ssl-form">
|
<div class="form ssl-form">
|
||||||
<el-form label-position="top">
|
<el-form label-position="top">
|
||||||
<el-form-item :label="lang.type">
|
<el-form-item :label="lang.type">
|
||||||
<el-select class="ssl-type-select" :placeholder="lang.ssl_auto" v-model="sslSettings.type" :disabled="dnsChecking">
|
<el-select class="ssl-type-select" :placeholder="lang.ssl_auto" v-model="sslSettings.type"
|
||||||
|
:disabled="fullscreenLoading" @change="handleSSLTypeChange">
|
||||||
<el-option :label="lang.ssl_auto" value="0"/>
|
<el-option :label="lang.ssl_auto" value="0"/>
|
||||||
<el-option :label="lang.ssl_manuallyf" value="1"/>
|
<el-option :label="lang.ssl_manuallyf" value="1"/>
|
||||||
</el-select>
|
</el-select>
|
||||||
@ -298,7 +299,7 @@
|
|||||||
<el-form-item :label="lang.ssl_challenge_type" v-if="sslSettings.type === '0'">
|
<el-form-item :label="lang.ssl_challenge_type" v-if="sslSettings.type === '0'">
|
||||||
<div class="ssl-challenge-select-row">
|
<div class="ssl-challenge-select-row">
|
||||||
<el-select class="ssl-type-select" :placeholder="lang.ssl_auto_http" v-model="sslSettings.challenge"
|
<el-select class="ssl-type-select" :placeholder="lang.ssl_auto_http" v-model="sslSettings.challenge"
|
||||||
:disabled="dnsChecking || fullscreenLoading" @change="handleSSLChallengeChange">
|
:disabled="fullscreenLoading" @change="handleSSLChallengeChange">
|
||||||
<el-option :label="lang.ssl_auto_http" value="http"/>
|
<el-option :label="lang.ssl_auto_http" value="http"/>
|
||||||
<el-option :label="lang.ssl_auto_dns" value="dns"/>
|
<el-option :label="lang.ssl_auto_dns" value="dns"/>
|
||||||
</el-select>
|
</el-select>
|
||||||
@ -409,6 +410,7 @@ const {
|
|||||||
next,
|
next,
|
||||||
previous,
|
previous,
|
||||||
handleDbTypeChange,
|
handleDbTypeChange,
|
||||||
|
handleSSLTypeChange,
|
||||||
handleSSLChallengeChange,
|
handleSSLChallengeChange,
|
||||||
clearDatabaseError,
|
clearDatabaseError,
|
||||||
formatDNSRecordTTL,
|
formatDNSRecordTTL,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user