diff --git a/web/html/xui/form/stream/stream_tcp.html b/web/html/xui/form/stream/stream_tcp.html index 3fa0cec9..941a3d79 100644 --- a/web/html/xui/form/stream/stream_tcp.html +++ b/web/html/xui/form/stream/stream_tcp.html @@ -33,7 +33,7 @@ - + + + diff --git a/web/html/xui/settings.html b/web/html/xui/settings.html index 0725cdf9..e7fcf663 100644 --- a/web/html/xui/settings.html +++ b/web/html/xui/settings.html @@ -412,9 +412,7 @@ if (msg.success) { this.loading(true); await PromiseUtil.sleep(5000); - var { webCertFile, webKeyFile, webDomain: host, webPort: port, webBasePath: base } = this.allSetting; - if (host == this.oldAllSetting.webDomain) host = null; - if (port == this.oldAllSetting.webPort) port = null; + let { webCertFile, webKeyFile, webDomain: host, webPort: port, webBasePath: base } = this.allSetting; const isTLS = webCertFile !== "" || webKeyFile !== ""; const url = buildURL({ host, port, isTLS, base, path: "panel/settings" }); window.location.replace(url); diff --git a/web/html/xui/xray.html b/web/html/xui/xray.html index 6e727d57..98e1bd4f 100644 --- a/web/html/xui/xray.html +++ b/web/html/xui/xray.html @@ -70,7 +70,7 @@ {{ i18n "pages.xray.save" }} {{ i18n "pages.xray.restart" }} + :overlay-class-name="themeSwitcher.currentTheme"> Error in running xray-core [[ line ]] @@ -83,15 +83,15 @@ { if(activeKey == 'tpl-4') this.changeCode(); }" - :class="themeSwitcher.currentTheme"> + @change="(activeKey) => { if(activeKey == 'tpl-4') this.changeCode(); }" + :class="themeSwitcher.currentTheme"> {{ i18n "pages.settings.resetDefaultConfig" }} @@ -109,16 +109,16 @@ - + + v-model="freedomStrategy" + :dropdown-class-name="themeSwitcher.currentTheme" + style="width: 100%"> [[ s ]] @@ -127,22 +127,22 @@ - + + v-model="routingStrategy" + :dropdown-class-name="themeSwitcher.currentTheme" + style="width: 100%"> [[ s ]] - + @@ -157,6 +157,7 @@ + @@ -174,7 +175,7 @@ - + @@ -192,8 +193,8 @@ - - + + @@ -225,15 +226,15 @@ + message='{{ i18n "pages.xray.RoutingsDesc"}}' show-icon> {{ i18n "pages.xray.rules.add" }} + :row-key="r => r.key" + :data-source="routingRuleData" + :scroll="isMobile ? {} : { x: 1000 }" + :pagination="false" + :indent-size="0" + :style="isMobile ? 'padding: 5px 0' : 'margin-top: 10px;'"> [[ index+1 ]] @@ -286,8 +287,8 @@ + v-if="(rule.source+rule.sourcePort+rule.network+rule.protocol+rule.attrs+rule.ip+rule.domain+rule.port).length>0" + :overlay-class-name="themeSwitcher.currentTheme" trigger="click"> @@ -338,12 +339,12 @@ {{ i18n "pages.xray.Outbounds"}} + :row-key="r => r.key" + :data-source="outboundData" + :scroll="isMobile ? {} : { x: 200 }" + :pagination="false" + :indent-size="0" + :style="isMobile ? 'padding: 5px 5px' : 'margin-right: 1px;'"> [[ index+1 ]] @@ -377,12 +378,12 @@ {{ i18n "pages.xray.outbound.reverse"}} + :row-key="r => r.key" + :data-source="reverseData" + :scroll="isMobile ? {} : { x: 200 }" + :pagination="false" + :indent-size="0" + :style="isMobile ? 'padding: 5px 0' : 'margin-left: 1px;'"> [[ index+1 ]] @@ -427,22 +428,22 @@ {{template "outModal"}} {{template "reverseModal"}}
[[ line ]]
{{ i18n "pages.xray.Outbounds"}}
{{ i18n "pages.xray.outbound.reverse"}}