Browse Source

Minor fix in outbound form (#1810)

* Update outbound.html

* Update outbound.js

* Update outbound.html

* Update outbound.html
Shahin 1 year ago
parent
commit
ea67b9760d
2 changed files with 12 additions and 6 deletions
  1. 1 1
      web/assets/js/model/outbound.js
  2. 11 5
      web/html/xui/form/outbound.html

+ 1 - 1
web/assets/js/model/outbound.js

@@ -418,7 +418,7 @@ class Outbound extends CommonClass {
     }
 
     canEnableTls() {
-        if (![Protocols.VMess, Protocols.VLESS, Protocols.Trojan].includes(this.protocol)) return false;
+        if (![Protocols.VMess, Protocols.VLESS, Protocols.Trojan, Protocols.Shadowsocks].includes(this.protocol)) return false;
         return ["tcp", "ws", "http", "quic", "grpc"].includes(this.stream.network);
     }
 

+ 11 - 5
web/html/xui/form/outbound.html

@@ -213,17 +213,23 @@
         </a-form-item>
     </template>
 
-<!-- shadowsocks -->
-<template v-if="outbound.protocol === Protocols.Shadowsocks">
+<!-- trojan/shadowsocks -->
+    <template v-if="[Protocols.Trojan, Protocols.Shadowsocks].includes(outbound.protocol)">
+        <a-form-item label='{{ i18n "password" }}'>
+        <a-input v-model.trim="outbound.settings.password"></a-input>
+        </a-form-item>
+    </template>
+    <!-- shadowsocks -->
+    <template v-if="outbound.protocol === Protocols.Shadowsocks">
         <a-form-item label='{{ i18n "encryption" }}'>
             <a-select v-model="outbound.settings.method" :dropdown-class-name="themeSwitcher.currentTheme">
-                <a-select-option v-for="(method,method_name) in SSMethods" :value="method">[[ method_name ]]</a-select-option>
+                <a-select-option v-for="(method, method_name) in SSMethods" :value="method">[[ method_name ]]</a-select-option>
             </a-select>
         </a-form-item>
         <a-form-item label='UDP over TCP'>
             <a-switch v-model="outbound.settings.uot"></a-switch>
         </a-form-item>
-    </template>
+  </template>
 </template>
 
 <!-- stream settings -->
@@ -381,7 +387,7 @@
 
     <!-- reality settings -->
     <template v-if="outbound.stream.isReality">
-        <a-form-item label='{{ i18n "domainName" }}'>
+        <a-form-item label="SNI">
             <a-input v-model.trim="outbound.stream.reality.serverName"></a-input>
         </a-form-item>
         <a-form-item label="uTLS">