From 48012072d741f163e5f546608a4c1f5307204bb0 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: Sun, 23 May 2021 20:54:17 +0800
Subject: [PATCH] =?UTF-8?q?SSL/TLS=E9=80=89=E6=8B=A9=E8=AF=81=E4=B9=A6?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=B3=E9=94=AE=E8=AF=8D=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../actions/default/servers/certs/selectPopup.go  | 15 ++++++++++-----
 web/views/@default/servers/certs/selectPopup.html | 14 ++++++++++++++
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/internal/web/actions/default/servers/certs/selectPopup.go b/internal/web/actions/default/servers/certs/selectPopup.go
index 1b1df658..c6f446b4 100644
--- a/internal/web/actions/default/servers/certs/selectPopup.go
+++ b/internal/web/actions/default/servers/certs/selectPopup.go
@@ -13,7 +13,7 @@ import (
 	"time"
 )
 
-// 选择证书
+// SelectPopupAction 选择证书
 type SelectPopupAction struct {
 	actionutils.ParentAction
 }
@@ -25,10 +25,12 @@ func (this *SelectPopupAction) Init() {
 func (this *SelectPopupAction) RunGet(params struct {
 	ViewSize        string
 	SelectedCertIds string
+	Keyword         string
 }) {
-	// TODO 支持关键词搜索
 	// TODO 列出常用和最新的证书供用户选择
 
+	this.Data["keyword"] = params.Keyword
+
 	// 已经选择的证书
 	selectedCertIds := []string{}
 	if len(params.SelectedCertIds) > 0 {
@@ -40,7 +42,9 @@ func (this *SelectPopupAction) RunGet(params struct {
 	}
 	this.Data["viewSize"] = params.ViewSize
 
-	countResp, err := this.RPC().SSLCertRPC().CountSSLCerts(this.AdminContext(), &pb.CountSSLCertRequest{})
+	countResp, err := this.RPC().SSLCertRPC().CountSSLCerts(this.AdminContext(), &pb.CountSSLCertRequest{
+		Keyword: params.Keyword,
+	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -50,8 +54,9 @@ func (this *SelectPopupAction) RunGet(params struct {
 	this.Data["page"] = page.AsHTML()
 
 	listResp, err := this.RPC().SSLCertRPC().ListSSLCerts(this.AdminContext(), &pb.ListSSLCertsRequest{
-		Offset: page.Offset,
-		Size:   page.Size,
+		Keyword: params.Keyword,
+		Offset:  page.Offset,
+		Size:    page.Size,
 	})
 
 	certConfigs := []*sslconfigs.SSLCertConfig{}
diff --git a/web/views/@default/servers/certs/selectPopup.html b/web/views/@default/servers/certs/selectPopup.html
index b49cf57f..4d2af623 100644
--- a/web/views/@default/servers/certs/selectPopup.html
+++ b/web/views/@default/servers/certs/selectPopup.html
@@ -1,6 +1,20 @@
 {$layout "layout_popup"}
 
 <h3>选择证书</h3>
+
+<!-- 搜索表单 -->
+<form class="ui form" action="/servers/certs/selectPopup">
+    <div class="ui fields inline">
+        <div class="ui field">
+            <input type="text" name="keyword" v-model="keyword" placeholder="域名、说明文字等"/>
+        </div>
+        <div class="ui field">
+            <button class="ui button" type="submit">搜索</button>
+        </div>
+    </div>
+</form>
+
+<!-- 证书列表 -->
 <p class="comment" v-if="certs.length == 0">暂时还没有相关的证书。</p>
 <table class="ui table selectable celled" v-if="certs.length > 0">
 	<thead>