diff --git a/internal/web/actions/default/clusters/clusterutils/cluster_helper.go b/internal/web/actions/default/clusters/clusterutils/cluster_helper.go
index 8de9f0b7..dec3c68d 100644
--- a/internal/web/actions/default/clusters/clusterutils/cluster_helper.go
+++ b/internal/web/actions/default/clusters/clusterutils/cluster_helper.go
@@ -22,7 +22,7 @@ func NewClusterHelper() *ClusterHelper {
}
func (this *ClusterHelper) BeforeAction(actionPtr actions.ActionWrapper) (goNext bool) {
- action := actionPtr.Object()
+ var action = actionPtr.Object()
if action.Request.Method != http.MethodGet {
return true
}
@@ -57,7 +57,7 @@ func (this *ClusterHelper) BeforeAction(actionPtr actions.ActionWrapper) (goNext
return
}
- tabbar := actionutils.NewTabbar()
+ var tabbar = actionutils.NewTabbar()
tabbar.Add("集群列表", "", "/clusters", "", false)
if teaconst.IsPlus {
tabbar.Add("集群看板", "", "/clusters/cluster/boards?clusterId="+clusterIdString, "board", selectedTabbar == "board")
@@ -144,6 +144,8 @@ func (this *ClusterHelper) createSettingMenu(cluster *pb.NodeCluster, info *pb.F
"isOn": info != nil && info.WebpIsOn,
})
+ items = filterMenuItems1(items, info, clusterId, selectedItem)
+
items = append(items, maps.Map{
"name": "-",
})
@@ -155,21 +157,7 @@ func (this *ClusterHelper) createSettingMenu(cluster *pb.NodeCluster, info *pb.F
"isOn": info != nil && info.HasMetricItems,
})
- if teaconst.IsPlus {
- items = append(items, maps.Map{
- "name": "阈值设置",
- "url": "/clusters/cluster/settings/thresholds?clusterId=" + clusterId,
- "isActive": selectedItem == "threshold",
- "isOn": info != nil && info.HasThresholds,
- })
-
- items = append(items, maps.Map{
- "name": "消息通知",
- "url": "/clusters/cluster/settings/message?clusterId=" + clusterId,
- "isActive": selectedItem == "message",
- "isOn": info != nil && info.HasMessageReceivers,
- })
- }
+ items = filterMenuItems2(items, info, clusterId, selectedItem)
items = append(items, maps.Map{
"name": "-",
diff --git a/internal/web/actions/default/clusters/clusterutils/cluster_helper_ext.go b/internal/web/actions/default/clusters/clusterutils/cluster_helper_ext.go
new file mode 100644
index 00000000..7d62d781
--- /dev/null
+++ b/internal/web/actions/default/clusters/clusterutils/cluster_helper_ext.go
@@ -0,0 +1,18 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+//go:build !plus
+// +build !plus
+
+package clusterutils
+
+import (
+ "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+ "github.com/iwind/TeaGo/maps"
+)
+
+func filterMenuItems1(items []maps.Map, info *pb.FindEnabledNodeClusterConfigInfoResponse, clusterIdString string, selectedItem string) []maps.Map {
+ return items
+}
+
+func filterMenuItems2(items []maps.Map, info *pb.FindEnabledNodeClusterConfigInfoResponse, clusterIdString string, selectedItem string) []maps.Map {
+ return items
+}
diff --git a/web/views/@default/clusters/cluster/settings/webp/index.html b/web/views/@default/clusters/cluster/settings/webp/index.html
index 64cfce0d..bd4aa5c5 100644
--- a/web/views/@default/clusters/cluster/settings/webp/index.html
+++ b/web/views/@default/clusters/cluster/settings/webp/index.html
@@ -8,7 +8,7 @@