From e82ee56a2c2d588e11139e071f5a81cc7e75e59a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= <iwind.liu@gmail.com>
Date: Tue, 25 Oct 2022 10:15:17 +0800
Subject: [PATCH] =?UTF-8?q?IP=E5=90=8D=E5=8D=95=E6=94=AF=E6=8C=81=E6=A8=A1?=
 =?UTF-8?q?=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/web/actions/default/servers/iplists/index.go | 10 +++++-----
 web/views/@default/servers/iplists/index.html         |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/internal/web/actions/default/servers/iplists/index.go b/internal/web/actions/default/servers/iplists/index.go
index ff58323e..437ff672 100644
--- a/internal/web/actions/default/servers/iplists/index.go
+++ b/internal/web/actions/default/servers/iplists/index.go
@@ -21,21 +21,21 @@ func (this *IndexAction) Init() {
 }
 
 func (this *IndexAction) RunGet(params struct {
-	Ip         string
+	Keyword    string
 	GlobalOnly bool
 	Unread     bool
 	EventLevel string
 	ListType   string
 }) {
 	this.Data["type"] = ""
-	this.Data["ip"] = params.Ip
+	this.Data["keyword"] = params.Keyword
 	this.Data["globalOnly"] = params.GlobalOnly
 	this.Data["unread"] = params.Unread
 	this.Data["eventLevel"] = params.EventLevel
 	this.Data["listType"] = params.ListType
 
 	countUnreadResp, err := this.RPC().IPItemRPC().CountAllEnabledIPItems(this.AdminContext(), &pb.CountAllEnabledIPItemsRequest{
-		Ip:         params.Ip,
+		Keyword:    params.Keyword,
 		GlobalOnly: params.GlobalOnly,
 		Unread:     true,
 		EventLevel: params.EventLevel,
@@ -48,7 +48,7 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["countUnread"] = countUnreadResp.Count
 
 	countResp, err := this.RPC().IPItemRPC().CountAllEnabledIPItems(this.AdminContext(), &pb.CountAllEnabledIPItemsRequest{
-		Ip:         params.Ip,
+		Keyword:    params.Keyword,
 		GlobalOnly: params.GlobalOnly,
 		Unread:     params.Unread,
 		EventLevel: params.EventLevel,
@@ -63,7 +63,7 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["page"] = page.AsHTML()
 
 	itemsResp, err := this.RPC().IPItemRPC().ListAllEnabledIPItems(this.AdminContext(), &pb.ListAllEnabledIPItemsRequest{
-		Ip:         params.Ip,
+		Keyword:    params.Keyword,
 		GlobalOnly: params.GlobalOnly,
 		Unread:     params.Unread,
 		EventLevel: params.EventLevel,
diff --git a/web/views/@default/servers/iplists/index.html b/web/views/@default/servers/iplists/index.html
index 9800eacd..fb332729 100644
--- a/web/views/@default/servers/iplists/index.html
+++ b/web/views/@default/servers/iplists/index.html
@@ -5,7 +5,7 @@
 <form class="ui form" action="/servers/iplists" method="get">
     <div class="ui fields inline">
         <div class="ui field">
-            <input type="text" name="ip" placeholder="x.x.x.x" v-model="ip"/>
+            <input type="text" name="keyword" placeholder="x.x.x.x" v-model="keyword"/>
         </div>
         <div class="ui field">
             <select class="ui dropdown auto-width" name="listType" v-model="listType">
@@ -35,7 +35,7 @@
         <div class="ui field">
             <button class="ui button" type="submit">搜索</button>
             &nbsp;
-            <a href="/servers/iplists" v-if="ip.length > 0 || globalOnly || unread || eventLevel.length > 0 || listType.length > 0">[清除条件]</a>
+            <a href="/servers/iplists" v-if="keyword.length > 0 || globalOnly || unread || eventLevel.length > 0 || listType.length > 0">[清除条件]</a>
         </div>
         <div class="ui field" v-if="countUnread > 0">
             <span class="disabled">|</span>
@@ -50,6 +50,6 @@
 
 <p class="comment" v-if="items.length == 0">暂时还没有IP。</p>
 
-<ip-list-table v-if="items.length > 0" :v-items="items" @update-item="updateItem" @delete-item="deleteItem" :v-keyword="ip" :v-show-search-button="true"></ip-list-table>
+<ip-list-table v-if="items.length > 0" :v-items="items" @update-item="updateItem" @delete-item="deleteItem" :v-keyword="keyword" :v-show-search-button="true"></ip-list-table>
 
 <div class="page" v-html="page"></div>
\ No newline at end of file