Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-06-06 21:24:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix: remove clientIp from dns section when its empty

Browse source
This commit is contained in:
seyed amir mohammad sadat shokouhi 2026-05-11 08:48:02 +03:30
parent cd5f9baf99
commit d22717277d
1 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
frontend/src/pages/xray/DnsTab.vue
View file

@ -22,6 +22,14 @@ const props = defineProps({
const STRATEGIES = ['UseSystem', 'UseIP', 'UseIPv4', 'UseIPv6']; const STRATEGIES = ['UseSystem', 'UseIP', 'UseIPv4', 'UseIPv6'];
const dnsFieldOmit = Object.freeze(Object.create(null));
function dnsValueEmptyForOmit(v) {
if (v === undefined || v === null) return true;
if (typeof v === 'string') return v.trim() === '';
return false;
}
const enableDNS = computed({ const enableDNS = computed({
get: () => !!props.templateSettings?.dns, get: () => !!props.templateSettings?.dns,
set: (next) => { set: (next) => {
@ -29,7 +37,6 @@ const enableDNS = computed({
if (next) { if (next) {
props.templateSettings.dns = { props.templateSettings.dns = {
tag: 'dns_inbound', tag: 'dns_inbound',
clientIp: '',
queryStrategy: 'UseIP', queryStrategy: 'UseIP',
disableCache: false, disableCache: false,
disableFallback: false, disableFallback: false,
@ -50,16 +57,30 @@ const enableDNS = computed({
}); });
function dnsField(field, fallback) { function dnsField(field, fallback) {
const omitWhenUnset = fallback === dnsFieldOmit;
return computed({ return computed({
get: () => props.templateSettings?.dns?.[field] ?? fallback, get: () => {
const raw = props.templateSettings?.dns?.[field];
if (fallback === dnsFieldOmit) return raw ?? '';
return raw ?? fallback;
},
set: (v) => { set: (v) => {
if (props.templateSettings?.dns) props.templateSettings.dns[field] = v; if (!props.templateSettings?.dns) return;
if (omitWhenUnset) {
if (dnsValueEmptyForOmit(v)) {
if (field in props.templateSettings.dns) delete props.templateSettings.dns[field];
} else {
props.templateSettings.dns[field] = v;
}
} else {
props.templateSettings.dns[field] = v;
}
}, },
}); });
} }
const dnsTag = dnsField('tag', 'dns_inbound'); const dnsTag = dnsField('tag', 'dns_inbound');
const dnsClientIp = dnsField('clientIp', ''); const dnsClientIp = dnsField('clientIp', dnsFieldOmit);
const dnsStrategy = dnsField('queryStrategy', 'UseIP'); const dnsStrategy = dnsField('queryStrategy', 'UseIP');
const dnsDisableCache = dnsField('disableCache', false); const dnsDisableCache = dnsField('disableCache', false);
const dnsDisableFallback = dnsField('disableFallback', false); const dnsDisableFallback = dnsField('disableFallback', false);