diff --git a/internal/web/actions/default/dns/providers/index.go b/internal/web/actions/default/dns/providers/index.go index 07f08b1d..94707e93 100644 --- a/internal/web/actions/default/dns/providers/index.go +++ b/internal/web/actions/default/dns/providers/index.go @@ -5,6 +5,8 @@ import ( "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/maps" timeutil "github.com/iwind/TeaGo/utils/time" + "regexp" + "strings" ) type IndexAction struct { @@ -17,12 +19,20 @@ func (this *IndexAction) Init() { func (this *IndexAction) RunGet(params struct { Keyword string + Domain string }) { this.Data["keyword"] = params.Keyword + this.Data["domain"] = params.Domain + + // 格式化域名 + var domain = params.Domain + domain = regexp.MustCompile(`^(www\.)`).ReplaceAllString(params.Domain, "") + domain = strings.ToLower(domain) countResp, err := this.RPC().DNSProviderRPC().CountAllEnabledDNSProviders(this.AdminContext(), &pb.CountAllEnabledDNSProvidersRequest{ AdminId: this.AdminId(), Keyword: params.Keyword, + Domain: domain, }) if err != nil { this.ErrorPage(err) @@ -35,6 +45,7 @@ func (this *IndexAction) RunGet(params struct { providersResp, err := this.RPC().DNSProviderRPC().ListEnabledDNSProviders(this.AdminContext(), &pb.ListEnabledDNSProvidersRequest{ AdminId: this.AdminId(), Keyword: params.Keyword, + Domain: domain, Offset: page.Offset, Size: page.Size, }) diff --git a/web/views/@default/dns/providers/index.html b/web/views/@default/dns/providers/index.html index 7d86112b..e4b7d959 100644 --- a/web/views/@default/dns/providers/index.html +++ b/web/views/@default/dns/providers/index.html @@ -11,10 +11,13 @@
+
+ +
  - [清除条件] + [清除条件]