From 19dbc31162e173aeb446e1f91c1e1a3028ca3690 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Wed, 30 Mar 2022 09:41:14 +0800
Subject: [PATCH] =?UTF-8?q?IP=E5=88=97=E8=A1=A8=E5=8F=AF=E4=BB=A5=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E7=BA=A7=E5=88=AB=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../actions/default/servers/iplists/index.go  |  8 +++++++
 .../actions/default/servers/iplists/items.go  | 23 ++++++++++++-------
 web/views/@default/servers/iplists/index.html |  8 ++++++-
 web/views/@default/servers/iplists/items.html |  8 ++++++-
 4 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/internal/web/actions/default/servers/iplists/index.go b/internal/web/actions/default/servers/iplists/index.go
index cbc6e91f..4d427965 100644
--- a/internal/web/actions/default/servers/iplists/index.go
+++ b/internal/web/actions/default/servers/iplists/index.go
@@ -23,16 +23,19 @@ func (this *IndexAction) RunGet(params struct {
 	Ip         string
 	GlobalOnly bool
 	Unread     bool
+	EventLevel string
 }) {
 	this.Data["type"] = ""
 	this.Data["ip"] = params.Ip
 	this.Data["globalOnly"] = params.GlobalOnly
 	this.Data["unread"] = params.Unread
+	this.Data["eventLevel"] = params.EventLevel
 
 	countUnreadResp, err := this.RPC().IPItemRPC().CountAllEnabledIPItems(this.AdminContext(), &pb.CountAllEnabledIPItemsRequest{
 		Ip:         params.Ip,
 		GlobalOnly: params.GlobalOnly,
 		Unread:     true,
+		EventLevel: params.EventLevel,
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -44,6 +47,7 @@ func (this *IndexAction) RunGet(params struct {
 		Ip:         params.Ip,
 		GlobalOnly: params.GlobalOnly,
 		Unread:     params.Unread,
+		EventLevel: params.EventLevel,
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -57,6 +61,7 @@ func (this *IndexAction) RunGet(params struct {
 		Ip:         params.Ip,
 		GlobalOnly: params.GlobalOnly,
 		Unread:     params.Unread,
+		EventLevel: params.EventLevel,
 		Offset:     page.Offset,
 		Size:       page.Size,
 	})
@@ -166,5 +171,8 @@ func (this *IndexAction) RunGet(params struct {
 	}
 	this.Data["items"] = itemMaps
 
+	// 所有级别
+	this.Data["eventLevels"] = firewallconfigs.FindAllFirewallEventLevels()
+
 	this.Show()
 }
diff --git a/internal/web/actions/default/servers/iplists/items.go b/internal/web/actions/default/servers/iplists/items.go
index 86e70e25..e8c6756e 100644
--- a/internal/web/actions/default/servers/iplists/items.go
+++ b/internal/web/actions/default/servers/iplists/items.go
@@ -20,10 +20,12 @@ func (this *ItemsAction) Init() {
 }
 
 func (this *ItemsAction) RunGet(params struct {
-	ListId  int64
-	Keyword string
+	ListId     int64
+	Keyword    string
+	EventLevel string
 }) {
 	this.Data["keyword"] = params.Keyword
+	this.Data["eventLevel"] = params.EventLevel
 
 	err := InitIPList(this.Parent(), params.ListId)
 	if err != nil {
@@ -34,8 +36,9 @@ func (this *ItemsAction) RunGet(params struct {
 	// 数量
 	var listId = params.ListId
 	countResp, err := this.RPC().IPItemRPC().CountIPItemsWithListId(this.AdminContext(), &pb.CountIPItemsWithListIdRequest{
-		IpListId: listId,
-		Keyword:  params.Keyword,
+		IpListId:   listId,
+		Keyword:    params.Keyword,
+		EventLevel: params.EventLevel,
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -47,10 +50,11 @@ func (this *ItemsAction) RunGet(params struct {
 
 	// 列表
 	itemsResp, err := this.RPC().IPItemRPC().ListIPItemsWithListId(this.AdminContext(), &pb.ListIPItemsWithListIdRequest{
-		IpListId: listId,
-		Keyword:  params.Keyword,
-		Offset:   page.Offset,
-		Size:     page.Size,
+		IpListId:   listId,
+		Keyword:    params.Keyword,
+		EventLevel: params.EventLevel,
+		Offset:     page.Offset,
+		Size:       page.Size,
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -118,5 +122,8 @@ func (this *ItemsAction) RunGet(params struct {
 	}
 	this.Data["items"] = itemMaps
 
+	// 所有级别
+	this.Data["eventLevels"] = firewallconfigs.FindAllFirewallEventLevels()
+
 	this.Show()
 }
diff --git a/web/views/@default/servers/iplists/index.html b/web/views/@default/servers/iplists/index.html
index af79b595..4d8f497d 100644
--- a/web/views/@default/servers/iplists/index.html
+++ b/web/views/@default/servers/iplists/index.html
@@ -7,6 +7,12 @@
         <div class="ui field">
             <input type="text" name="ip" placeholder="x.x.x.x" v-model="ip"/>
         </div>
+        <div class="ui field">
+           <select class="ui dropdown" name="eventLevel" v-model="eventLevel">
+               <option value="">[级别]</option>
+               <option v-for="level in eventLevels" :value="level.code">{{level.name}}</option>
+           </select>
+        </div>
         <div class="ui field">
             <div class="ui checkbox">
                 <input type="checkbox" name="globalOnly" value="1" v-model="globalOnly"/>
@@ -22,7 +28,7 @@
         <div class="ui field">
             <button class="ui button" type="submit">搜索</button>
             &nbsp;
-            <a href="/servers/iplists" v-if="ip.length > 0 || globalOnly || unread">[清除条件]</a>
+            <a href="/servers/iplists" v-if="ip.length > 0 || globalOnly || unread || eventLevel.length > 0">[清除条件]</a>
         </div>
         <div class="ui field" v-if="countUnread > 0">
             <span class="disabled">|</span>
diff --git a/web/views/@default/servers/iplists/items.html b/web/views/@default/servers/iplists/items.html
index c9f1b500..26135ae9 100644
--- a/web/views/@default/servers/iplists/items.html
+++ b/web/views/@default/servers/iplists/items.html
@@ -11,10 +11,16 @@
         <div class="ui field">
             <input type="text" size="20" placeholder="x.x.x.x" name="keyword" v-model="keyword"/>
         </div>
+        <div class="ui field">
+            <select class="ui dropdown" name="eventLevel" v-model="eventLevel">
+                <option value="">[级别]</option>
+                <option v-for="level in eventLevels" :value="level.code">{{level.name}}</option>
+            </select>
+        </div>
         <div class="ui field">
             <button class="ui button" type="submit">搜索</button>
             &nbsp;
-            <a :href="'/servers/iplists/items?listId=' + list.id" v-if="keyword.length > 0">[清除条件]</a>
+            <a :href="'/servers/iplists/items?listId=' + list.id" v-if="keyword.length > 0 || eventLevel.length > 0">[清除条件]</a>
         </div>
     </div>
     <div class="margin"></div>