TRKJ/EdgeAdmin
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAdmin.git synced 2025-11-04 05:00:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

在节点列表中IP地址中显示对应的专属集群

Browse Source
This commit is contained in:
GoEdgeLab
2023-03-01 15:23:36 +08:00
parent 1e596a216f
commit b03e5f6e11
4 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/web/actions/default/clusters/cluster/nodes.go
View File

@@ -142,8 +142,17 @@ func (this *NodesAction) RunGet(params struct {
this.ErrorPage(err)
return
}
ipAddresses := []maps.Map{}
var ipAddresses = []maps.Map{}
for _, addr := range ipAddressesResp.NodeIPAddresses {
// 专属集群
var addrClusterMaps = []maps.Map{}
for _, addrCluster := range addr.NodeClusters {
addrClusterMaps = append(addrClusterMaps, maps.Map{
"id": addrCluster.Id,
"name": addrCluster.Name,
})
}
ipAddresses = append(ipAddresses, maps.Map{
"id": addr.Id,
"name": addr.Name,
@@ -151,6 +160,7 @@ func (this *NodesAction) RunGet(params struct {
"canAccess": addr.CanAccess,
"isUp": addr.IsUp,
"isOn": addr.IsOn,
"clusters": addrClusterMaps,
})
}

14
internal/web/actions/default/clusters/nodes.go
View File

@@ -144,8 +144,17 @@ func (this *NodesAction) RunGet(params struct {
this.ErrorPage(err)
return
}
ipAddresses := []maps.Map{}
var ipAddresses = []maps.Map{}
for _, addr := range ipAddressesResp.NodeIPAddresses {
// 专属集群
var addrClusterMaps = []maps.Map{}
for _, addrCluster := range addr.NodeClusters {
addrClusterMaps = append(addrClusterMaps, maps.Map{
"id": addrCluster.Id,
"name": addrCluster.Name,
})
}
ipAddresses = append(ipAddresses, maps.Map{
"id": addr.Id,
"name": addr.Name,
@@ -153,6 +162,7 @@ func (this *NodesAction) RunGet(params struct {
"canAccess": addr.CanAccess,
"isUp": addr.IsUp,
"isOn": addr.IsOn,
"clusters": addrClusterMaps,
})
}
@@ -175,7 +185,7 @@ func (this *NodesAction) RunGet(params struct {
}
// DNS
dnsRouteNames := []string{}
var dnsRouteNames = []string{}
for _, route := range node.DnsRoutes {
dnsRouteNames = append(dnsRouteNames, route.Name)
}

5
web/views/@default/clusters/cluster/nodes.html
View File

@@ -94,6 +94,11 @@
<div class="ui label tiny basic">{{addr.ip}}
<span class="small" v-if="addr.name.length > 0">（{{addr.name}}<span v-if="!addr.canAccess">，不可访问</span>）</span>
<span class="small" v-if="addr.name.length == 0 && !addr.canAccess">（不可访问）</span>
<!-- 专属集群 -->
<div v-if="addr.clusters != null && addr.clusters.length > 0" style="margin-top: 0.5em; font-weight: normal">
<span class="small grey">[</span><span v-for="(cluster, index) in addr.clusters" class="small grey">{{cluster.name}}<span v-if="index < addr.clusters.length - 1">，</span></span><span class="small grey">]</span>
</div>
</div>
</div>
</div>

5
web/views/@default/clusters/nodes.html
View File

@@ -88,6 +88,11 @@
<div class="ui label tiny basic">{{addr.ip}}
<span class="small" v-if="addr.name.length > 0">（{{addr.name}}<span v-if="!addr.canAccess">，不可访问</span>）</span>
<span class="small" v-if="addr.name.length == 0 && !addr.canAccess">（不可访问）</span>
<!-- 专属集群 -->
<div v-if="addr.clusters != null && addr.clusters.length > 0" style="margin-top: 0.5em; font-weight: normal">
<span class="small grey">[</span><span v-for="(cluster, index) in addr.clusters" class="small grey">{{cluster.name}}<span v-if="index < addr.clusters.length - 1">，</span></span><span class="small grey">]</span>
</div>
</div>
</div>
</div>