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

修复选择集群弹窗页面可能只显示前6个集群的Bug

Browse Source
This commit is contained in:
GoEdgeLab
2022-02-28 14:41:55 +08:00
parent b75f44947b
commit 998f1e6c50
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/web/actions/default/clusters/selectPopup.go
View File

@@ -35,11 +35,11 @@ func (this *SelectPopupAction) RunGet(params struct {
return return
} }
var count = countResp.Count var count = countResp.Count
var page = this.NewPage(count) var pageSize int64 = 6
page.Size = 6
if params.PageSize > 0 { if params.PageSize > 0 {
page.Size = params.PageSize pageSize = params.PageSize
} }
var page = this.NewPage(count, pageSize)
this.Data["page"] = page.AsHTML() this.Data["page"] = page.AsHTML()
clustersResp, err := this.RPC().NodeClusterRPC().ListEnabledNodeClusters(this.AdminContext(), &pb.ListEnabledNodeClustersRequest{ clustersResp, err := this.RPC().NodeClusterRPC().ListEnabledNodeClusters(this.AdminContext(), &pb.ListEnabledNodeClustersRequest{

4
web/views/@default/clusters/selectPopup.html
View File

@@ -24,7 +24,9 @@
</tr> </tr>
</thead> </thead>
<tr v-for="cluster in clusters"> <tr v-for="cluster in clusters">
<td>{{cluster.name}}</td> <td>
<keyword :v-word="keyword">{{cluster.name}}</keyword>
</td>
<td>{{cluster.countNodes}}</td> <td>{{cluster.countNodes}}</td>
<td><label-on :v-is-on="cluster.isOn"></label-on></td> <td><label-on :v-is-on="cluster.isOn"></label-on></td>
<td> <td>