Skip to content

Commit e602085

Browse files
committed
v2.4.5
1 parent 80183f6 commit e602085

File tree

2 files changed

+15
-25
lines changed

2 files changed

+15
-25
lines changed

config/version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.4
1+
2.4.5

web/html/xui/xray.html

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -230,25 +230,6 @@
230230
<setting-list-item type="switch" title='{{ i18n "pages.xray.Torrent"}}' desc='{{ i18n "pages.xray.TorrentDesc"}}' v-model="torrentSettings"></setting-list-item>
231231
<setting-list-item type="switch" title='{{ i18n "pages.xray.Family"}}' desc='{{ i18n "pages.xray.FamilyDesc"}}' v-model="familyProtectSettings"></setting-list-item>
232232
</a-list-item>
233-
<a-list-item>
234-
<a-row style="padding: 0 20px">
235-
<a-col :lg="24" :xl="12">
236-
<a-list-item-meta
237-
title='{{ i18n "pages.xray.blockdomains" }}'/>
238-
</a-col>
239-
<a-col :lg="24" :xl="12">
240-
<template>
241-
<a-select mode="tags" style="width: 100%"
242-
v-model="blockedDomains"
243-
:dropdown-class-name="themeSwitcher.currentTheme">
244-
<a-select-option :value="p.value" :label="p.label"
245-
v-for="p in settingsData.ProtectionOptions"> [[ p.label ]]
246-
</a-select-option>
247-
</a-select>
248-
</template>
249-
</a-col>
250-
</a-row>
251-
</a-list-item>
252233
</a-collapse-panel>
253234
<a-collapse-panel header='{{ i18n "pages.xray.basicRouting"}}'>
254235
<a-row :xs="24" :sm="24" :lg="12">
@@ -289,7 +270,7 @@
289270
v-model="blockedDomains"
290271
:dropdown-class-name="themeSwitcher.currentTheme">
291272
<a-select-option :value="p.value" :label="p.label"
292-
v-for="p in settingsData.DomainsOptions"> [[ p.label ]]
273+
v-for="p in settingsData.BlockDomainsOptions"> [[ p.label ]]
293274
</a-select-option>
294275
</a-select>
295276
</template>
@@ -939,13 +920,22 @@
939920
{ label: '🇻🇳 Vietnam', value: 'ext:geosite_VN.dat:vn' },
940921
{ label: '🇻🇳 .vn', value: 'regexp:.*\\.vn$' },
941922
],
942-
ProtectionOptions: [
923+
BlockDomainsOptions: [
943924
{ label: 'Ads All', value: 'geosite:category-ads-all' },
944925
{ label: 'Ads IR 🇮🇷', value: 'ext:geosite_IR.dat:category-ads-all' },
945926
{ label: 'Ads VN 🇻🇳', value: 'ext:geosite_VN.dat:ads' },
946-
{ label: 'Malware 🇮🇷', value: 'geosite_IR.dat:malware' },
947-
{ label: 'Phishing 🇮🇷', value: 'geosite_IR.dat:phishing' },
948-
{ label: 'Cryptominers 🇮🇷', value: 'geosite_IR.dat:cryptominers' },
927+
{ label: 'Malware 🇮🇷', value: 'ext:geosite_IR.dat:malware' },
928+
{ label: 'Phishing 🇮🇷', value: 'ext:geosite_IR.dat:phishing' },
929+
{ label: 'Cryptominers 🇮🇷', value: 'ext:geosite_IR.dat:cryptominers' },
930+
{ label: '🇮🇷 Iran', value: 'ext:geosite_IR.dat:ir' },
931+
{ label: '🇮🇷 .ir', value: 'regexp:.*\\.ir$' },
932+
{ label: '🇮🇷 .ایران', value: 'regexp:.*\\.xn--mgba3a4f16a$' },
933+
{ label: '🇨🇳 China', value: 'geosite:cn' },
934+
{ label: '🇨🇳 .cn', value: 'regexp:.*\\.cn$' },
935+
{ label: '🇷🇺 Russia', value: 'geosite:category-ru' },
936+
{ label: '🇷🇺 .ru', value: 'regexp:.*\\.ru' },
937+
{ label: '🇻🇳 Vietnam', value: 'ext:geosite_VN.dat:vn' },
938+
{ label: '🇻🇳 .vn', value: 'regexp:.*\\.vn$' },
949939
],
950940
ServicesOptions: [
951941
{ label: 'Apple', value: 'geosite:apple' },

0 commit comments

Comments
 (0)