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

节点选择集群时可以根据关键词搜索

Browse Source
This commit is contained in:
GoEdgeLab
2021-08-29 16:41:59 +08:00
parent 02f11764b6
commit f8420c758a
3 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,21 +20,28 @@ func (this *SelectPopupAction) Init() {
func (this *SelectPopupAction) RunGet(params struct { func (this *SelectPopupAction) RunGet(params struct {
SelectedClusterIds string SelectedClusterIds string
Keyword string
}) { }) {
this.Data["keyword"] = params.Keyword
var selectedIds = utils.SplitNumbers(params.SelectedClusterIds) var selectedIds = utils.SplitNumbers(params.SelectedClusterIds)
countResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClusters(this.AdminContext(), &pb.CountAllEnabledNodeClustersRequest{}) countResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClusters(this.AdminContext(), &pb.CountAllEnabledNodeClustersRequest{
Keyword: params.Keyword,
})
if err != nil { if err != nil {
this.ErrorPage(err) this.ErrorPage(err)
return return
} }
var count = countResp.Count var count = countResp.Count
var page = this.NewPage(count) var page = this.NewPage(count)
page.Size = 6
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{
Offset: page.Offset, Keyword: params.Keyword,
Size: page.Size, Offset: page.Offset,
Size: page.Size,
}) })
if err != nil { if err != nil {
this.ErrorPage(err) this.ErrorPage(err)

4
web/public/js/components/cluster/node-clusters-selector.js
View File

@@ -24,7 +24,7 @@ Vue.component("node-clusters-selector", {
let that = this let that = this
let selectedClusterIds = [this.primaryClusterId].concat(this.secondaryClusterIds) let selectedClusterIds = [this.primaryClusterId].concat(this.secondaryClusterIds)
teaweb.popup("/clusters/selectPopup?selectedClusterIds=" + selectedClusterIds.join(",") + "&mode=single", { teaweb.popup("/clusters/selectPopup?selectedClusterIds=" + selectedClusterIds.join(",") + "&mode=single", {
height: "38em", height: "30em",
width: "50em", width: "50em",
callback: function (resp) { callback: function (resp) {
if (resp.data.cluster != null) { if (resp.data.cluster != null) {
@@ -44,7 +44,7 @@ Vue.component("node-clusters-selector", {
let that = this let that = this
let selectedClusterIds = [this.primaryClusterId].concat(this.secondaryClusterIds) let selectedClusterIds = [this.primaryClusterId].concat(this.secondaryClusterIds)
teaweb.popup("/clusters/selectPopup?selectedClusterIds=" + selectedClusterIds.join(",") + "&mode=multiple", { teaweb.popup("/clusters/selectPopup?selectedClusterIds=" + selectedClusterIds.join(",") + "&mode=multiple", {
height: "38em", height: "30em",
width: "50em", width: "50em",
callback: function (resp) { callback: function (resp) {
if (resp.data.cluster != null) { if (resp.data.cluster != null) {

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

@@ -2,6 +2,17 @@
<h3>选择集群</h3> <h3>选择集群</h3>
<form class="ui form" method="get" action="/clusters/selectPopup">
<div class="ui fields inline">
<div class="ui field">
<input type="text" name="keyword" v-model="keyword" placeholder="名称..." ref="focus"/>
</div>
<div class="ui field">
<button type="submit" class="ui button">搜索</button>
</div>
</div>
</form>
<table class="ui table celled selectable"> <table class="ui table celled selectable">
<thead> <thead>
<tr> <tr>