From c58e338c138cba2bc02cc316a4763ca46d29015f Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Mon, 7 Jun 2021 08:58:54 +0800
Subject: [PATCH] =?UTF-8?q?WAF=E7=AD=96=E7=95=A5=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/servers/components/waf/index.go   | 15 +++-
 .../servers/components/cache/index.html       |  3 +-
 .../servers/components/waf/index.html         | 74 +++++++++++--------
 3 files changed, 57 insertions(+), 35 deletions(-)

diff --git a/internal/web/actions/default/servers/components/waf/index.go b/internal/web/actions/default/servers/components/waf/index.go
index 58572781..bd2fc518 100644
--- a/internal/web/actions/default/servers/components/waf/index.go
+++ b/internal/web/actions/default/servers/components/waf/index.go
@@ -16,8 +16,14 @@ func (this *IndexAction) Init() {
 	this.FirstMenu("index")
 }
 
-func (this *IndexAction) RunGet(params struct{}) {
-	countResp, err := this.RPC().HTTPFirewallPolicyRPC().CountAllEnabledHTTPFirewallPolicies(this.AdminContext(), &pb.CountAllEnabledHTTPFirewallPoliciesRequest{})
+func (this *IndexAction) RunGet(params struct {
+	Keyword string
+}) {
+	this.Data["keyword"] = params.Keyword
+
+	countResp, err := this.RPC().HTTPFirewallPolicyRPC().CountAllEnabledHTTPFirewallPolicies(this.AdminContext(), &pb.CountAllEnabledHTTPFirewallPoliciesRequest{
+		Keyword: params.Keyword,
+	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -26,8 +32,9 @@ func (this *IndexAction) RunGet(params struct{}) {
 	page := this.NewPage(count)
 
 	listResp, err := this.RPC().HTTPFirewallPolicyRPC().ListEnabledHTTPFirewallPolicies(this.AdminContext(), &pb.ListEnabledHTTPFirewallPoliciesRequest{
-		Offset: page.Offset,
-		Size:   page.Size,
+		Keyword: params.Keyword,
+		Offset:  page.Offset,
+		Size:    page.Size,
 	})
 	if err != nil {
 		this.ErrorPage(err)
diff --git a/web/views/@default/servers/components/cache/index.html b/web/views/@default/servers/components/cache/index.html
index 9c0c06fd..75b9f874 100644
--- a/web/views/@default/servers/components/cache/index.html
+++ b/web/views/@default/servers/components/cache/index.html
@@ -6,6 +6,7 @@
     <a href="" class="item" @click.prevent="createPolicy()">[创建]</a>
 </first-menu>
 
+<!-- 搜索 -->
 <div class="margin"></div>
 <form class="ui form" method="get" action="/servers/components/cache">
     <div class="ui fields inline">
@@ -18,7 +19,7 @@
     </div>
 </form>
 
-
+<!-- 列表 -->
 <p class="comment" v-if="cachePolicies == null || cachePolicies.length == 0">暂时还没有缓存策略。</p>
 <table class="ui table selectable celled" v-if="cachePolicies != null && cachePolicies.length > 0">
     <thead>
diff --git a/web/views/@default/servers/components/waf/index.html b/web/views/@default/servers/components/waf/index.html
index 5c0b9fc9..77da3fcf 100644
--- a/web/views/@default/servers/components/waf/index.html
+++ b/web/views/@default/servers/components/waf/index.html
@@ -1,35 +1,49 @@
 {$layout}
 
-	<second-menu>
-		<menu-item href="/servers/components/waf" code="index">列表</menu-item>
-		<span class="item">|</span>
-		<a href="" class="item" @click.prevent="createPolicy()">[创建]</a>
-	</second-menu>
+<first-menu>
+    <menu-item href="/servers/components/waf" code="index">列表</menu-item>
+    <span class="item">|</span>
+    <a href="" class="item" @click.prevent="createPolicy()">[创建]</a>
+</first-menu>
 
-	<p class="comment" v-if="policies.length == 0">暂时还没有WAF策略。</p>
+<!-- 搜索 -->
+<div class="margin"></div>
+<form class="ui form" method="get" action="/servers/components/waf">
+    <div class="ui fields inline">
+        <div class="ui field">
+            <input type="text" name="keyword" v-model="keyword" placeholder="策略名称..."/>
+        </div>
+        <div class="ui field">
+            <button type="submit" class="ui button">搜索</button>
+        </div>
+    </div>
+</form>
 
-	<table class="ui table selectable celled" v-if="policies.length > 0">
-		<thead>
-			<tr>
-				<th>策略名称</th>
-				<th class="center">入站规则分组</th>
-				<th class="center">出站规则分组</th>
-				<th class="center">集群数</th>
-				<th class="two wide center">状态</th>
-				<th class="two op">操作</th>
-			</tr>
-		</thead>
-		<tr v-for="policy in policies">
-			<td>{{policy.name}}</td>
-			<td class="center">{{policy.countInbound}}</td>
-			<td class="center">{{policy.countOutbound}}</td>
-			<td class="center">{{policy.countClusters}}</td>
-			<td class="center"><label-on :v-is-on="policy.isOn"></label-on></td>
-			<td>
-				<a :href="'/servers/components/waf/policy?firewallPolicyId=' + policy.id">详情</a> &nbsp;
-				<a href="" @click.prevent="deletePolicy(policy.id)">删除</a>
-			</td>
-		</tr>
-	</table>
+<!-- 列表 -->
+<p class="comment" v-if="policies.length == 0">暂时还没有WAF策略。</p>
 
-	<div class="page" v-html="page"></div>
\ No newline at end of file
+<table class="ui table selectable celled" v-if="policies.length > 0">
+    <thead>
+        <tr>
+            <th>策略名称</th>
+            <th class="center">入站规则分组</th>
+            <th class="center">出站规则分组</th>
+            <th class="center">集群数</th>
+            <th class="two wide center">状态</th>
+            <th class="two op">操作</th>
+        </tr>
+    </thead>
+    <tr v-for="policy in policies">
+        <td><keyword :v-word="keyword">{{policy.name}}</keyword></td>
+        <td class="center">{{policy.countInbound}}</td>
+        <td class="center">{{policy.countOutbound}}</td>
+        <td class="center">{{policy.countClusters}}</td>
+        <td class="center"><label-on :v-is-on="policy.isOn"></label-on></td>
+        <td>
+            <a :href="'/servers/components/waf/policy?firewallPolicyId=' + policy.id">详情</a> &nbsp;
+            <a href="" @click.prevent="deletePolicy(policy.id)">删除</a>
+        </td>
+    </tr>
+</table>
+
+<div class="page" v-html="page"></div>
\ No newline at end of file