From 998f1e6c506d70889ce6894c03e7edac92d82572 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Mon, 28 Feb 2022 14:41:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=89=E6=8B=A9=E9=9B=86?=
 =?UTF-8?q?=E7=BE=A4=E5=BC=B9=E7=AA=97=E9=A1=B5=E9=9D=A2=E5=8F=AF=E8=83=BD?=
 =?UTF-8?q?=E5=8F=AA=E6=98=BE=E7=A4=BA=E5=89=8D6=E4=B8=AA=E9=9B=86?=
 =?UTF-8?q?=E7=BE=A4=E7=9A=84Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/web/actions/default/clusters/selectPopup.go | 6 +++---
 web/views/@default/clusters/selectPopup.html         | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/internal/web/actions/default/clusters/selectPopup.go b/internal/web/actions/default/clusters/selectPopup.go
index f33a9e84..03d034df 100644
--- a/internal/web/actions/default/clusters/selectPopup.go
+++ b/internal/web/actions/default/clusters/selectPopup.go
@@ -35,11 +35,11 @@ func (this *SelectPopupAction) RunGet(params struct {
 		return
 	}
 	var count = countResp.Count
-	var page = this.NewPage(count)
-	page.Size = 6
+	var pageSize int64 = 6
 	if params.PageSize > 0 {
-		page.Size = params.PageSize
+		pageSize = params.PageSize
 	}
+	var page = this.NewPage(count, pageSize)
 	this.Data["page"] = page.AsHTML()
 
 	clustersResp, err := this.RPC().NodeClusterRPC().ListEnabledNodeClusters(this.AdminContext(), &pb.ListEnabledNodeClustersRequest{
diff --git a/web/views/@default/clusters/selectPopup.html b/web/views/@default/clusters/selectPopup.html
index 017dc109..3b0b6a06 100644
--- a/web/views/@default/clusters/selectPopup.html
+++ b/web/views/@default/clusters/selectPopup.html
@@ -24,7 +24,9 @@
         </tr>
     </thead>
     <tr v-for="cluster in clusters">
-        <td>{{cluster.name}}</td>
+        <td>
+            <keyword :v-word="keyword">{{cluster.name}}</keyword>
+        </td>
         <td>{{cluster.countNodes}}</td>
         <td><label-on :v-is-on="cluster.isOn"></label-on></td>
         <td>