From 34bd39100b8fbd7a371ee7e2cba1cc5893d98f7e Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Sat, 13 Apr 2024 10:07:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BF=AE=E6=94=B9IP=E5=90=8D?=
 =?UTF-8?q?=E5=8D=95=E4=B8=ADIP=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/waf/ipadmin/updateIPPopup.html | 57 ++++++++++---------
 .../settings/waf/ipadmin/updateIPPopup.html   | 15 ++---
 .../servers/iplists/updateIPPopup.html        | 40 ++++++-------
 .../settings/waf/ipadmin/updateIPPopup.html   | 15 ++---
 4 files changed, 66 insertions(+), 61 deletions(-)

diff --git a/web/views/@default/servers/components/waf/ipadmin/updateIPPopup.html b/web/views/@default/servers/components/waf/ipadmin/updateIPPopup.html
index 5acf7c92..b8057cfa 100644
--- a/web/views/@default/servers/components/waf/ipadmin/updateIPPopup.html
+++ b/web/views/@default/servers/components/waf/ipadmin/updateIPPopup.html
@@ -24,27 +24,21 @@
 
         <!-- IPv4 -->
         <tbody v-if="type == 'ipv4'">
-        <tr>
-            <td>开始IP *</td>
-            <td>
-                <input type="text" name="ipFrom" maxlength="64" placeholder="x.x.x.x" ref="focus" v-model="item.ipFrom"/>
-            </td>
-        </tr>
-        <tr>
-            <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>
-            </td>
-        </tr>
+            <tr>
+                <td>开始IP *</td>
+                <td>
+                    <input type="text" name="ipFrom" maxlength="64" placeholder="x.x.x.x" ref="focus" v-model="item.ipFrom"/>
+                </td>
+            </tr>
+            <tr>
+                <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>
+                </td>
+            </tr>
         </tbody>
 
-        <tr>
-            <td>级别</td>
-            <td>
-                <firewall-event-level-options :v-value="item.eventLevel"></firewall-event-level-options>
-            </td>
-        </tr>
 
         <!-- IPv6 -->
         <tbody v-if="type == 'ipv6'">
@@ -63,17 +57,26 @@
                 </td>
             </tr>
         </tbody>
-		<tr>
+
+        <tr>
+            <td>过期时间</td>
+            <td>
+                <datetime-input :v-name="'expiredAt'" :v-timestamp="item.expiredAt"></datetime-input>
+                <p class="comment">在加入名单某一段时间后会失效，留空表示永久有效。</p>
+            </td>
+        </tr>
+
+        <tr>
+            <td>级别</td>
+            <td>
+                <firewall-event-level-options :v-value="item.eventLevel"></firewall-event-level-options>
+            </td>
+        </tr>
+
+        <tr>
 			<td colspan="2"><more-options-indicator></more-options-indicator></td>
 		</tr>
 		<tbody v-show="moreOptionsVisible">
-			<tr>
-				<td>过期时间</td>
-				<td>
-					<datetime-input :v-name="'expiredAt'" :v-timestamp="item.expiredAt"></datetime-input>
-					<p class="comment">在加入名单某一段时间后会失效，留空表示永久有效。</p>
-				</td>
-			</tr>
 			<tr>
 				<td>备注</td>
 				<td><input type="text" name="reason" maxlength="100" v-model="item.reason"/></td>
diff --git a/web/views/@default/servers/groups/group/settings/waf/ipadmin/updateIPPopup.html b/web/views/@default/servers/groups/group/settings/waf/ipadmin/updateIPPopup.html
index a8f07c18..5b34de05 100644
--- a/web/views/@default/servers/groups/group/settings/waf/ipadmin/updateIPPopup.html
+++ b/web/views/@default/servers/groups/group/settings/waf/ipadmin/updateIPPopup.html
@@ -56,6 +56,14 @@
             </tr>
         </tbody>
 
+        <tr>
+            <td>过期时间</td>
+            <td>
+                <datetime-input :v-name="'expiredAt'" :v-timestamp="item.expiredAt"></datetime-input>
+                <p class="comment">在加入名单某一段时间后会失效，留空表示永久有效。</p>
+            </td>
+        </tr>
+
         <tr>
             <td>级别</td>
             <td>
