优化代码/DNS域名增加分页

internal/web/actions/default/dns/domainOptions.go

@@ -14,7 +14,7 @@ type DomainOptionsAction struct {
 func (this *DomainOptionsAction) RunPost(params struct {
 	ProviderId int64
 }) {
-	domainsResp, err := this.RPC().DNSDomainRPC().FindAllEnabledBasicDNSDomainsWithDNSProviderId(this.AdminContext(), &pb.FindAllEnabledBasicDNSDomainsWithDNSProviderIdRequest{
+	domainsResp, err := this.RPC().DNSDomainRPC().FindAllBasicDNSDomainsWithDNSProviderId(this.AdminContext(), &pb.FindAllBasicDNSDomainsWithDNSProviderIdRequest{
 		DnsProviderId: params.ProviderId,
 	})
 	if err != nil {

internal/web/actions/default/dns/domains/clustersPopup.go

@@ -18,7 +18,7 @@ func (this *ClustersPopupAction) RunGet(params struct {
 	DomainId int64
 }) {
 	// 域名信息
-	domainResp, err := this.RPC().DNSDomainRPC().FindEnabledBasicDNSDomain(this.AdminContext(), &pb.FindEnabledBasicDNSDomainRequest{
+	domainResp, err := this.RPC().DNSDomainRPC().FindBasicDNSDomain(this.AdminContext(), &pb.FindBasicDNSDomainRequest{
 		DnsDomainId: params.DomainId,
 	})
 	if err != nil {

internal/web/actions/default/dns/domains/nodesPopup.go

@@ -19,7 +19,7 @@ func (this *NodesPopupAction) RunGet(params struct {
 	DomainId int64
 }) {
 	// 域名信息
-	domainResp, err := this.RPC().DNSDomainRPC().FindEnabledBasicDNSDomain(this.AdminContext(), &pb.FindEnabledBasicDNSDomainRequest{
+	domainResp, err := this.RPC().DNSDomainRPC().FindBasicDNSDomain(this.AdminContext(), &pb.FindBasicDNSDomainRequest{
 		DnsDomainId: params.DomainId,
 	})
 	if err != nil {

internal/web/actions/default/dns/domains/selectPopup.go

@@ -25,7 +25,7 @@ func (this *SelectPopupAction) RunGet(params struct {
 
 	// 域名信息
 	if params.DomainId > 0 {
-		domainResp, err := this.RPC().DNSDomainRPC().FindEnabledDNSDomain(this.AdminContext(), &pb.FindEnabledDNSDomainRequest{DnsDomainId: params.DomainId})
+		domainResp, err := this.RPC().DNSDomainRPC().FindDNSDomain(this.AdminContext(), &pb.FindDNSDomainRequest{DnsDomainId: params.DomainId})
 		if err != nil {
 			this.ErrorPage(err)
 			return
@@ -76,7 +76,7 @@ func (this *SelectPopupAction) RunPost(params struct {
 	this.Data["providerName"] = ""
 
 	if params.DomainId > 0 {
-		domainResp, err := this.RPC().DNSDomainRPC().FindEnabledDNSDomain(this.AdminContext(), &pb.FindEnabledDNSDomainRequest{DnsDomainId: params.DomainId})
+		domainResp, err := this.RPC().DNSDomainRPC().FindDNSDomain(this.AdminContext(), &pb.FindDNSDomainRequest{DnsDomainId: params.DomainId})
 		if err != nil {
 			this.ErrorPage(err)
 			return

internal/web/actions/default/dns/domains/serversPopup.go

@@ -18,7 +18,7 @@ func (this *ServersPopupAction) RunGet(params struct {
 	DomainId int64
 }) {
 	// 域名信息
-	domainResp, err := this.RPC().DNSDomainRPC().FindEnabledBasicDNSDomain(this.AdminContext(), &pb.FindEnabledBasicDNSDomainRequest{
+	domainResp, err := this.RPC().DNSDomainRPC().FindBasicDNSDomain(this.AdminContext(), &pb.FindBasicDNSDomainRequest{
 		DnsDomainId: params.DomainId,
 	})
 	if err != nil {

internal/web/actions/default/dns/domains/updatePopup.go

@@ -21,7 +21,7 @@ func (this *UpdatePopupAction) Init() {
 func (this *UpdatePopupAction) RunGet(params struct {
 	DomainId int64
 }) {
-	domainResp, err := this.RPC().DNSDomainRPC().FindEnabledDNSDomain(this.AdminContext(), &pb.FindEnabledDNSDomainRequest{DnsDomainId: params.DomainId})
+	domainResp, err := this.RPC().DNSDomainRPC().FindDNSDomain(this.AdminContext(), &pb.FindDNSDomainRequest{DnsDomainId: params.DomainId})
 	if err != nil {
 		this.ErrorPage(err)
 		return

internal/web/actions/default/dns/index.go

@@ -47,7 +47,7 @@ func (this *IndexAction) RunGet(params struct {
 		providerTypeName := ""
 
 		if cluster.DnsDomainId > 0 {
-			domainResp, err := this.RPC().DNSDomainRPC().FindEnabledBasicDNSDomain(this.AdminContext(), &pb.FindEnabledBasicDNSDomainRequest{DnsDomainId: domainId})
+			domainResp, err := this.RPC().DNSDomainRPC().FindBasicDNSDomain(this.AdminContext(), &pb.FindBasicDNSDomainRequest{DnsDomainId: domainId})
 			if err != nil {
 				this.ErrorPage(err)
 				return

internal/web/actions/default/dns/providers/index.go

@@ -65,7 +65,7 @@ func (this *IndexAction) RunGet(params struct {
 		}
 
 		// 域名
-		countDomainsResp, err := this.RPC().DNSDomainRPC().CountAllEnabledDNSDomainsWithDNSProviderId(this.AdminContext(), &pb.CountAllEnabledDNSDomainsWithDNSProviderIdRequest{
+		countDomainsResp, err := this.RPC().DNSDomainRPC().CountAllDNSDomainsWithDNSProviderId(this.AdminContext(), &pb.CountAllDNSDomainsWithDNSProviderIdRequest{
 			DnsProviderId: provider.Id,
 		})
 		if err != nil {

internal/web/actions/default/dns/providers/provider.go

@@ -18,19 +18,24 @@ func (this *ProviderAction) Init() {
 
 func (this *ProviderAction) RunGet(params struct {
 	ProviderId int64
+	Page       int
+	Filter     string
 }) {
+	this.Data["pageNo"] = params.Page
+	this.Data["filter"] = params.Filter
+
 	providerResp, err := this.RPC().DNSProviderRPC().FindEnabledDNSProvider(this.AdminContext(), &pb.FindEnabledDNSProviderRequest{DnsProviderId: params.ProviderId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	provider := providerResp.DnsProvider
+	var provider = providerResp.DnsProvider
 	if provider == nil {
 		this.NotFound("dnsProvider", params.ProviderId)
 		return
 	}
 
-	apiParams := maps.Map{}
+	var apiParams = maps.Map{}
 	if len(provider.ApiParamsJSON) > 0 {
 		err = json.Unmarshal(provider.ApiParamsJSON, &apiParams)
 		if err != nil {
@@ -55,13 +60,33 @@ func (this *ProviderAction) RunGet(params struct {
 		"localEdgeDNS": localEdgeDNSMap,
 	}
 
-	// 域名
-	domainsResp, err := this.RPC().DNSDomainRPC().FindAllEnabledDNSDomainsWithDNSProviderId(this.AdminContext(), &pb.FindAllEnabledDNSDomainsWithDNSProviderIdRequest{DnsProviderId: provider.Id})
+	// 域名数量
+	countDomainsResp, err := this.RPC().DNSDomainRPC().CountAllDNSDomainsWithDNSProviderId(this.AdminContext(), &pb.CountAllDNSDomainsWithDNSProviderIdRequest{
+		DnsProviderId: params.ProviderId,
+		IsDeleted:     params.Filter == "deleted",
+		IsDown:        params.Filter == "down",
+	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	domainMaps := []maps.Map{}
+	var countDomains = countDomainsResp.Count
+	var page = this.NewPage(countDomains)
+	this.Data["page"] = page.AsHTML()
+
+	// 域名
+	domainsResp, err := this.RPC().DNSDomainRPC().ListBasicDNSDomainsWithDNSProviderId(this.AdminContext(), &pb.ListBasicDNSDomainsWithDNSProviderIdRequest{
+		DnsProviderId: params.ProviderId,
+		IsDeleted:     params.Filter == "deleted",
+		IsDown:        params.Filter == "down",
+		Offset:        page.Offset,
+		Size:          page.Size,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var domainMaps = []maps.Map{}
 	for _, domain := range domainsResp.DnsDomains {
 		dataUpdatedTime := ""
 		if domain.DataUpdatedAt > 0 {

web/views/@default/dns/providers/provider.html

@@ -185,68 +185,71 @@
 </table>
 
 
-<h3>管理的域名 <a href="" @click.prevent="createDomain()">[添加域名]</a></h3>
+<h4>管理的域名 &nbsp; <a href="" @click.prevent="syncDomains()" style="font-size: 0.8em">[刷新域名]</a> &nbsp;  <a href="" @click.prevent="createDomain()" style="font-size: 0.8em">[添加域名]</a></h4>
 
 <p class="ui message blue" v-if="isUpdatingDomains">正在检查域名状态...</p>
 
-<p class="comment" v-if="domains.length == 0">暂时还没有可以管理的域名。</p>
+<second-menu>
+    <menu-item :href="'/dns/providers/provider?providerId=' + provider.id + '&filter='" :active="filter == ''">正常状态</menu-item>
+    <menu-item :href="'/dns/providers/provider?providerId=' + provider.id + '&filter=down'" :active="filter == 'down'">已下线</menu-item>
+    <menu-item :href="'/dns/providers/provider?providerId=' + provider.id + '&filter=deleted'" :active="filter == 'deleted'">已删除</menu-item>
+</second-menu>
 
-<div v-for="state in [1, 0]">
-    <div v-if="state == 0 && hasDeletedDomains">
-        <h4 style="margin-top: 2em">已删除的域名</h4>
-    </div>
-    <table class="ui table selectable celled" v-if="domains.length > 0 && (state == 1 || hasDeletedDomains)">
-        <thead>
-            <tr>
-                <th>域名</th>
-                <th class="center" style="width: 7em">线路</th>
-                <th class="center" style="width: 6em">集群</th>
-                <th class="center" style="width: 7em">节点域名</th>
-                <th class="center" style="width: 7em">服务域名</th>
-                <th>数据更新时间</th>
-                <th class="center width10">状态</th>
-                <th class="three op">操作</th>
-            </tr>
-        </thead>
-        <tr v-for="(domain, index) in domains" v-if="(state == 1 && !domain.isDeleted) || (state == 0 && domain.isDeleted)">
-            <td>{{domain.name}}</td>
-            <td class="center">
-                <a href="" v-if="domain.countRoutes > 0" @click.prevent="showRoutes(domain.id)">{{domain.countRoutes}}个<popup-icon></popup-icon></a>
-                <span v-else class="disabled">0个</span>
-            </td>
-            <td class="center">
-                <a href="" v-if="domain.countClusters > 0" @click.prevent="viewClusters(domain.id)">{{domain.countClusters}}<popup-icon></popup-icon></a>
-                <span v-else class="disabled">0个</span>
-            </td>
-            <td class="center">
-                <a href="" v-if="domain.countAllNodes > 0" @click.prevent="viewNodes(domain.id)">{{domain.countNodeRecords}}/{{domain.countAllNodes}}个<popup-icon></popup-icon></a>
-                <span v-else class="disabled">0个</span>
-            </td>
-            <td class="center">
-                <a href="" v-if="domain.countAllServers > 0" @click.prevent="viewServers(domain.id)">{{domain.countServerRecords}}/{{domain.countAllServers}}个<popup-icon></popup-icon></a>
-                <span v-else class="disabled">0个</span>
-            </td>
-            <td>
-                <span v-if="domain.dataUpdatedTime.length > 0">{{domain.dataUpdatedTime}}</span>
-                <span v-else class="disabled">尚未更新</span>
-            </td>
-            <td class="center">
-                <span v-if="!domain.isOn"><label-on :v-is-on="domain.isOn"></label-on></span>
-                <div v-else-if="domain.countRoutes == 0 || domain.nodesChanged || domain.serversChanged">
-                    <a href=""  style="border-bottom: 1px #db2828 dashed" title="点击和DNS服务商系统同步" @click.prevent="syncDomain(index,domain)" v-if="!domain.isSyncing"><span class="red">需要同步</span></a>
-                    <span v-else>正在同步...</span>
-                </div>
-                <div v-else-if="!domain.isUp">
-                    <a  href="" style="border-bottom: 1px #db2828 dashed" @click.prevent="alertDown"><span class="red">已下线</span></a>
-                </div>
-            </td>
-            <td>
-                <a href="" @click.prevent="syncDomain(index, domain)" v-if="!domain.isSyncing">同步</a>
-                <span v-else>正在同步...</span>&nbsp;
-                <a href="" @click.prevent="updateDomain(domain.id)" v-if="!domain.isSyncing">修改</a> &nbsp;
-                <a href="" @click.prevent="deleteDomain(domain)" v-if="!domain.isSyncing && !domain.isDeleted">删除</a>
-                <a href="" @click.prevent="recoverDomain(domain)" v-if="!domain.isSyncing && domain.isDeleted">恢复</a>
-            </td>
+<p class="comment" v-if="domains.length == 0">暂时还没有<span v-if="filter == 'deleted'">已删除</span><span v-if="filter == 'down'">已下线</span><span v-if="filter == ''">可以管理</span>的域名。</p>
+
+<table class="ui table selectable celled" v-if="domains.length > 0">
+    <thead>
+        <tr>
+            <th>域名</th>
+            <th class="center" style="width: 7em">线路</th>
+            <th class="center" style="width: 6em">集群</th>
+            <th class="center" style="width: 7em">节点域名</th>
+            <th class="center" style="width: 7em">服务域名</th>
+            <th>数据更新时间</th>
+            <th class="center width10">状态</th>
+            <th class="three op">操作</th>
         </tr>
-    </table>
-</div>
+    </thead>
+    <tr v-for="(domain, index) in domains">
+        <td>{{domain.name}}</td>
+        <td class="center">
+            <a href="" v-if="domain.countRoutes > 0" @click.prevent="showRoutes(domain.id)">{{domain.countRoutes}}个<popup-icon></popup-icon></a>
+            <span v-else class="disabled">0个</span>
+        </td>
+        <td class="center">
+            <a href="" v-if="domain.countClusters > 0" @click.prevent="viewClusters(domain.id)">{{domain.countClusters}}<popup-icon></popup-icon></a>
+            <span v-else class="disabled">0个</span>
+        </td>
+        <td class="center">
+            <a href="" v-if="domain.countAllNodes > 0" @click.prevent="viewNodes(domain.id)">{{domain.countNodeRecords}}/{{domain.countAllNodes}}个<popup-icon></popup-icon></a>
+            <span v-else class="disabled">0个</span>
+        </td>
+        <td class="center">
+            <a href="" v-if="domain.countAllServers > 0" @click.prevent="viewServers(domain.id)">{{domain.countServerRecords}}/{{domain.countAllServers}}个<popup-icon></popup-icon></a>
+            <span v-else class="disabled">0个</span>
+        </td>
+        <td>
+            <span v-if="domain.dataUpdatedTime.length > 0">{{domain.dataUpdatedTime}}</span>
+            <span v-else class="disabled">尚未更新</span>
+        </td>
+        <td class="center">
+            <span v-if="!domain.isOn"><label-on :v-is-on="domain.isOn"></label-on></span>
+            <div v-else-if="domain.countRoutes == 0 || domain.nodesChanged || domain.serversChanged">
+                <a href=""  style="border-bottom: 1px #db2828 dashed" title="点击和DNS服务商系统同步" @click.prevent="syncDomain(index,domain)" v-if="!domain.isSyncing"><span class="red">需要同步</span></a>
+                <span v-else>正在同步...</span>
+            </div>
+            <div v-else-if="!domain.isUp">
+                <a  href="" style="border-bottom: 1px #db2828 dashed" @click.prevent="alertDown"><span class="red">已下线</span></a>
+            </div>
+        </td>
+        <td>
+            <a href="" @click.prevent="syncDomain(index, domain)" v-if="!domain.isSyncing">同步</a>
+            <span v-else>正在同步...</span>&nbsp;
+            <a href="" @click.prevent="updateDomain(domain.id)" v-if="!domain.isSyncing">修改</a> &nbsp;
+            <a href="" @click.prevent="deleteDomain(domain)" v-if="!domain.isSyncing && !domain.isDeleted">删除</a>
+            <a href="" @click.prevent="recoverDomain(domain)" v-if="!domain.isSyncing && domain.isDeleted">恢复</a>
+        </td>
+    </tr>
+</table>
+
+<page-box></page-box>

web/views/@default/dns/providers/provider.js

@@ -1,9 +1,13 @@
 Tea.context(function () {
 	this.isUpdatingDomains = false
-	this.hasDeletedDomains = this.domains.$find(function (k, v) {return v.isDeleted}) != null
+	this.hasDeletedDomains = this.domains.$find(function (k, v) {
+		return v.isDeleted
+	}) != null
 
 	this.$delay(function () {
-		this.syncDomains()
+		if (this.pageNo <= 1 && this.filter.length == 0) {
+			this.syncDomains()
+		}
 	})
 
 	this.syncDomains = function () {