From 8fdc551ad89209656009bf3bcb887c56fc7de088 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: Tue, 20 Oct 2020 16:45:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=81=A5=E5=BA=B7=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1/=E5=81=A5?=
 =?UTF-8?q?=E5=BA=B7=E6=A3=80=E6=9F=A5=E5=8F=AF=E4=BB=A5=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cluster/settings/{healthRun.go => healthRunPopup.go}  | 8 ++++----
 .../web/actions/default/clusters/cluster/settings/init.go | 2 +-
 web/views/@default/clusters/cluster/settings/health.js    | 4 ++--
 .../settings/{healthRun.html => healthRunPopup.html}      | 2 +-
 .../cluster/settings/{healthRun.js => healthRunPopup.js}  | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename internal/web/actions/default/clusters/cluster/settings/{healthRun.go => healthRunPopup.go} (73%)
 rename web/views/@default/clusters/cluster/settings/{healthRun.html => healthRunPopup.html} (96%)
 rename web/views/@default/clusters/cluster/settings/{healthRun.js => healthRunPopup.js} (96%)

diff --git a/internal/web/actions/default/clusters/cluster/settings/healthRun.go b/internal/web/actions/default/clusters/cluster/settings/healthRunPopup.go
similarity index 73%
rename from internal/web/actions/default/clusters/cluster/settings/healthRun.go
rename to internal/web/actions/default/clusters/cluster/settings/healthRunPopup.go
index 3c78eedf..961f83bb 100644
--- a/internal/web/actions/default/clusters/cluster/settings/healthRun.go
+++ b/internal/web/actions/default/clusters/cluster/settings/healthRunPopup.go
@@ -6,20 +6,20 @@ import (
 	"github.com/iwind/TeaGo/actions"
 )
 
-type HealthRunAction struct {
+type HealthRunPopupAction struct {
 	actionutils.ParentAction
 }
 
-func (this *HealthRunAction) Init() {
+func (this *HealthRunPopupAction) Init() {
 	this.Nav("", "", "")
 }
 
-func (this *HealthRunAction) RunGet(params struct{}) {
+func (this *HealthRunPopupAction) RunGet(params struct{}) {
 
 	this.Show()
 }
 
-func (this *HealthRunAction) RunPost(params struct {
+func (this *HealthRunPopupAction) RunPost(params struct {
 	ClusterId int64
 
 	Must *actions.Must
diff --git a/internal/web/actions/default/clusters/cluster/settings/init.go b/internal/web/actions/default/clusters/cluster/settings/init.go
index 2e160433..b52e16df 100644
--- a/internal/web/actions/default/clusters/cluster/settings/init.go
+++ b/internal/web/actions/default/clusters/cluster/settings/init.go
@@ -14,7 +14,7 @@ func init() {
 			Prefix("/clusters/cluster/settings").
 			GetPost("", new(IndexAction)).
 			GetPost("/health", new(HealthAction)).
-			GetPost("/healthRun", new(HealthRunAction)).
+			GetPost("/healthRunPopup", new(HealthRunPopupAction)).
 			EndAll()
 	})
 }
diff --git a/web/views/@default/clusters/cluster/settings/health.js b/web/views/@default/clusters/cluster/settings/health.js
index e0535afb..48804c4f 100644
--- a/web/views/@default/clusters/cluster/settings/health.js
+++ b/web/views/@default/clusters/cluster/settings/health.js
@@ -3,8 +3,8 @@ Tea.context(function () {
 
 	this.run = function () {
 		teaweb.confirm("确定要对当前集群下的所有节点进行健康检查吗？", function () {
-			teaweb.popup("/clusters/cluster/settings/healthRun?clusterId=" + this.clusterId, {
-
+			teaweb.popup("/clusters/cluster/settings/healthRunPopup?clusterId=" + this.clusterId, {
+				height: "25em"
 			})
 		})
 	}
diff --git a/web/views/@default/clusters/cluster/settings/healthRun.html b/web/views/@default/clusters/cluster/settings/healthRunPopup.html
similarity index 96%
rename from web/views/@default/clusters/cluster/settings/healthRun.html
rename to web/views/@default/clusters/cluster/settings/healthRunPopup.html
index 2e0b8430..9bf7ab07 100644
--- a/web/views/@default/clusters/cluster/settings/healthRun.html
+++ b/web/views/@default/clusters/cluster/settings/healthRunPopup.html
@@ -11,7 +11,7 @@
 			<tr>
 				<th>节点</th>
 				<th>结果</th>
-				<th>耗时</th>
+				<th nowrap="">耗时</th>
 			</tr>
 		</thead>
 		<tr v-for="result in results">
diff --git a/web/views/@default/clusters/cluster/settings/healthRun.js b/web/views/@default/clusters/cluster/settings/healthRunPopup.js
similarity index 96%
rename from web/views/@default/clusters/cluster/settings/healthRun.js
rename to web/views/@default/clusters/cluster/settings/healthRunPopup.js
index ea25e1e8..511d9578 100644
--- a/web/views/@default/clusters/cluster/settings/healthRun.js
+++ b/web/views/@default/clusters/cluster/settings/healthRunPopup.js
@@ -1,7 +1,7 @@
 Tea.context(function () {
 	this.success = NotifyPopup
 
-	this.isRequesting = false
+	this.isRequesting = true
 	this.results = []
 	this.countSuccess = 0
 	this.countFail = 0