IP测试时同时也检查绑定的IP名单

web/public/js/components/common/tip-message-box.js

@@ -29,7 +29,7 @@ Vue.component("tip-message-box", {
 	},
 	template: `<div class="ui icon message" v-if="visible">
 	<i class="icon info circle"></i>
-	<i class="close icon" title="取消" @click.prevent="close"></i>
+	<i class="close icon" title="取消" @click.prevent="close" style="margin-top: 1em"></i>
 	<div class="content">
 		<slot></slot>
 	</div>

web/public/js/components/iplist/ip-list-bind-box.js

@@ -55,7 +55,7 @@ Vue.component("ip-list-bind-box", {
 	template: `<div>
 	<a href="" @click.prevent="bind()">绑定+</a> &nbsp; <span v-if="lists.length > 0"><span class="disabled small">|&nbsp;</span> 已绑定：</span>
 	<div class="ui label basic small" v-for="(list, index) in lists">
-		{{list.name}}
+		<a :href="'/servers/iplists/list?listId=' + list.id" title="点击查看详情" style="opacity: 1">{{list.name}}</a>
 		<a href="" title="删除" @click.prevent="remove(index, list.id)"><i class="icon remove small"></i></a>
 	</div>
 </div>`

web/views/@default/dashboard/boards/index.css

@@ -1,7 +1,7 @@
 .ui.message a .icon {
   position: absolute;
   right: 1em;
-  top: 1.8em;
+  top: 2.8em;
 }
 .grid {
   margin-top: 2em !important;

web/views/@default/dashboard/boards/index.less

@@ -3,7 +3,7 @@
 		.icon {
 			position: absolute;
 			right: 1em;
-			top: 1.8em;
+			top: 2.8em;
 		}
 	}
 }

web/views/@default/dashboard/index.css

@@ -1,7 +1,7 @@
 .ui.message a .icon {
   position: absolute;
   right: 1em;
-  top: 1.8em;
+  top: 2.8em;
 }
 .grid {
   margin-top: 2em !important;

web/views/@default/dashboard/index.less

@@ -3,7 +3,7 @@
 		.icon {
 			position: absolute;
 			right: 1em;
-			top: 1.8em;
+			top: 2.8em;
 		}
 	}
 }

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

@@ -1,5 +1,4 @@
 {$layout}
-
 {$template "../waf_menu"}
 {$template "menu"}
 
@@ -24,10 +23,10 @@
                     <div v-if="result.isFound">
                         <div v-if="result.item != null">
                             <div v-if="result.isAllowed">
-                                    <span class="green">在白名单中 <ip-item-text :v-item="result.item"></ip-item-text>&nbsp;<a href="" @click.prevent="updateItem(result.list.id, result.item.id)" title="查看和修改"><i class="icon pencil small"></i></a></span>
+                                <span class="green">在 {{result.list.name}} 中 <ip-item-text :v-item="result.item"></ip-item-text>&nbsp;<a href="" @click.prevent="updateItem(result.item.id)" title="查看和修改"><i class="icon pencil small"></i></a></span>
                             </div>
                             <div v-else>
-                                    <span class="red">在黑名单中 <ip-item-text :v-item="result.item"></ip-item-text>&nbsp;<a href="" @click.prevent="updateItem(result.list.id, result.item.id)" title="查看和修改"><i class="icon pencil small"></i></a></span>
+                                <span class="red">在 {{result.list.name}} 中 <ip-item-text :v-item="result.item"></ip-item-text>&nbsp;<a href="" @click.prevent="updateItem( result.item.id)" title="查看和修改"><i class="icon pencil small"></i></a></span>
                             </div>
                         </div>
                         <div v-if="result.province != null">

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

@@ -8,23 +8,23 @@
 <table class="ui table selectable celled" v-if="lists.length > 0">
     <thead>
     <tr>
-        <th class="two wide">ID</th>
+        <th class="two wide center">ID</th>
         <th>名称</th>
-        <th class="two wide">类型</th>
+        <th class="two wide center">类型</th>
         <th>备注</th>
-        <th class="two wide">IP数量</th>
+        <th class="two wide center">IP数量</th>
         <th class="two op">操作</th>
     </tr>
     </thead>
     <tr v-for="list in lists">
-        <td>{{list.id}}</td>
+        <td class="center">{{list.id}}</td>
         <td>{{list.name}}</td>
-        <td>
+        <td class="center">
             <span v-if="list.type == 'black'">黑名单</span>
             <span v-if="list.type == 'white'">白名单</span>
         </td>
         <td>{{list.description}}</td>
-        <td>
+        <td class="center">
             <span v-if="list.countItems > 0">{{list.countItems}}</span>
             <span v-else class="disabled">0</span>
         </td>

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

@@ -8,23 +8,23 @@
 <table class="ui table selectable celled" v-if="lists.length > 0">
     <thead>
         <tr>
-            <th class="one wide">ID</th>
-            <th>名称</th>
-            <th class="two wide">类型</th>
+            <th class="one wide center">ID</th>
+            <th class="three wide">名称</th>
+            <th class="two wide center">类型</th>
             <th>备注</th>
-            <th class="two wide">IP数量</th>
+            <th class="two wide center">IP数量</th>
             <th class="two op">操作</th>
         </tr>
     </thead>
     <tr v-for="list in lists">
-        <td>{{list.id}}</td>
+        <td class="center">{{list.id}}</td>
         <td>{{list.name}}</td>
-        <td>
+        <td class="center">
             <span v-if="list.type == 'black'">黑名单</span>
             <span v-if="list.type == 'white'">白名单</span>
         </td>
         <td>{{list.description}}</td>
-        <td>
+        <td class="center">
             <span v-if="list.countItems > 0">{{list.countItems}}</span>
             <span v-else class="disabled">0</span>
         </td>