diff --git a/internal/web/actions/default/clusters/delete.go b/internal/web/actions/default/clusters/cluster/delete.go similarity index 82% rename from internal/web/actions/default/clusters/delete.go rename to internal/web/actions/default/clusters/cluster/delete.go index f334c46a..2e94b97c 100644 --- a/internal/web/actions/default/clusters/delete.go +++ b/internal/web/actions/default/clusters/cluster/delete.go @@ -1,4 +1,4 @@ -package clusters +package cluster import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" @@ -9,6 +9,17 @@ type DeleteAction struct { actionutils.ParentAction } +func (this *DeleteAction) Init() { + this.Nav("", "delete", "index") + this.SecondMenu("nodes") +} + +func (this *DeleteAction) RunGet(params struct{}) { + this.Show() +} + + + func (this *DeleteAction) RunPost(params struct { ClusterId int64 }) { diff --git a/internal/web/actions/default/clusters/cluster/init.go b/internal/web/actions/default/clusters/cluster/init.go index bf3646d2..975b4994 100644 --- a/internal/web/actions/default/clusters/cluster/init.go +++ b/internal/web/actions/default/clusters/cluster/init.go @@ -15,6 +15,7 @@ func init() { Prefix("/clusters/cluster"). Get("", new(IndexAction)). GetPost("/installNodes", new(InstallNodesAction)). + GetPost("/delete", new(DeleteAction)). // 节点相关 Get("/node", new(node.NodeAction)). diff --git a/internal/web/actions/default/clusters/clusterutils/cluster_helper.go b/internal/web/actions/default/clusters/clusterutils/cluster_helper.go index 214a979a..f5b2950e 100644 --- a/internal/web/actions/default/clusters/clusterutils/cluster_helper.go +++ b/internal/web/actions/default/clusters/clusterutils/cluster_helper.go @@ -51,6 +51,8 @@ func (this *ClusterHelper) BeforeAction(action *actions.ActionObject) { tabbar.Add("集群列表", "", "/clusters", "", false) tabbar.Add("节点", "", "/clusters/cluster?clusterId="+clusterIdString, "server", selectedTabbar == "node") tabbar.Add("设置", "", "/clusters/cluster/settings?clusterId="+clusterIdString, "setting", selectedTabbar == "setting") + tabbar.Add("删除", "", "/clusters/cluster/delete?clusterId="+clusterIdString, "trash", selectedTabbar == "delete") + { m := tabbar.Add("当前集群:"+cluster.Name, "", "/clusters/cluster?clusterId="+clusterIdString, "", false) m["right"] = true diff --git a/internal/web/actions/default/clusters/init.go b/internal/web/actions/default/clusters/init.go index e8e86c7d..5e4a6c08 100644 --- a/internal/web/actions/default/clusters/init.go +++ b/internal/web/actions/default/clusters/init.go @@ -15,7 +15,6 @@ func init() { GetPost("/create", new(CreateAction)). Post("/sync", new(SyncAction)). Post("/checkChange", new(CheckChangeAction)). - Post("/delete", new(DeleteAction)). EndAll() }) } diff --git a/web/views/@default/clusters/cluster/delete.css b/web/views/@default/clusters/cluster/delete.css new file mode 100644 index 00000000..c44e4d4f --- /dev/null +++ b/web/views/@default/clusters/cluster/delete.css @@ -0,0 +1,5 @@ +.buttons-box { + text-align: center; + margin-top: 2em; +} +/*# sourceMappingURL=delete.css.map */ \ No newline at end of file diff --git a/web/views/@default/clusters/cluster/delete.css.map b/web/views/@default/clusters/cluster/delete.css.map new file mode 100644 index 00000000..c266be7d --- /dev/null +++ b/web/views/@default/clusters/cluster/delete.css.map @@ -0,0 +1 @@ +{"version":3,"sources":["delete.less"],"names":[],"mappings":"AAAA;EACC,kBAAA;EACA,eAAA","file":"delete.css"} \ No newline at end of file diff --git a/web/views/@default/clusters/cluster/delete.html b/web/views/@default/clusters/cluster/delete.html new file mode 100644 index 00000000..c4df3d42 --- /dev/null +++ b/web/views/@default/clusters/cluster/delete.html @@ -0,0 +1,5 @@ +{$layout} + +
\ No newline at end of file diff --git a/web/views/@default/clusters/index.js b/web/views/@default/clusters/cluster/delete.js similarity index 65% rename from web/views/@default/clusters/index.js rename to web/views/@default/clusters/cluster/delete.js index dcd9aeb8..45413ae6 100644 --- a/web/views/@default/clusters/index.js +++ b/web/views/@default/clusters/cluster/delete.js @@ -2,11 +2,13 @@ Tea.context(function () { this.deleteCluster = function (clusterId) { let that = this teaweb.confirm("确定要删除此集群吗?", function () { - that.$post("/clusters/delete") + that.$post("/clusters/cluster/delete") .params({ clusterId: clusterId }) - .refresh() + .success(function () { + window.location = "/clusters" + }) }) } }) \ No newline at end of file diff --git a/web/views/@default/clusters/cluster/delete.less b/web/views/@default/clusters/cluster/delete.less new file mode 100644 index 00000000..a8c4d597 --- /dev/null +++ b/web/views/@default/clusters/cluster/delete.less @@ -0,0 +1,4 @@ +.buttons-box { + text-align: center; + margin-top: 2em; +} \ No newline at end of file diff --git a/web/views/@default/clusters/index.html b/web/views/@default/clusters/index.html index fffdeed7..12fd8f5c 100644 --- a/web/views/@default/clusters/index.html +++ b/web/views/@default/clusters/index.html @@ -28,8 +28,7 @@ N