diff --git a/web/html/xui/client_bulk_modal.html b/web/html/xui/client_bulk_modal.html
index 0bbe1ac5..fe14f5a2 100644
--- a/web/html/xui/client_bulk_modal.html
+++ b/web/html/xui/client_bulk_modal.html
@@ -155,7 +155,7 @@
}
ObjectUtil.execute(clientsBulkModal.confirm, clients, clientsBulkModal.dbInbound.id);
},
- show({ title='', okText='{{ i18n "sure" }}', dbInbound=null, confirm=(inbound, dbInbound)=>{} }) {
+ show({ title='', okText='{{ i18n "confirm" }}', dbInbound=null, confirm=(inbound, dbInbound)=>{} }) {
this.visible = true;
this.title = title;
this.okText = okText;
diff --git a/web/html/xui/client_modal.html b/web/html/xui/client_modal.html
index d85e6d4f..06b2e128 100644
--- a/web/html/xui/client_modal.html
+++ b/web/html/xui/client_modal.html
@@ -29,7 +29,7 @@
ObjectUtil.execute(clientModal.confirm, clientModalApp.client, clientModal.dbInbound.id);
}
},
- show({ title='', okText='{{ i18n "sure" }}', index=null, dbInbound=null, confirm=()=>{}, isEdit=false }) {
+ show({ title='', okText='{{ i18n "confirm" }}', index=null, dbInbound=null, confirm=()=>{}, isEdit=false }) {
this.visible = true;
this.title = title;
this.okText = okText;
diff --git a/web/html/xui/dns_modal.html b/web/html/xui/dns_modal.html
index 72b583a6..8b687ab2 100644
--- a/web/html/xui/dns_modal.html
+++ b/web/html/xui/dns_modal.html
@@ -75,8 +75,6 @@
data: {
dnsModal: dnsModal,
},
- methods: {
- },
computed: {
isAdvanced: {
get: function () { return dnsModal.dnsServer.domains.length>0 }
diff --git a/web/html/xui/inbound_modal.html b/web/html/xui/inbound_modal.html
index 82e3abc2..70bb65f2 100644
--- a/web/html/xui/inbound_modal.html
+++ b/web/html/xui/inbound_modal.html
@@ -10,7 +10,7 @@
title: '',
visible: false,
confirmLoading: false,
- okText: '{{ i18n "sure" }}',
+ okText: '{{ i18n "confirm" }}',
isEdit: false,
confirm: null,
inbound: new Inbound(),
@@ -18,7 +18,7 @@
ok() {
ObjectUtil.execute(inModal.confirm, inModal.inbound, inModal.dbInbound);
},
- show({ title='', okText='{{ i18n "sure" }}', inbound=null, dbInbound=null, confirm=(inbound, dbInbound)=>{}, isEdit=false }) {
+ show({ title='', okText='{{ i18n "confirm" }}', inbound=null, dbInbound=null, confirm=(inbound, dbInbound)=>{}, isEdit=false }) {
this.title = title;
this.okText = okText;
if (inbound) {
diff --git a/web/html/xui/index.html b/web/html/xui/index.html
index 994c3c36..ce9897f0 100644
--- a/web/html/xui/index.html
+++ b/web/html/xui/index.html
@@ -203,7 +203,7 @@
{{ i18n "pages.index.upSpeed" }}
- UL: [[ sizeFormat(status.netIO.up) ]]/s
+ Up: [[ sizeFormat(status.netIO.up) ]]/s
@@ -212,7 +212,7 @@
{{ i18n "pages.index.downSpeed" }}
- DL: [[ sizeFormat(status.netIO.down) ]]/s
+ Down: [[ sizeFormat(status.netIO.down) ]]/s
@@ -400,7 +400,7 @@
this.xray = data.xray;
switch (this.xray.state) {
case State.Running:
- this.xray.color = '#3dbd7d';
+ this.xray.color = 'blue';
break;
case State.Stop:
this.xray.color = "orange";
diff --git a/web/html/xui/settings.html b/web/html/xui/settings.html
index ad95d328..fab91f2b 100644
--- a/web/html/xui/settings.html
+++ b/web/html/xui/settings.html
@@ -290,7 +290,7 @@
title: '{{ i18n "pages.settings.restartPanel" }}',
content: '{{ i18n "pages.settings.restartPanelDesc" }}',
class: themeSwitcher.currentTheme,
- okText: '{{ i18n "sure" }}',
+ okText: '{{ i18n "confirm" }}',
cancelText: '{{ i18n "cancel" }}',
onOk: () => resolve(),
});
diff --git a/web/html/xui/xray.html b/web/html/xui/xray.html
index d8906908..02ee0bbf 100644
--- a/web/html/xui/xray.html
+++ b/web/html/xui/xray.html
@@ -141,13 +141,11 @@
description='{{ i18n "pages.xray.RoutingStrategyDesc" }}'/>
-
-
- [[ s ]]
-
-
+
+ [[ s ]]
+
@@ -1300,7 +1298,7 @@
if (newValue) {
newTemplateSettings.dns = this.settingsData.familyProtectDNS;
} else {
- delete newTemplateSettings.dns;
+ newTemplateSettings.dns?.servers?.filter(data => !this.settingsData.familyProtectDNS.servers.includes(data))
}
this.templateSettings = newTemplateSettings;
},
diff --git a/web/html/xui/xray_outbound_modal.html b/web/html/xui/xray_outbound_modal.html
index 2941e096..507ffcac 100644
--- a/web/html/xui/xray_outbound_modal.html
+++ b/web/html/xui/xray_outbound_modal.html
@@ -11,7 +11,7 @@
title: '',
visible: false,
confirmLoading: false,
- okText: '{{ i18n "sure" }}',
+ okText: '{{ i18n "confirm" }}',
isEdit: false,
confirm: null,
outbound: new Outbound(),
@@ -25,7 +25,7 @@
ok() {
ObjectUtil.execute(outModal.confirm, outModal.outbound.toJson());
},
- show({ title='', okText='{{ i18n "sure" }}', outbound, confirm=(outbound)=>{}, isEdit=false, tags=[] }) {
+ show({ title='', okText='{{ i18n "confirm" }}', outbound, confirm=(outbound)=>{}, isEdit=false, tags=[] }) {
this.title = title;
this.okText = okText;
this.confirm = confirm;
diff --git a/web/html/xui/xray_reverse_modal.html b/web/html/xui/xray_reverse_modal.html
index cb4e7037..14c5a765 100644
--- a/web/html/xui/xray_reverse_modal.html
+++ b/web/html/xui/xray_reverse_modal.html
@@ -38,7 +38,6 @@
:options="reverseModal.inboundTags">
-