fix(dns): replace configured override fields and prepare v2.5.5

This commit is contained in:
wonfen
2026-09-21 07:33:06 +08:00
parent 13676d3335
commit 433cd0628f
8 changed files with 133 additions and 143 deletions
+3 -13
View File
@@ -346,6 +346,7 @@ export function DnsViewer({ ref }: { ref?: Ref<DialogRef> }) {
'fake-ip-filter': parseList(values.fakeIpFilter),
'default-nameserver': parseList(values.defaultNameserver),
nameserver: parseList(values.nameserver),
'nameserver-policy': parseNameserverPolicy(values.nameserverPolicy),
'direct-nameserver-follow-policy': values.directNameserverFollowPolicy,
'fallback-filter': {
geoip: values.fallbackGeoip,
@@ -359,11 +360,6 @@ export function DnsViewer({ ref }: { ref?: Ref<DialogRef> }) {
'direct-nameserver': parseList(values.directNameserver),
}
const policy = parseNameserverPolicy(values.nameserverPolicy)
if (Object.keys(policy).length > 0) {
dnsConfig['nameserver-policy'] = policy
}
return dnsConfig
}, [values])
@@ -375,10 +371,7 @@ export function DnsViewer({ ref }: { ref?: Ref<DialogRef> }) {
config.dns = dnsConfig
}
const hosts = parseHosts(values.hosts)
if (Object.keys(hosts).length > 0) {
config.hosts = hosts
}
config.hosts = parseHosts(values.hosts)
setYamlContent(yaml.dump(config, { forceQuotes: true }))
}, [generateDnsConfig, values.hosts])
@@ -507,10 +500,7 @@ export function DnsViewer({ ref }: { ref?: Ref<DialogRef> }) {
config.dns = dnsConfig
}
const hosts = parseHosts(values.hosts)
if (Object.keys(hosts).length > 0) {
config.hosts = hosts
}
config.hosts = parseHosts(values.hosts)
} else {
const parsedConfig = yaml.load(yamlContent)
if (typeof parsedConfig !== 'object' || parsedConfig === null) {