From 28bfbbfa689be11b4e0171f9a27a0d3af47fbdab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= <iwind.liu@gmail.com>
Date: Sat, 7 May 2022 20:41:20 +0800
Subject: [PATCH] =?UTF-8?q?DNS=E6=9C=8D=E5=8A=A1=E5=95=86=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=8E=82=E5=AE=B6=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../actions/default/dns/providers/index.go    | 39 +++++++++++++++++--
 web/views/@default/dns/providers/index.html   | 12 ++++--
 2 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/internal/web/actions/default/dns/providers/index.go b/internal/web/actions/default/dns/providers/index.go
index 94707e93..d108eec7 100644
--- a/internal/web/actions/default/dns/providers/index.go
+++ b/internal/web/actions/default/dns/providers/index.go
@@ -18,11 +18,13 @@ func (this *IndexAction) Init() {
 }
 
 func (this *IndexAction) RunGet(params struct {
-	Keyword string
-	Domain  string
+	Keyword      string
+	Domain       string
+	ProviderType string
 }) {
 	this.Data["keyword"] = params.Keyword
 	this.Data["domain"] = params.Domain
+	this.Data["providerType"] = params.ProviderType
 
 	// 格式化域名
 	var domain = params.Domain
@@ -33,6 +35,7 @@ func (this *IndexAction) RunGet(params struct {
 		AdminId: this.AdminId(),
 		Keyword: params.Keyword,
 		Domain:  domain,
+		Type:    params.ProviderType,
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -46,6 +49,7 @@ func (this *IndexAction) RunGet(params struct {
 		AdminId: this.AdminId(),
 		Keyword: params.Keyword,
 		Domain:  domain,
+		Type:    params.ProviderType,
 		Offset:  page.Offset,
 		Size:    page.Size,
 	})
@@ -53,7 +57,7 @@ func (this *IndexAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	providerMaps := []maps.Map{}
+	var providerMaps = []maps.Map{}
 	for _, provider := range providersResp.DnsProviders {
 		dataUpdatedTime := ""
 		if provider.DataUpdatedAt > 0 {
@@ -61,7 +65,9 @@ func (this *IndexAction) RunGet(params struct {
 		}
 
 		// 域名
-		countDomainsResp, err := this.RPC().DNSDomainRPC().CountAllEnabledDNSDomainsWithDNSProviderId(this.AdminContext(), &pb.CountAllEnabledDNSDomainsWithDNSProviderIdRequest{DnsProviderId: provider.Id})
+		countDomainsResp, err := this.RPC().DNSDomainRPC().CountAllEnabledDNSDomainsWithDNSProviderId(this.AdminContext(), &pb.CountAllEnabledDNSDomainsWithDNSProviderIdRequest{
+			DnsProviderId: provider.Id,
+		})
 		if err != nil {
 			this.ErrorPage(err)
 			return
@@ -79,5 +85,30 @@ func (this *IndexAction) RunGet(params struct {
 	}
 	this.Data["providers"] = providerMaps
 
+	// 类型
+	typesResponse, err := this.RPC().DNSProviderRPC().FindAllDNSProviderTypes(this.AdminContext(), &pb.FindAllDNSProviderTypesRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var providerTypeMaps = []maps.Map{}
+	for _, providerType := range typesResponse.ProviderTypes {
+		countProvidersWithTypeResp, err := this.RPC().DNSProviderRPC().CountAllEnabledDNSProviders(this.AdminContext(), &pb.CountAllEnabledDNSProvidersRequest{
+			Type: providerType.Code,
+		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		if countProvidersWithTypeResp.Count > 0 {
+			providerTypeMaps = append(providerTypeMaps, maps.Map{
+				"name":  providerType.Name,
+				"code":  providerType.Code,
+				"count": countProvidersWithTypeResp.Count,
+			})
+		}
+	}
+	this.Data["providerTypes"] = providerTypeMaps
+
 	this.Show()
 }
diff --git a/web/views/@default/dns/providers/index.html b/web/views/@default/dns/providers/index.html
index e4b7d959..86e16d31 100644
--- a/web/views/@default/dns/providers/index.html
+++ b/web/views/@default/dns/providers/index.html
@@ -14,10 +14,16 @@
         <div class="ui field">
             <input type="text" name="domain" placeholder="域名..." v-model="domain"/>
         </div>
+        <div class="ui field" v-if="providerTypes.length > 0">
+            <select class="ui dropdown auto-width" name="providerType" v-model="providerType">
+                <option value="">[DNS厂家]</option>
+                <option v-for="p in providerTypes" :value="p.code">{{p.name}}({{p.count}})</option>
+            </select>
+        </div>
         <div class="ui field">
             <button class="ui button" type="submit">搜索</button>
             &nbsp;
-            <a :href="Tea.url('.')" v-if="keyword.length > 0 || domain.length > 0">[清除条件]</a>
+            <a :href="Tea.url('.')" v-if="keyword.length > 0 || domain.length > 0 || providerType.length > 0">[清除条件]</a>
         </div>
     </div>
 </form>
@@ -28,13 +34,13 @@
 	<thead>
 		<tr>
 			<th>账号说明</th>
-			<th class="width10">服务商</th>
+			<th class="three wide">服务商</th>
 			<th class="width5 center">域名</th>
 			<th class="two op">操作</th>
 		</tr>
 	</thead>
 	<tr v-for="(provider, index) in providers">
-        <td><a :href="'/dns/providers/provider?providerId=' + provider.id">{{provider.name}}</a></td>
+        <td><a :href="'/dns/providers/provider?providerId=' + provider.id"><keyword :v-word="keyword">{{provider.name}}</keyword></a></td>
 		<td>{{provider.typeName}}</td>
 		<td class="center">
 			<span v-if="provider.countDomains == 0" class="disabled">0</span>