From d391408e9ebedde3a95b2ca40938d24d5c40a976 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Tue, 25 Oct 2022 09:43:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E9=80=89=E6=8B=A9=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=A1=86=E4=B8=AD=E5=8F=AF=E4=BB=A5=E4=B8=8D?=
 =?UTF-8?q?=E9=80=89=E5=8C=BA=E5=9F=9F=E7=9B=B4=E6=8E=A5=E7=A1=AE=E5=AE=9A?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/actions/default/clusters/regions/selectPopup.go   | 8 +++++++-
 .../@default/clusters/cluster/groups/selectPopup.html     | 2 +-
 web/views/@default/clusters/regions/selectPopup.html      | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/internal/web/actions/default/clusters/regions/selectPopup.go b/internal/web/actions/default/clusters/regions/selectPopup.go
index 60e5c7d8..7b3d04af 100644
--- a/internal/web/actions/default/clusters/regions/selectPopup.go
+++ b/internal/web/actions/default/clusters/regions/selectPopup.go
@@ -40,12 +40,18 @@ func (this *SelectPopupAction) RunPost(params struct {
 	Must *actions.Must
 	CSRF *actionutils.CSRF
 }) {
+	if params.RegionId <= 0 {
+		this.Data["region"] = nil
+		this.Success()
+		return
+	}
+
 	regionResp, err := this.RPC().NodeRegionRPC().FindEnabledNodeRegion(this.AdminContext(), &pb.FindEnabledNodeRegionRequest{NodeRegionId: params.RegionId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	region := regionResp.NodeRegion
+	var region = regionResp.NodeRegion
 	if region == nil {
 		this.NotFound("nodeRegion", params.RegionId)
 		return
diff --git a/web/views/@default/clusters/cluster/groups/selectPopup.html b/web/views/@default/clusters/cluster/groups/selectPopup.html
index d1dd1293..deff0208 100644
--- a/web/views/@default/clusters/cluster/groups/selectPopup.html
+++ b/web/views/@default/clusters/cluster/groups/selectPopup.html
@@ -1,6 +1,6 @@
 {$layout "layout_popup"}
 
-<h3>选择分组</h3>
+<h3>选择所属分组</h3>
 
 <form method="post" class="ui form" data-tea-action="$" data-tea-success="success">
 	<input type="hidden" name="groupId" :value="groupId"/>
diff --git a/web/views/@default/clusters/regions/selectPopup.html b/web/views/@default/clusters/regions/selectPopup.html
index 546dfeda..08cc1ddc 100644
--- a/web/views/@default/clusters/regions/selectPopup.html
+++ b/web/views/@default/clusters/regions/selectPopup.html
@@ -1,6 +1,6 @@
 {$layout "layout_popup"}
 
-<h3>选择分组</h3>
+<h3>选择所属区域</h3>
 
 <form method="post" class="ui form" data-tea-action="$" data-tea-success="success">
     <csrf-token></csrf-token>