diff --git a/internal/web/actions/default/dns/clusters/cluster.go b/internal/web/actions/default/dns/clusters/cluster.go index 9b6f9409..14c710ef 100644 --- a/internal/web/actions/default/dns/clusters/cluster.go +++ b/internal/web/actions/default/dns/clusters/cluster.go @@ -77,9 +77,20 @@ func (this *ClusterAction) RunGet(params struct { this.Data["nodes"] = nodeMaps // 代理服务解析记录 - // TODO - - this.Data["servers"] = []interface{}{} + serversResp, err := this.RPC().ServerRPC().FindAllEnabledServersDNSWithClusterId(this.AdminContext(), &pb.FindAllEnabledServersDNSWithClusterIdRequest{ClusterId: params.ClusterId}) + if err != nil { + this.ErrorPage(err) + return + } + serverMaps := []maps.Map{} + for _, server := range serversResp.Servers { + serverMaps = append(serverMaps, maps.Map{ + "id": server.Id, + "name": server.Name, + "dnsName": server.DnsName, + }) + } + this.Data["servers"] = serverMaps this.Show() } diff --git a/web/public/js/components/common/links.js b/web/public/js/components/common/links.js new file mode 100644 index 00000000..0e38465d --- /dev/null +++ b/web/public/js/components/common/links.js @@ -0,0 +1,46 @@ +// 使用Icon的链接方式 +Vue.component("link-icon", { + props: ["href"], + template: ` ` +}) + +// 带有下划虚线的连接 +Vue.component("link-red", { + props: ["href", "title"], + data: function () { + let href = this.href + if (href == null) { + href = "" + } + return { + vHref: href + } + }, + methods: { + clickPrevent: function () { + emitClick(this, arguments) + } + }, + template: `` +}) + +// 会弹出窗口的链接 +Vue.component("link-popup", { + props: ["title"], + methods: { + clickPrevent: function () { + emitClick(this, arguments) + } + }, + template: `` +}) + +// 提交点击事件 +function emitClick(obj, arguments) { + let event = "click" + let newArgs = [event] + for (let i = 0; i < arguments.length; i++) { + newArgs.push(arguments[i]) + } + obj.$emit.apply(obj, newArgs) +} \ No newline at end of file diff --git a/web/views/@default/@layout_override.css b/web/views/@default/@layout_override.css index b3ca8910..d66ddeab 100644 --- a/web/views/@default/@layout_override.css +++ b/web/views/@default/@layout_override.css @@ -12,4 +12,10 @@ form .fields { margin-bottom: 0 !important; } +.link.grey { + color: grey !important; +} +.link.grey:hover { + color: #4183c4 !important; +} /*# sourceMappingURL=@layout_override.css.map */ \ No newline at end of file diff --git a/web/views/@default/@layout_override.css.map b/web/views/@default/@layout_override.css.map index 07e1cf17..6d6bc8b8 100644 --- a/web/views/@default/@layout_override.css.map +++ b/web/views/@default/@layout_override.css.map @@ -1 +1 @@ -{"version":3,"sources":["@layout_override.less"],"names":[],"mappings":"AACA,GAAG,OAAO,SAAU,MAAK,MAAM,QAAS,OAAM;AAAS,GAAG,OAAO,SAAU,MAAK,MAAM,QAAS,QAAO;EACrG,oCAAA;;AAGD,GAAG,OAAO,SAAU,MAAK,QAAS,OAAM;AAAS,GAAG,OAAO,SAAU,MAAK,QAAS,QAAO;EACzF,oCAAA;;AAGD,GAAG,MAAM;EACR,kCAAA;;AAID,IACC;EACC,2BAAA","file":"@layout_override.css"} \ No newline at end of file +{"version":3,"sources":["@layout_override.less"],"names":[],"mappings":"AACA,GAAG,OAAO,SAAU,MAAK,MAAM,QAAS,OAAM;AAAS,GAAG,OAAO,SAAU,MAAK,MAAM,QAAS,QAAO;EACrG,oCAAA;;AAGD,GAAG,OAAO,SAAU,MAAK,QAAS,OAAM;AAAS,GAAG,OAAO,SAAU,MAAK,QAAS,QAAO;EACzF,oCAAA;;AAGD,GAAG,MAAM;EACR,kCAAA;;AAID,IACC;EACC,2BAAA;;AAKF,KAAK;EACJ,sBAAA;;AAGD,KAAK,KAAK;EACT,yBAAA","file":"@layout_override.css"} \ No newline at end of file diff --git a/web/views/@default/@layout_override.less b/web/views/@default/@layout_override.less index db9fba25..b11c2f60 100644 --- a/web/views/@default/@layout_override.less +++ b/web/views/@default/@layout_override.less @@ -17,3 +17,12 @@ form { margin-bottom: 0 !important; } } + +// links +.link.grey { + color: grey !important; +} + +.link.grey:hover { + color: #4183c4 !important; +} diff --git a/web/views/@default/dns/clusters/cluster.html b/web/views/@default/dns/clusters/cluster.html index d253c738..f74ead85 100644 --- a/web/views/@default/dns/clusters/cluster.html +++ b/web/views/@default/dns/clusters/cluster.html @@ -24,7 +24,7 @@ DNS服务商
- {{dnsInfo.providerTypeName}} - {{dnsInfo.providerName}} + {{dnsInfo.providerTypeName}} - {{dnsInfo.providerName}}
请先设置域名 没有设置 @@ -32,14 +32,15 @@ -

下面的DNS解析记录可以手工在DNS服务商提供的管理平台添加。

+

下面的DNS解析记录也可以手工在DNS服务商提供的管理平台添加。

-

节点DNS解析记录

+

节点DNS解析记录   ({{nodes.length}}个)

暂时没有需要设置的DNS记录。

+ @@ -47,24 +48,44 @@ - + +
节点子域名 记录类型 记录值 线路
{{node.name}}{{node.name}} + {{dnsInfo.dnsName}} + 没有设置 + A {{node.ipAddr}} - 没有设置 + 没有设置 {{node.route}} - 没有设置 + 没有设置 - 修改 + 修改
-

代理服务解析记录

+

代理服务解析记录   ({{servers.length}}个)

暂时没有需要设置的DNS记录。

- + + + + + + + + + + + + + +
服务子域名记录类型记录值
{{server.name}} {{server.dnsName}}CNAME + {{dnsInfo.dnsName}}.{{dnsInfo.domainName}}. + 没有设置 +
\ No newline at end of file diff --git a/web/views/@default/dns/index.html b/web/views/@default/dns/index.html index 43f81c66..9705e2f7 100644 --- a/web/views/@default/dns/index.html +++ b/web/views/@default/dns/index.html @@ -15,7 +15,7 @@ - {{cluster.name}} + {{cluster.name}} {{cluster.dnsName}}.{{cluster.domainName}} @@ -26,7 +26,7 @@ - - {{cluster.providerName}} + {{cluster.providerName}} -