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 @@ 节点 结果 - 耗时 + 耗时 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