增加IP级别和WAF动作

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

@@ -1,7 +1,7 @@
 {$layout "layout_popup"}
 
-<h3 v-if="type == 'white'">添加IP到白名单</h3>
-<h3 v-if="type == 'black'">添加IP到黑名单</h3>
+<h3 v-if="listType == 'white'">添加IP到白名单</h3>
+<h3 v-if="listType == 'black'">添加IP到黑名单</h3>
 
 <form method="post" class="ui form" data-tea-action="$" data-tea-success="success">
 	<input type="hidden" name="firewallPolicyId" :value="firewallPolicyId"/>
@@ -49,6 +49,14 @@
                 </td>
             </tr>
         </tbody>
+
+        <tr>
+            <td>级别</td>
+            <td>
+                <firewall-event-level-options :v-value="eventLevel"></firewall-event-level-options>
+            </td>
+        </tr>
+
 		<tr>
 			<td colspan="2"><more-options-indicator></more-options-indicator></td>
 		</tr>

web/views/@default/servers/components/waf/ipadmin/createIPPopup.js

@@ -1,3 +1,4 @@
 Tea.context(function () {
     this.type = "ipv4"
+    this.eventLevel = (this.listType == "white") ? "debug" : "critical"
 })

web/views/@default/servers/components/waf/ipadmin/lists.js

@@ -1,7 +1,7 @@
 Tea.context(function () {
 	this.updateItem = function (itemId) {
 		teaweb.popup(Tea.url(".updateIPPopup?firewallPolicyId=" + this.firewallPolicyId, {itemId: itemId}), {
-			height: "23em",
+			height: "26em",
 			callback: function () {
 				teaweb.success("保存成功", function () {
 					teaweb.reload()
@@ -27,7 +27,7 @@ Tea.context(function () {
 	 */
 	this.createIP = function (type) {
 		teaweb.popup("/servers/components/waf/ipadmin/createIPPopup?firewallPolicyId=" + this.firewallPolicyId + '&type=' + type, {
-			height: "23em",
+			height: "26em",
 			callback: function () {
 				window.location = "/servers/components/waf/ipadmin/lists?firewallPolicyId=" + this.firewallPolicyId + "&type=" + type
 			}

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

@@ -24,10 +24,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><a href="" @click.prevent="updateItem(result.list.id, result.item.id)" title="查看和修改"><i class="icon pencil small"></i></a></span>
+                                    <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>
                                 </div>
                                 <div v-else>
-                                    <span class="red">在黑名单中 <ip-item-text :v-item="result.item"></ip-item-text><a href="" @click.prevent="updateItem(result.list.id, result.item.id)" title="查看和修改"><i class="icon pencil small"></i></a></span>
+                                    <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>
                                 </div>
                             </div>
                             <div v-if="result.province != null">

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

@@ -24,7 +24,7 @@ Tea.context(function () {
 
     this.updateItem = function (itemId) {
         teaweb.popup(Tea.url(".updateIPPopup?firewallPolicyId=" + this.firewallPolicyId, {itemId: itemId}), {
-            height: "23em",
+            height: "26em",
             callback: function () {
                 teaweb.success("保存成功", function () {
                     teaweb.reload()
@@ -32,4 +32,16 @@ Tea.context(function () {
             }
         })
     }
+
+    /**
+     * 添加IP名单菜单
+     */
+    this.createIP = function (type) {
+        teaweb.popup("/servers/components/waf/ipadmin/createIPPopup?firewallPolicyId=" + this.firewallPolicyId + '&type=' + type, {
+            height: "26em",
+            callback: function () {
+                window.location = "/servers/components/waf/ipadmin/lists?firewallPolicyId=" + this.firewallPolicyId + "&type=" + type
+            }
+        })
+    }
 })

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

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