Merge branch 'MHSanaei:main' into main

web/html/form/allocate.html

@@ -1,15 +0,0 @@
-{{define "form/allocate"}}
-<a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
-    <a-form-item label='Strategy'>
-      <a-select v-model="inbound.allocate.strategy" :dropdown-class-name="themeSwitcher.currentTheme">
-        <a-select-option v-for="s in ['always','random']" :value="s">[[ s ]]</a-select-option>
-      </a-select>
-    </a-form-item>
-    <a-form-item label='Refresh'>
-      <a-input-number v-model.number="inbound.allocate.refresh" min="0"></a-input-number>
-    </a-form-item>
-    <a-form-item label='Concurrency'>
-      <a-input-number v-model.number="inbound.allocate.concurrency" min="0"></a-input-number>
-    </a-form-item>
-</a-form>
-{{end}}

web/html/form/inbound.html

@@ -163,13 +163,4 @@
     </a-collapse-panel>
 </a-collapse>
 
-<!-- allocate -->
-<!-- Temporarily disabled until we accepts range for port allocation
-<a-collapse>
-    <a-collapse-panel header='Allocate'>
-        {{template "form/allocate"}}
-    </a-collapse-panel>
-</a-collapse>
--->
-
 {{end}}

web/html/inbounds.html

@@ -1099,7 +1099,6 @@
                     settings: Inbound.Settings.getSettings(baseInbound.protocol).toString(),
                     streamSettings: baseInbound.stream.toString(),
                     sniffing: baseInbound.sniffing.toString(),
-                    allocate: baseInbound.allocate.toString(),
                 };
                 await this.submit('/panel/inbound/add', data, inModal);
             },
@@ -1151,7 +1150,6 @@
                   data.streamSettings = JSON.stringify({ sockopt: inbound.stream.sockopt.toJson() }, null, 2);
                 }
                 data.sniffing = inbound.sniffing.toString();
-                data.allocate = inbound.allocate.toString();
 
                 await this.submit('/panel/inbound/add', data, inModal);
             },
@@ -1177,7 +1175,6 @@
                   data.streamSettings = JSON.stringify({ sockopt: inbound.stream.sockopt.toJson() }, null, 2);
                 }
                 data.sniffing = inbound.sniffing.toString();
-                data.allocate = inbound.allocate.toString();
 
                 await this.submit(`/panel/inbound/update/${dbInbound.id}`, data, inModal);
             },