优化修改IP名单中IP信息

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

@@ -39,12 +39,6 @@
             </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,10 +57,7 @@
                 </td>
             </tr>
         </tbody>
-		<tr>
-			<td colspan="2"><more-options-indicator></more-options-indicator></td>
-		</tr>
-		<tbody v-show="moreOptionsVisible">
+
         <tr>
             <td>过期时间</td>
             <td>
@@ -74,6 +65,18 @@
                 <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><input type="text" name="reason" maxlength="100" v-model="item.reason"/></td>

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>

web/views/@default/servers/iplists/updateIPPopup.html

@@ -38,13 +38,6 @@
             </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>

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>