diff --git a/internal/web/actions/default/clusters/cluster/nodes.go b/internal/web/actions/default/clusters/cluster/nodes.go index d7a305c6..b71a763e 100644 --- a/internal/web/actions/default/clusters/cluster/nodes.go +++ b/internal/web/actions/default/clusters/cluster/nodes.go @@ -72,7 +72,7 @@ func (this *NodesAction) RunGet(params struct { return } - page := this.NewPage(countResp.Count) + var page = this.NewPage(countResp.Count) this.Data["page"] = page.AsHTML() var req = &pb.ListEnabledNodesMatchRequest{ @@ -107,7 +107,7 @@ func (this *NodesAction) RunGet(params struct { this.ErrorPage(err) return } - nodeMaps := []maps.Map{} + var nodeMaps = []maps.Map{} for _, node := range nodesResp.Nodes { // 状态 isSynced := false @@ -215,7 +215,7 @@ func (this *NodesAction) RunGet(params struct { this.Data["nodes"] = nodeMaps // 所有分组 - groupMaps := []maps.Map{} + var groupMaps = []maps.Map{} groupsResp, err := this.RPC().NodeGroupRPC().FindAllEnabledNodeGroupsWithNodeClusterId(this.AdminContext(), &pb.FindAllEnabledNodeGroupsWithNodeClusterIdRequest{ NodeClusterId: params.ClusterId, }) @@ -224,12 +224,12 @@ func (this *NodesAction) RunGet(params struct { return } for _, group := range groupsResp.NodeGroups { - countResp, err := this.RPC().NodeRPC().CountAllEnabledNodesWithNodeGroupId(this.AdminContext(), &pb.CountAllEnabledNodesWithNodeGroupIdRequest{NodeGroupId: group.Id}) + countNodesInGroupResp, err := this.RPC().NodeRPC().CountAllEnabledNodesWithNodeGroupId(this.AdminContext(), &pb.CountAllEnabledNodesWithNodeGroupIdRequest{NodeGroupId: group.Id}) if err != nil { this.ErrorPage(err) return } - countNodes := countResp.Count + countNodes := countNodesInGroupResp.Count groupName := group.Name if countNodes > 0 { groupName += "(" + strconv.FormatInt(countNodes, 10) + ")" @@ -248,7 +248,7 @@ func (this *NodesAction) RunGet(params struct { this.ErrorPage(err) return } - regionMaps := []maps.Map{} + var regionMaps = []maps.Map{} for _, region := range regionsResp.NodeRegions { regionMaps = append(regionMaps, maps.Map{ "id": region.Id, diff --git a/internal/web/actions/default/clusters/clusterutils/cluster_helper.go b/internal/web/actions/default/clusters/clusterutils/cluster_helper.go index 635a32e8..18fac9ef 100644 --- a/internal/web/actions/default/clusters/clusterutils/cluster_helper.go +++ b/internal/web/actions/default/clusters/clusterutils/cluster_helper.go @@ -65,18 +65,23 @@ func (this *ClusterHelper) BeforeAction(actionPtr actions.ActionWrapper) (goNext tabbar.Add("集群节点", "", "/clusters/cluster/nodes?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 - } actionutils.SetTabbar(action, tabbar) // 左侧菜单 secondMenuItem := action.Data.GetString("secondMenuItem") switch selectedTabbar { case "setting": - action.Data["leftMenuItems"] = this.createSettingMenu(cluster, clusterInfo, secondMenuItem) + var menuItems = this.createSettingMenu(cluster, clusterInfo, secondMenuItem) + action.Data["leftMenuItems"] = menuItems + + // 当前菜单 + action.Data["leftMenuActiveItem"] = nil + for _, item := range menuItems { + if item.GetBool("isActive") { + action.Data["leftMenuActiveItem"] = item + break + } + } } } diff --git a/web/public/js/components/common/raquo.js b/web/public/js/components/common/raquo.js new file mode 100644 index 00000000..ef96fd7a --- /dev/null +++ b/web/public/js/components/common/raquo.js @@ -0,0 +1,3 @@ +Vue.component("raquo-item", { + template: `»` +}) \ No newline at end of file diff --git a/web/views/@default/clusters/cluster/@menu.html b/web/views/@default/clusters/cluster/@menu.html index a81dddc1..085b6530 100644 --- a/web/views/@default/clusters/cluster/@menu.html +++ b/web/views/@default/clusters/cluster/@menu.html @@ -1,4 +1,6 @@ + {{currentClusterName}} + » 节点列表 创建节点 安装升级 diff --git a/web/views/@default/clusters/cluster/delete.html b/web/views/@default/clusters/cluster/delete.html index c4df3d42..3788f466 100644 --- a/web/views/@default/clusters/cluster/delete.html +++ b/web/views/@default/clusters/cluster/delete.html @@ -1,5 +1,11 @@ {$layout} + + {{currentClusterName}} + » + 删除 + +
\ No newline at end of file diff --git a/web/views/@default/clusters/cluster/delete.js b/web/views/@default/clusters/cluster/delete.js index e35cab1e..aaa235d6 100644 --- a/web/views/@default/clusters/cluster/delete.js +++ b/web/views/@default/clusters/cluster/delete.js @@ -1,7 +1,7 @@ Tea.context(function () { this.deleteCluster = function (clusterId) { let that = this - teaweb.confirm("确定要删除此集群吗?", function () { + teaweb.confirm("html:确定要删除此集群吗?
删除后不可恢复!", function () { that.$post("/clusters/cluster/delete") .params({ clusterId: clusterId diff --git a/web/views/@default/clusters/cluster/node/@node_menu.html b/web/views/@default/clusters/cluster/node/@node_menu.html index 8c51a3c6..ac881669 100644 --- a/web/views/@default/clusters/cluster/node/@node_menu.html +++ b/web/views/@default/clusters/cluster/node/@node_menu.html @@ -1,10 +1,13 @@ - {{currentClusterName}} » -   {{node.group.name}} » - "{{node.name}}"节点详情 - "{{node.name}}" 节点看板 - 节点详情 + {{currentClusterName}} + + {{node.group.name}} + + {{node.name}} + + 节点详情 + 节点看板 + 节点详情 运行日志 安装节点 修改设置 diff --git a/web/views/@default/clusters/cluster/nodes.html b/web/views/@default/clusters/cluster/nodes.html index 8cff1a76..3eaee58d 100644 --- a/web/views/@default/clusters/cluster/nodes.html +++ b/web/views/@default/clusters/cluster/nodes.html @@ -5,18 +5,25 @@
-
- -
+
+ +
+
+ +
-
- -
diff --git a/web/views/@default/clusters/cluster/settings/@menu.html b/web/views/@default/clusters/cluster/settings/@menu.html new file mode 100644 index 00000000..49a7c5bd --- /dev/null +++ b/web/views/@default/clusters/cluster/settings/@menu.html @@ -0,0 +1,7 @@ + + {{currentClusterName}} + » + 设置 + » + "{{leftMenuActiveItem.name}}"设置 + \ No newline at end of file diff --git a/web/views/@default/clusters/cluster/settings/cache/index.html b/web/views/@default/clusters/cluster/settings/cache/index.html index 3abae661..3463e9d1 100644 --- a/web/views/@default/clusters/cluster/settings/cache/index.html +++ b/web/views/@default/clusters/cluster/settings/cache/index.html @@ -1,7 +1,8 @@ {$layout} -{$template "/left_menu"} +{$template "../menu"} +{$template "/left_menu_with_menu"} -
+
diff --git a/web/views/@default/clusters/cluster/settings/dns/index.html b/web/views/@default/clusters/cluster/settings/dns/index.html index 12131616..6afba29e 100644 --- a/web/views/@default/clusters/cluster/settings/dns/index.html +++ b/web/views/@default/clusters/cluster/settings/dns/index.html @@ -1,7 +1,8 @@ {$layout} -{$template "/left_menu"} +{$template "../menu"} +{$template "/left_menu_with_menu"} -
+

查看DNS解析记录 »

diff --git a/web/views/@default/clusters/cluster/settings/firewall-actions/index.html b/web/views/@default/clusters/cluster/settings/firewall-actions/index.html index 3f94ff24..8167f8e6 100644 --- a/web/views/@default/clusters/cluster/settings/firewall-actions/index.html +++ b/web/views/@default/clusters/cluster/settings/firewall-actions/index.html @@ -1,7 +1,8 @@ {$layout} -{$template "/left_menu"} +{$template "../menu"} +{$template "/left_menu_with_menu"} -
+
添加动作 | diff --git a/web/views/@default/clusters/cluster/settings/health/index.html b/web/views/@default/clusters/cluster/settings/health/index.html index f9048092..feee29ad 100644 --- a/web/views/@default/clusters/cluster/settings/health/index.html +++ b/web/views/@default/clusters/cluster/settings/health/index.html @@ -1,7 +1,8 @@ {$layout} -{$template "/left_menu"} +{$template "../menu"} +{$template "/left_menu_with_menu"} -
+
diff --git a/web/views/@default/clusters/cluster/settings/index.html b/web/views/@default/clusters/cluster/settings/index.html index 1b04f9a0..b6c6b27f 100644 --- a/web/views/@default/clusters/cluster/settings/index.html +++ b/web/views/@default/clusters/cluster/settings/index.html @@ -1,7 +1,8 @@ {$layout} -{$template "/left_menu"} +{$template "menu"} +{$template "/left_menu_with_menu"} -
+
diff --git a/web/views/@default/clusters/cluster/settings/message/index.html b/web/views/@default/clusters/cluster/settings/message/index.html index ec12aff4..5e3fa684 100644 --- a/web/views/@default/clusters/cluster/settings/message/index.html +++ b/web/views/@default/clusters/cluster/settings/message/index.html @@ -1,7 +1,8 @@ {$layout} -{$template "/left_menu"} +{$template "../menu"} +{$template "/left_menu_with_menu"} -
+
diff --git a/web/views/@default/clusters/cluster/settings/metrics/index.html b/web/views/@default/clusters/cluster/settings/metrics/index.html index 98c7152f..8a77e920 100644 --- a/web/views/@default/clusters/cluster/settings/metrics/index.html +++ b/web/views/@default/clusters/cluster/settings/metrics/index.html @@ -1,7 +1,8 @@ {$layout} -{$template "/left_menu"} +{$template "../menu"} +{$template "/left_menu_with_menu"} -
+
HTTP