From e19061d513b8c4fb2207b4a553a96ea086089612 Mon Sep 17 00:00:00 2001 From: MHSanaei Date: Mon, 4 May 2026 13:20:24 +0200 Subject: TLS: Remove ECH Force Query --- web/html/modals/client_bulk_modal.html | 116 ++++++++++++------------------- web/html/modals/client_modal.html | 69 +++++++++++------- web/html/modals/dns_presets_modal.html | 15 ++-- web/html/modals/inbound_info_modal.html | 41 ++++++++--- web/html/modals/inbound_modal.html | 32 ++++----- web/html/modals/nord_modal.html | 69 +++++++++++------- web/html/modals/prompt_modal.html | 19 ++--- web/html/modals/qrcode_modal.html | 39 ++++++----- web/html/modals/text_modal.html | 6 +- web/html/modals/two_factor_modal.html | 58 ++++++++-------- web/html/modals/warp_modal.html | 22 +++--- web/html/modals/xray_balancer_modal.html | 37 +++++----- web/html/modals/xray_dns_modal.html | 18 +++-- web/html/modals/xray_fakedns_modal.html | 17 +++-- web/html/modals/xray_outbound_modal.html | 54 +++++++------- web/html/modals/xray_reverse_modal.html | 94 ++++++++++++++++--------- web/html/modals/xray_rule_modal.html | 31 ++++++--- 17 files changed, 417 insertions(+), 320 deletions(-) (limited to 'web/html/modals') diff --git a/web/html/modals/client_bulk_modal.html b/web/html/modals/client_bulk_modal.html index 282972f7..81f711e7 100644 --- a/web/html/modals/client_bulk_modal.html +++ b/web/html/modals/client_bulk_modal.html @@ -1,58 +1,41 @@ {{define "modals/clientsBulkModal"}} - - + + Random Random+Prefix Random+Prefix+Num - Random+Prefix+Num+Postfix + Random+Prefix+Num+Postfix Prefix+Num+Postfix - - + + - - + + - + - + - - + + - - + + [[ key ]] - - + + {{ i18n "none" }} [[ @@ -67,9 +50,7 @@ }} Subscription - + @@ -84,8 +65,7 @@ - + - + - + - + - - + + - - + @@ -154,13 +125,11 @@ - + -{{end}} +{{end}} \ No newline at end of file diff --git a/web/html/modals/client_modal.html b/web/html/modals/client_modal.html index 8ce0e832..f66c01e6 100644 --- a/web/html/modals/client_modal.html +++ b/web/html/modals/client_modal.html @@ -1,10 +1,7 @@ {{define "modals/clientsModal"}} - + {{end}} \ No newline at end of file diff --git a/web/html/modals/xray_balancer_modal.html b/web/html/modals/xray_balancer_modal.html index fea4019a..194ed036 100644 --- a/web/html/modals/xray_balancer_modal.html +++ b/web/html/modals/xray_balancer_modal.html @@ -1,15 +1,7 @@ {{define "modals/balancerModal"}} - - [[ tag ]] + [[ tag + ]] @@ -58,7 +51,7 @@ fallbackTag: '' }, outboundTags: [], - balancerTags:[], + balancerTags: [], ok() { if (balancerModal.balancer.selector.length == 0) { balancerModal.emptySelector = true; @@ -67,7 +60,14 @@ balancerModal.emptySelector = false; ObjectUtil.execute(balancerModal.confirm, balancerModal.balancer); }, - show({ title = '', okText = '{{ i18n "sure" }}', balancerTags = [], balancer, confirm = (balancer) => { }, isEdit = false }) { + show({ + title = '', + okText = '{{ i18n "sure" }}', + balancerTags = [], + balancer, + confirm = (balancer) => {}, + isEdit = false + }) { this.title = title; this.okText = okText; this.confirm = confirm; @@ -83,7 +83,8 @@ }; } this.balancerTags = balancerTags.filter((tag) => tag != balancer.tag); - this.outboundTags = app.templateSettings.outbounds.filter((o) => !ObjectUtil.isEmpty(o.tag)).map(obj => obj.tag); + this.outboundTags = app.templateSettings.outbounds.filter((o) => !ObjectUtil.isEmpty(o.tag)).map(obj => + obj.tag); this.isEdit = isEdit; this.check(); this.checkSelector(); @@ -92,7 +93,7 @@ this.visible = false; this.loading(false); }, - loading(loading=true) { + loading(loading = true) { this.confirmLoading = loading; }, check() { @@ -115,9 +116,7 @@ data: { balancerModal: balancerModal }, - methods: { - } + methods: {} }); - {{end}} \ No newline at end of file diff --git a/web/html/modals/xray_dns_modal.html b/web/html/modals/xray_dns_modal.html index 97970555..0d02a71d 100644 --- a/web/html/modals/xray_dns_modal.html +++ b/web/html/modals/xray_dns_modal.html @@ -75,15 +75,19 @@ okText: '{{ i18n "confirm" }}', isEdit: false, confirm: null, - dnsServer: { ...defaultDnsObject }, + dnsServer: { + ...defaultDnsObject + }, ok() { - ObjectUtil.execute(dnsModal.confirm, { ...dnsModal.dnsServer }); + ObjectUtil.execute(dnsModal.confirm, { + ...dnsModal.dnsServer + }); }, show({ title = '', okText = '{{ i18n "confirm" }}', dnsServer, - confirm = (dnsServer) => { }, + confirm = (dnsServer) => {}, isEdit = false }) { this.title = title; @@ -95,7 +99,9 @@ if (isEdit) { switch (typeof dnsServer) { case 'string': - const dnsObj = { ...defaultDnsObject }; + const dnsObj = { + ...defaultDnsObject + }; dnsObj.address = dnsServer; @@ -106,7 +112,9 @@ break; } } else { - this.dnsServer = { ...defaultDnsObject }; + this.dnsServer = { + ...defaultDnsObject + }; this.dnsServer.domains = []; this.dnsServer.expectIPs = []; diff --git a/web/html/modals/xray_fakedns_modal.html b/web/html/modals/xray_fakedns_modal.html index f1f4429c..20768f0b 100644 --- a/web/html/modals/xray_fakedns_modal.html +++ b/web/html/modals/xray_fakedns_modal.html @@ -23,11 +23,19 @@ okText: '{{ i18n "confirm" }}', isEdit: false, confirm: null, - fakeDns: { ...fakednsDefaultData }, + fakeDns: { + ...fakednsDefaultData + }, ok() { ObjectUtil.execute(fakednsModal.confirm, fakednsModal.fakeDns); }, - show({ title = '', okText = '{{ i18n "confirm" }}', fakeDns, confirm = (fakeDns) => { }, isEdit = false }) { + show({ + title = '', + okText = '{{ i18n "confirm" }}', + fakeDns, + confirm = (fakeDns) => {}, + isEdit = false + }) { this.title = title; this.okText = okText; this.confirm = confirm; @@ -35,7 +43,9 @@ if (isEdit) { this.fakeDns = fakeDns; } else { - this.fakeDns = { ...fakednsDefaultData } + this.fakeDns = { + ...fakednsDefaultData + } } this.isEdit = isEdit; }, @@ -51,6 +61,5 @@ fakednsModal: fakednsModal, } }); - {{end}} \ No newline at end of file diff --git a/web/html/modals/xray_outbound_modal.html b/web/html/modals/xray_outbound_modal.html index 2edb5fc0..89005069 100644 --- a/web/html/modals/xray_outbound_modal.html +++ b/web/html/modals/xray_outbound_modal.html @@ -1,12 +1,11 @@ {{define "modals/outModal"}} - {{template "form/outbound"}} + :confirm-loading="outModal.confirmLoading" :closable="true" :mask-closable="false" + :ok-button-props="{ props: { disabled: !outModal.isValid } }" :style="{ overflow: 'hidden' }" + :ok-text="outModal.okText" cancel-text='{{ i18n "close" }}' :class="themeSwitcher.currentTheme"> + {{template "form/outbound"}} -{{end}} +{{end}} \ No newline at end of file diff --git a/web/html/modals/xray_reverse_modal.html b/web/html/modals/xray_reverse_modal.html index 22f04317..addc8515 100644 --- a/web/html/modals/xray_reverse_modal.html +++ b/web/html/modals/xray_reverse_modal.html @@ -1,7 +1,7 @@ {{define "modals/reverseModal"}} + :confirm-loading="reverseModal.confirmLoading" :closable="true" :mask-closable="false" + :ok-text="reverseModal.okText" cancel-text='{{ i18n "close" }}' :class="themeSwitcher.currentTheme"> @@ -15,26 +15,24 @@ @@ -53,9 +51,14 @@ type: "", domain: "" }, - rules: [ - { outboundTag: '', inboundTag: []}, - { outboundTag: '', inboundTag: []} + rules: [{ + outboundTag: '', + inboundTag: [] + }, + { + outboundTag: '', + inboundTag: [] + } ], inboundTags: [], outboundTags: [], @@ -64,7 +67,7 @@ reverseModal.rules[0].type = 'field'; reverseModal.rules[1].type = 'field'; - if(reverseModal.reverse.type == 'bridge'){ + if (reverseModal.reverse.type == 'bridge') { reverseModal.rules[0].inboundTag = [reverseModal.reverse.tag]; reverseModal.rules[1].inbound