From 8e48852704b50cb8011eda42aacbca9675dc23f0 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Fri, 22 Oct 2021 12:19:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=9C=A8IP=E5=90=8D=E5=8D=95?=
 =?UTF-8?q?=E4=B8=AD=E6=90=9C=E7=B4=A2IP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../actions/default/servers/iplists/items.go    | 11 +++++++++--
 .../js/components/iplist/ip-list-table.js       |  7 ++++---
 web/views/@default/servers/iplists/items.html   | 17 ++++++++++++++++-
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/internal/web/actions/default/servers/iplists/items.go b/internal/web/actions/default/servers/iplists/items.go
index b67d3af6..54132003 100644
--- a/internal/web/actions/default/servers/iplists/items.go
+++ b/internal/web/actions/default/servers/iplists/items.go
@@ -19,8 +19,11 @@ func (this *ItemsAction) Init() {
 }
 
 func (this *ItemsAction) RunGet(params struct {
-	ListId int64
+	ListId  int64
+	Keyword string
 }) {
+	this.Data["keyword"] = params.Keyword
+
 	err := InitIPList(this.Parent(), params.ListId)
 	if err != nil {
 		this.ErrorPage(err)
@@ -29,7 +32,10 @@ func (this *ItemsAction) RunGet(params struct {
 
 	// 数量
 	var listId = params.ListId
-	countResp, err := this.RPC().IPItemRPC().CountIPItemsWithListId(this.AdminContext(), &pb.CountIPItemsWithListIdRequest{IpListId: listId})
+	countResp, err := this.RPC().IPItemRPC().CountIPItemsWithListId(this.AdminContext(), &pb.CountIPItemsWithListIdRequest{
+		IpListId: listId,
+		Keyword:  params.Keyword,
+	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -41,6 +47,7 @@ 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,
 	})
diff --git a/web/public/js/components/iplist/ip-list-table.js b/web/public/js/components/iplist/ip-list-table.js
index 0d4a7731..f5ff22e3 100644
--- a/web/public/js/components/iplist/ip-list-table.js
+++ b/web/public/js/components/iplist/ip-list-table.js
@@ -1,8 +1,9 @@
 Vue.component("ip-list-table", {
-	props: ["v-items"],
+	props: ["v-items", "v-keyword"],
 	data: function () {
 		return {
-			items: this.vItems
+			items: this.vItems,
+			keyword: (this.vKeyword != null) ? this.vKeyword : ""
 		}
 	},
 	methods: {
@@ -33,7 +34,7 @@ Vue.component("ip-list-table", {
         </thead>
         <tr v-for="item in items">
             <td>
-                <span v-if="item.type != 'all'">{{item.ipFrom}}<span v-if="item.ipTo.length > 0"> - {{item.ipTo}}</span></span>
+                <span v-if="item.type != 'all'"><keyword :v-word="keyword">{{item.ipFrom}}</keyword><span v-if="item.ipTo.length > 0"> - <keyword :v-word="keyword">{{item.ipTo}}</keyword></span></span>
                 <span v-else class="disabled">*</span>
             </td>
             <td>
diff --git a/web/views/@default/servers/iplists/items.html b/web/views/@default/servers/iplists/items.html
index c7492ba3..c9f1b500 100644
--- a/web/views/@default/servers/iplists/items.html
+++ b/web/views/@default/servers/iplists/items.html
@@ -5,8 +5,23 @@
     <menu-item @click.prevent="createIP">[创建IP]</menu-item>
 </second-menu>
 
+<form class="ui form" action="/servers/iplists/items">
+    <input type="hidden" name="listId" :value="list.id"/>
+    <div class="ui fields inline">
+        <div class="ui field">
+            <input type="text" size="20" placeholder="x.x.x.x" name="keyword" v-model="keyword"/>
+        </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>
+        </div>
+    </div>
+    <div class="margin"></div>
+</form>
+
 <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"></ip-list-table>
+<ip-list-table v-if="items.length > 0" :v-items="items" @update-item="updateItem" @delete-item="deleteItem" :v-keyword="keyword"></ip-list-table>
 
 <div class="page" v-html="page"></div>
\ No newline at end of file