@@ -67,13 +75,6 @@
 			<td colspan="2"><more-options-indicator></more-options-indicator></td>
 		</tr>
 		<tbody v-show="moreOptionsVisible">
-			<tr>
-				<td>过期时间</td>
-				<td>
-					<datetime-input :v-name="'expiredAt'" :v-timestamp="item.expiredAt"></datetime-input>
-					<p class="comment">在加入名单某一段时间后会失效，留空表示永久有效。</p>
-				</td>
-			</tr>
 			<tr>
 				<td>备注</td>
 				<td><input type="text" name="reason" maxlength="100" v-model="item.reason"/></td>
diff --git a/web/views/@default/servers/iplists/updateIPPopup.html b/web/views/@default/servers/iplists/updateIPPopup.html
index 33e0d953..a99bbe19 100644
--- a/web/views/@default/servers/iplists/updateIPPopup.html
+++ b/web/views/@default/servers/iplists/updateIPPopup.html
@@ -23,28 +23,21 @@
 
         <!-- IPv4 -->
         <tbody v-if="type == 'ipv4'">
-        <tr>
-            <td>开始IP *</td>
-            <td>
-                <input type="text" name="ipFrom" maxlength="64" placeholder="x.x.x.x" ref="focus" v-model="item.ipFrom"/>
-            </td>
-        </tr>
-        <tr>
-            <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>
-            </td>
-        </tr>
+            <tr>
+                <td>开始IP *</td>
+                <td>
+                    <input type="text" name="ipFrom" maxlength="64" placeholder="x.x.x.x" ref="focus" v-model="item.ipFrom"/>
+                </td>
+            </tr>
+            <tr>
+                <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>
+                </td>
+            </tr>
         </tbody>
 
-        <tr>
-            <td>级别</td>
-            <td>
-                <firewall-event-level-options :v-value="item.eventLevel"></firewall-event-level-options>
-            </td>
-        </tr>
-
         <!-- IPv6 -->
         <tbody v-if="type == 'ipv6'">
             <tr>
@@ -71,6 +64,13 @@
             </td>
         </tr>
 
+        <tr>
+            <td>级别</td>
+            <td>
+                <firewall-event-level-options :v-value="item.eventLevel"></firewall-event-level-options>
+            </td>
+        </tr>
+
 		<tr>
 			<td colspan="2"><more-options-indicator></more-options-indicator></td>
 		</tr>
diff --git a/web/views/@default/servers/server/settings/waf/ipadmin/updateIPPopup.html b/web/views/@default/servers/server/settings/waf/ipadmin/updateIPPopup.html
index a8f07c18..5b34de05 100644
--- a/web/views/@default/servers/server/settings/waf/ipadmin/updateIPPopup.html
+++ b/web/views/@default/servers/server/settings/waf/ipadmin/updateIPPopup.html
@@ -56,6 +56,14 @@
             </tr>
         </tbody>
 
+        <tr>
+            <td>过期时间</td>
+            <td>
+                <datetime-input :v-name="'expiredAt'" :v-timestamp="item.expiredAt"></datetime-input>
+                <p class="comment">在加入名单某一段时间后会失效，留空表示永久有效。</p>
+            </td>
+        </tr>
+
         <tr>
             <td>级别</td>
             <td>
@@ -67,13 +75,6 @@
 			<td colspan="2"><more-options-indicator></more-options-indicator></td>
 		</tr>
 		<tbody v-show="moreOptionsVisible">
-			<tr>
-				<td>过期时间</td>
-				<td>
-					<datetime-input :v-name="'expiredAt'" :v-timestamp="item.expiredAt"></datetime-input>
-					<p class="comment">在加入名单某一段时间后会失效，留空表示永久有效。</p>
-				</td>
-			</tr>
 			<tr>
 				<td>备注</td>
 				<td><input type="text" name="reason" maxlength="100" v-model="item.reason"/></td>