-
+
[[ method ]]
diff --git a/web/html/xui/inbound_info_modal.html b/web/html/xui/inbound_info_modal.html
index 00cb5ce647..fae058ad5d 100644
--- a/web/html/xui/inbound_info_modal.html
+++ b/web/html/xui/inbound_info_modal.html
@@ -179,6 +179,19 @@
[[ inbound.settings.network ]] |
+
+ URL
+
+ [[ link.remark ]]
[[ link.link ]]
+
+
+
+
+
+
+
{{ i18n "pages.inbounds.targetAddress" }} |
@@ -251,7 +264,7 @@
this.clientSettings = this.settings.clients ? Object.values(this.settings.clients)[index] : null;
this.isExpired = this.inbound.isExpiry(index);
this.clientStats = this.settings.clients ? this.dbInbound.clientStats.find(row => row.email === this.clientSettings.email) : [];
- remark = this.dbInbound.remark + "-" + this.clientSettings.email;
+ remark = this.dbInbound.remark + ( this.clientSettings ? "-" + this.clientSettings.email : '');
address = this.dbInbound.address;
this.links = [];
if (this.inbound.tls && !ObjectUtil.isArrEmpty(this.inbound.stream.tls.settings.domains)) {
diff --git a/web/html/xui/inbound_modal.html b/web/html/xui/inbound_modal.html
index 60244be4ae..65988b14aa 100644
--- a/web/html/xui/inbound_modal.html
+++ b/web/html/xui/inbound_modal.html
@@ -54,23 +54,11 @@
},
};
- const protocols = {
- VMESS: Protocols.VMESS,
- VLESS: Protocols.VLESS,
- TROJAN: Protocols.TROJAN,
- SHADOWSOCKS: Protocols.SHADOWSOCKS,
- DOKODEMO: Protocols.DOKODEMO,
- SOCKS: Protocols.SOCKS,
- HTTP: Protocols.HTTP,
- };
-
new Vue({
delimiters: ['[[', ']]'],
el: '#inbound-modal',
data: {
inModal: inModal,
- Protocols: protocols,
- SSMethods: SSMethods,
delayedStart: false,
get inbound() {
return inModal.inbound;
@@ -117,6 +105,17 @@
});
}
},
+ SSMethodChange() {
+ if (this.inModal.inbound.isSSMultiUser) {
+ if (this.inModal.inbound.settings.shadowsockses.length ==0){
+ this.inModal.inbound.settings.shadowsockses = [new Inbound.ShadowsocksSettings.Shadowsocks()];
+ }
+ } else {
+ if (this.inModal.inbound.settings.shadowsockses.length > 0){
+ this.inModal.inbound.settings.shadowsockses = [];
+ }
+ }
+ },
setDefaultCertData(index) {
inModal.inbound.stream.tls.certs[index].certFile = app.defaultCert;
inModal.inbound.stream.tls.certs[index].keyFile = app.defaultKey;
diff --git a/web/html/xui/inbounds.html b/web/html/xui/inbounds.html
index 193c080b85..39c64aff56 100644
--- a/web/html/xui/inbounds.html
+++ b/web/html/xui/inbounds.html
@@ -131,7 +131,11 @@
{{ i18n "edit" }}
-
+
+
+ {{ i18n "qrCode" }}
+
+
{{ i18n "pages.client.add"}}
@@ -255,7 +259,7 @@
{{template "client_table"}}
-
const columns = [{
title: '{{ i18n "pages.inbounds.operate" }}',
align: 'center',
@@ -357,7 +360,7 @@
trafficDiff: 0,
defaultCert: '',
defaultKey: '',
- clientCount: {},
+ clientCount: [],
isRefreshEnabled: localStorage.getItem("isRefreshEnabled") === "true" ? true : false,
refreshing: false,
refreshInterval: Number(localStorage.getItem("refreshInterval")) || 5000,
@@ -409,12 +412,16 @@
setInbounds(dbInbounds) {
this.inbounds.splice(0);
this.dbInbounds.splice(0);
+ this.clientCount.splice(0);
for (const inbound of dbInbounds) {
const dbInbound = new DBInbound(inbound);
to_inbound = dbInbound.toInbound()
this.inbounds.push(to_inbound);
this.dbInbounds.push(dbInbound);
if ([Protocols.VMESS, Protocols.VLESS, Protocols.TROJAN, Protocols.SHADOWSOCKS].includes(inbound.protocol)) {
+ if (inbound.protocol === Protocols.SHADOWSOCKS && (!to_inbound.isSSMultiUser)) {
+ continue;
+ }
this.clientCount[inbound.id] = this.getClientCounts(inbound, to_inbound);
}
}