TCP、TLS、UDP支持端口范围

web/public/js/components/common/network-addresses-box.js

@@ -1,5 +1,5 @@
 Vue.component("network-addresses-box", {
-	props: ["v-server-type", "v-addresses", "v-protocol", "v-name", "v-from"],
+	props: ["v-server-type", "v-addresses", "v-protocol", "v-name", "v-from", "v-support-range"],
 	data: function () {
 		let addresses = this.vAddresses
 		if (addresses == null) {
@@ -24,7 +24,8 @@ Vue.component("network-addresses-box", {
 			addresses: addresses,
 			protocol: protocol,
 			name: name,
-			from: from
+			from: from,
+			supportRange: this.vSupportRange
 		}
 	},
 	watch: {
@@ -41,10 +42,16 @@ Vue.component("network-addresses-box", {
 		addAddr: function () {
 			let that = this
 			window.UPDATING_ADDR = null
-			teaweb.popup("/servers/addPortPopup?serverType=" + this.vServerType + "&protocol=" + this.protocol + "&from=" + this.from, {
-				height: "16em",
+			teaweb.popup("/servers/addPortPopup?serverType=" + this.vServerType + "&protocol=" + this.protocol + "&from=" + this.from + "&supportRange=" + (this.supportRange ? 1 : 0), {
+				height: "18em",
 				callback: function (resp) {
 					var addr = resp.data.address
+					if (that.addresses.$find(function (k, v) {
+						return addr.host == v.host && addr.portRange == v.portRange && addr.protocol == v.protocol
+					}) != null) {
+						teaweb.warn("要添加的网络地址已经存在")
+						return
+					}
 					that.addresses.push(addr)
 					if (["https", "https4", "https6"].$contains(addr.protocol)) {
 						this.tlsProtocolName = "HTTPS"
@@ -66,8 +73,8 @@ Vue.component("network-addresses-box", {
 		updateAddr: function (index, addr) {
 			let that = this
 			window.UPDATING_ADDR = addr
-			teaweb.popup("/servers/addPortPopup?serverType=" + this.vServerType + "&protocol=" + this.protocol + "&from=" + this.from, {
-				height: "16em",
+			teaweb.popup("/servers/addPortPopup?serverType=" + this.vServerType + "&protocol=" + this.protocol + "&from=" + this.from + "&supportRange=" + (this.supportRange ? 1 : 0), {
+				height: "18em",
 				callback: function (resp) {
 					var addr = resp.data.address
 					Vue.set(that.addresses, index, addr)
@@ -91,7 +98,7 @@ Vue.component("network-addresses-box", {
 	<input type="hidden" :name="name" :value="JSON.stringify(addresses)"/>
 	<div v-if="addresses.length > 0">
 		<div class="ui label small basic" v-for="(addr, index) in addresses">
-			{{addr.protocol}}://<span v-if="addr.host.length > 0">{{addr.host.quoteIP()}}</span><span v-if="addr.host.length == 0">*</span>:{{addr.portRange}}
+			{{addr.protocol}}://<span v-if="addr.host.length > 0">{{addr.host.quoteIP()}}</span><span v-if="addr.host.length == 0">*</span>:<span v-if="addr.portRange.indexOf('-')<0">{{addr.portRange}}</span><span v-else style="font-style: italic">{{addr.portRange}}</span>
 			<a href="" @click.prevent="updateAddr(index, addr)" title="修改"><i class="icon pencil small"></i></a>
 			<a href="" @click.prevent="removeAddr(index)" title="删除"><i class="icon remove"></i></a> </div>
 		<div class="ui divider"></div>

web/views/@default/servers/addPortPopup.html

@@ -3,6 +3,7 @@
 <h3 v-if="!isUpdating">添加端口绑定</h3>
 <h3 v-if="isUpdating">修改端口绑定</h3>
 <form method="post" class="ui form" data-tea-action="$" data-tea-success="success">
+    <input type="hidden" name="supportRange" :value="supportRange ? 1 : 0"/>
 	<table class="ui table definition selectable">
 		<tr>
 			<td>网络协议</td>
@@ -16,7 +17,7 @@
 			<td class="title">端口 *</td>
 			<td>
 				<input type="text" name="address" ref="focus" v-model="address"/>
-				<p class="comment">可以是一个数字端口（通常不超过65535），也可以是"地址:端口"的方式。
+                <p class="comment">可以是一个数字端口（通常不超过65535），也可以是"地址:端口"的方式。<span v-if="supportRange">支持端口范围，形式为<code-label>port1-port2</code-label>。</span>
                     <span v-if="from.length == 0 && protocol == 'http'">HTTP常用端口为<a href="" title="点击添加" @click.prevent="addPort('80')">80</a>。</span>
                     <span v-if="from.length == 0 && protocol == 'https'">HTTPS常用端口为<a href="" title="点击添加" @click.prevent="addPort('443')">443</a>。</span>
                 </p>

web/views/@default/servers/server/settings/tcp/index.html

@@ -10,7 +10,7 @@
 			<tr>
 				<td class="title">绑定端口 *</td>
 				<td>
-					<network-addresses-box :v-server-type="serverType" :v-addresses="tcpConfig.listen" :v-protocol="'tcp'"></network-addresses-box>
+					<network-addresses-box :v-server-type="serverType" :v-addresses="tcpConfig.listen" :v-protocol="'tcp'" :v-support-range="true"></network-addresses-box>
 				</td>
 			</tr>
 		</table>

web/views/@default/servers/server/settings/tls/index.html

@@ -14,7 +14,7 @@
 			<tr>
 				<td class="title">绑定端口 *</td>
 				<td>
-					<network-addresses-box :v-server-type="serverType" :v-addresses="tlsConfig.listen" :v-protocol="'tls'"></network-addresses-box>
+					<network-addresses-box :v-server-type="serverType" :v-addresses="tlsConfig.listen" :v-protocol="'tls'" :v-support-range="true"></network-addresses-box>
 				</td>
 			</tr>
 		</table>

web/views/@default/servers/server/settings/udp/index.html

@@ -9,7 +9,7 @@
 			<tr>
 				<td class="title">绑定端口 *</td>
 				<td>
-					<network-addresses-box :v-server-type="serverType" :v-addresses="udpConfig.listen" :v-protocol="'udp'"></network-addresses-box>
+					<network-addresses-box :v-server-type="serverType" :v-addresses="udpConfig.listen" :v-protocol="'udp'" :v-support-range="true"></network-addresses-box>
 				</td>
 			</tr>
 		</table>