数据看板和节点看板都改成异步加载

internal/web/actions/default/clusters/cluster/init.go

@@ -47,6 +47,7 @@ func init() {
 			Get("/thresholds", new(thresholds.IndexAction)).
 			Get("/detail", new(node.DetailAction)).
 			GetPost("/boards", new(nodeboards.IndexAction)).
+			Post("/boards/data", new(nodeboards.DataAction)).
 			GetPost("/updateDNSPopup", new(node.UpdateDNSPopupAction)).
 
 			// 分组相关

internal/web/actions/default/clusters/cluster/node/boards/data.go

@@ -0,0 +1,41 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package boards
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type DataAction struct {
+	actionutils.ParentAction
+}
+
+func (this *DataAction) RunPost(params struct {
+	ClusterId int64
+	NodeId    int64
+}) {
+	resp, err := this.RPC().ServerStatBoardRPC().ComposeServerStatNodeBoard(this.AdminContext(), &pb.ComposeServerStatNodeBoardRequest{NodeId: params.NodeId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Data["board"] = maps.Map{
+		"isActive":            resp.IsActive,
+		"trafficInBytes":      resp.TrafficInBytes,
+		"trafficOutBytes":     resp.TrafficOutBytes,
+		"countConnections":    resp.CountConnections,
+		"countRequests":       resp.CountRequests,
+		"countAttackRequests": resp.CountAttackRequests,
+		"cpuUsage":            resp.CpuUsage,
+		"memoryUsage":         resp.MemoryUsage,
+		"memoryTotalSize":     resp.MemoryTotalSize,
+		"load":                resp.Load,
+		"cacheDiskSize":       resp.CacheDiskSize,
+		"cacheMemorySize":     resp.CacheMemorySize,
+	}
+
+	this.Success()
+}

internal/web/actions/default/clusters/cluster/node/boards/index.go

@@ -38,7 +38,14 @@ func (this *IndexAction) RunGet(params struct {
 		this.RedirectURL("/clusters/cluster/node?clusterId=" + strconv.FormatInt(params.ClusterId, 10) + "&nodeId=" + strconv.FormatInt(params.NodeId, 10))
 		return
 	}
+	
+	this.Show()
+}
 
+func (this *IndexAction) RunPost(params struct {
+	ClusterId int64
+	NodeId    int64
+}) {
 	resp, err := this.RPC().ServerStatBoardRPC().ComposeServerStatNodeBoard(this.AdminContext(), &pb.ComposeServerStatNodeBoardRequest{NodeId: params.NodeId})
 	if err != nil {
 		this.ErrorPage(err)
@@ -200,33 +207,5 @@ func (this *IndexAction) RunGet(params struct {
 		this.Data["metricCharts"] = chartMaps
 	}
 
-	this.Show()
-}
-
-func (this *IndexAction) RunPost(params struct {
-	ClusterId int64
-	NodeId    int64
-}) {
-	resp, err := this.RPC().ServerStatBoardRPC().ComposeServerStatNodeBoard(this.AdminContext(), &pb.ComposeServerStatNodeBoardRequest{NodeId: params.NodeId})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-
-	this.Data["board"] = maps.Map{
-		"isActive":            resp.IsActive,
-		"trafficInBytes":      resp.TrafficInBytes,
-		"trafficOutBytes":     resp.TrafficOutBytes,
-		"countConnections":    resp.CountConnections,
-		"countRequests":       resp.CountRequests,
-		"countAttackRequests": resp.CountAttackRequests,
-		"cpuUsage":            resp.CpuUsage,
-		"memoryUsage":         resp.MemoryUsage,
-		"memoryTotalSize":     resp.MemoryTotalSize,
-		"load":                resp.Load,
-		"cacheDiskSize":       resp.CacheDiskSize,
-		"cacheMemorySize":     resp.CacheMemorySize,
-	}
-
 	this.Success()
 }

internal/web/actions/default/dashboard/boards/index.go

@@ -40,6 +40,11 @@ func (this *IndexAction) RunGet(params struct{}) {
 		}
 	}
 
+	this.Show()
+}
+
+func (this *IndexAction) RunPost(params struct {
+}) {
 	// 读取看板数据
 	resp, err := this.RPC().AdminRPC().ComposeAdminDashboard(this.AdminContext(), &pb.ComposeAdminDashboardRequest{
 		ApiVersion: teaconst.APINodeVersion,
@@ -249,5 +254,5 @@ func (this *IndexAction) RunGet(params struct{}) {
 		this.Data["metricCharts"] = chartMaps
 	}
 
-	this.Show()
+	this.Success()
 }

internal/web/actions/default/dashboard/init.go

@@ -16,12 +16,11 @@ func init() {
 
 			// 看板
 			Prefix("/dashboard/boards").
-			Get("", new(boards.IndexAction)).
+			GetPost("", new(boards.IndexAction)).
 			Get("/waf", new(boards.WafAction)).
 			Post("/wafLogs", new(boards.WafLogsAction)).
 			Get("/dns", new(boards.DnsAction)).
 			Get("/user", new(boards.UserAction)).
-
 			EndAll()
 	})
 }

internal/web/helpers/user_must_auth.go

@@ -240,6 +240,18 @@ func (this *userMustAuth) modules(adminId int64) []maps.Map {
 					"url":  "/clusters/logs",
 					"code": "log",
 				},
+				/**{
+					"name": "IP资源",
+					"url":  "/clusters/ip-addrs",
+					"code": "ipAddr",
+					"isOn": teaconst.IsPlus,
+				},
+				{
+					"name": "监控",
+					"url":  "/clusters/monitors",
+					"code": "monitor",
+					"isOn": teaconst.IsPlus,
+				},**/
 				{
 					"name": "SSH认证",
 					"url":  "/clusters/grants",