TRKJ/EdgeAdmin
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAdmin.git synced 2025-11-03 12:20:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

IP名单支持IPv6范围

Browse Source
This commit is contained in:
GoEdgeLab
2024-04-06 14:55:29 +08:00
parent 8ea518d7e6
commit 9c6d6e7b8d
13 changed files with 137 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/public/js/components/iplist/ip-list-table.js
View File

@@ -199,12 +199,12 @@ Vue.component("ip-list-table", {
<td>
<div v-if="item.expiredTime.length > 0">
{{item.expiredTime}}
<div v-if="item.isExpired" style="margin-top: 0.5em">
<div v-if="item.isExpired && item.lifeSeconds == null" style="margin-top: 0.5em">
<span class="ui label tiny basic red">已过期</span>
</div>
<div v-if="item.lifeSeconds != null">
<span class="small grey" v-if="item.lifeSeconds > 0">{{formatSeconds(item.lifeSeconds)}}</span>
<span class="small red">已过期</span>
<span class="small red" v-if="item.lifeSeconds < 0">已过期</span>
</div>
</div>
<span v-else class="disabled">不过期</span>

23
web/views/@default/servers/components/waf/ipadmin/updateIPPopup.html
View File

@@ -34,7 +34,7 @@
<td>结束IP</td>
<td>
<input type="text" name="ipTo" maxlength="64" placeholder="x.x.x.x" v-model="item.ipTo"/>
<p class="comment">表示IP段的时候需要填写此项。</p>
<p class="comment">只有表示IP段的时候才需要填写此项。</p>
</td>
</tr>
</tbody>
@@ -48,13 +48,20 @@
<!-- IPv6 -->
<tbody v-if="type == 'ipv6'">
<tr>
<td>IP *</td>
<td>
<input type="text" name="ipFrom" maxlength="64" placeholder="x:x:x:x:x:x:x:x" ref="focus" v-model="item.ipFrom"/>
<p class="comment">IPv6地址，比如 1406:3c00:0:2409:13:58:103:15</p>
</td>
</tr>
<tr>
<td>开始IP *</td>
<td>
<input type="text" name="ipFrom" maxlength="64" placeholder="x:x:x:x:x:x:x:x" ref="focus" v-model="item.ipFrom"/>
<p class="comment">IPv6地址，比如 1406:3c00:0:2409:13:58:103:15</p>
</td>
</tr>
<tr>
<td>结束IP</td>
<td>
<input type="text" name="ipTo" maxlength="64" placeholder="x:x:x:x:x:x:x:x" ref="focus" v-model="item.ipTo"/>
<p class="comment">只有表示IP段的时候才需要填写此项。</p>
</td>
</tr>
</tbody>
<tr>
<td colspan="2"><more-options-indicator></more-options-indicator></td>

11
web/views/@default/servers/groups/group/settings/waf/ipadmin/updateIPPopup.html
View File

@@ -33,7 +33,7 @@
<td>结束IP</td>
<td>
<input type="text" name="ipTo" maxlength="64" placeholder="x.x.x.x" v-model="item.ipTo"/>
<p class="comment">表示IP段的时候需要填写此项。</p>
<p class="comment">只有表示IP段的时候才需要填写此项。</p>
</td>
</tr>
</tbody>
@@ -41,12 +41,19 @@
<!-- IPv6 -->
<tbody v-if="type == 'ipv6'">
<tr>
<td>IP *</td>
<td>开始IP *</td>
<td>
<input type="text" name="ipFrom" maxlength="64" placeholder="x:x:x:x:x:x:x:x" ref="focus" v-model="item.ipFrom"/>
<p class="comment">IPv6地址，比如 1406:3c00:0:2409:13:58:103:15</p>
</td>
</tr>
<tr>
<td>结束IP</td>
<td>
<input type="text" name="ipTo" maxlength="64" placeholder="x:x:x:x:x:x:x:x" ref="focus" v-model="item.ipTo"/>
<p class="comment">只有表示IP段的时候才需要填写此项。</p>
</td>
</tr>
</tbody>
<tr>

11
web/views/@default/servers/iplists/createIPPopup.html
View File

@@ -42,7 +42,7 @@
<td>结束IP</td>
<td>
<input type="text" name="ipTo" maxlength="64" placeholder="x.x.x.x" style="width: 10em"/>
<p class="comment">表示IP段的时候需要填写此项。</p>
<p class="comment">只有表示IP段的时候才需要填写此项。</p>
</td>
</tr>
</tbody>
@@ -50,12 +50,19 @@
<!-- IPv6 -->
<tbody v-if="method == 'single' && type == 'ipv6'">
<tr>
<td>IP *</td>
<td>开始IP *</td>
<td>
<input type="text" name="ipFrom" maxlength="64" placeholder="x:x:x:x:x:x:x:x" ref="focus" style="width: 20em"/>
<p class="comment">IPv6地址，比如 1406:3c00:0:2409:13:58:103:15</p>
</td>
</tr>
<tr>
<td>结束IP</td>
<td>
<input type="text" name="ipTo" maxlength="64" placeholder="x:x:x:x:x:x:x:x" ref="focus" style="width: 20em"/>
<p class="comment">只有表示IP段的时候才需要填写此项。</p>
</td>
</tr>
</tbody>
<!-- 批量添加 -->

23
web/views/@default/servers/iplists/updateIPPopup.html
View File

@@ -33,7 +33,7 @@
<td>结束IP</td>
<td>
<input type="text" name="ipTo" maxlength="64" placeholder="x.x.x.x" v-model="item.ipTo"/>
<p class="comment">表示IP段的时候需要填写此项。</p>
<p class="comment">只有表示IP段的时候才需要填写此项。</p>
</td>
</tr>
</tbody>
@@ -47,13 +47,20 @@
<!-- IPv6 -->
<tbody v-if="type == 'ipv6'">
<tr>
<td>IP *</td>
<td>
<input type="text" name="ipFrom" maxlength="64" placeholder="x:x:x:x:x:x:x:x" ref="focus" v-model="item.ipFrom"/>
<p class="comment">IPv6地址，比如 1406:3c00:0:2409:13:58:103:15</p>
</td>
</tr>
<tr>
<td>开始IP *</td>
<td>
<input type="text" name="ipFrom" maxlength="64" placeholder="x:x:x:x:x:x:x:x" ref="focus" v-model="item.ipFrom"/>
<p class="comment">IPv6地址，比如 1406:3c00:0:2409:13:58:103:15</p>
</td>
</tr>
<tr>
<td>结束IP</td>
<td>
<input type="text" name="ipTo" maxlength="64" placeholder="x:x:x:x:x:x:x:x" ref="focus" v-model="item.ipTo"/>
<p class="comment">只有表示IP段的时候才需要填写此项。</p>
</td>
</tr>
</tbody>
<tr>

11
web/views/@default/servers/server/settings/waf/ipadmin/updateIPPopup.html
View File

@@ -33,7 +33,7 @@
<td>结束IP</td>
<td>
<input type="text" name="ipTo" maxlength="64" placeholder="x.x.x.x" v-model="item.ipTo"/>
<p class="comment">表示IP段的时候需要填写此项。</p>
<p class="comment">只有表示IP段的时候才需要填写此项。</p>
</td>
</tr>
</tbody>
@@ -41,12 +41,19 @@
<!-- IPv6 -->
<tbody v-if="type == 'ipv6'">
<tr>
<td>IP *</td>
<td>开始IP *</td>
<td>
<input type="text" name="ipFrom" maxlength="64" placeholder="x:x:x:x:x:x:x:x" ref="focus" v-model="item.ipFrom"/>
<p class="comment">IPv6地址，比如 1406:3c00:0:2409:13:58:103:15</p>
</td>
</tr>
<tr>
<td>结束IP</td>
<td>
<input type="text" name="ipTo" maxlength="64" placeholder="x:x:x:x:x:x:x:x" ref="focus" v-model="item.ipTo"/>
<p class="comment">只有表示IP段的时候才需要填写此项。</p>
</td>
</tr>
</tbody>
<tr>