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

优化文字

Browse Source
This commit is contained in:
GoEdgeLab
2022-07-05 20:07:37 +08:00
parent e69cf8fc3a
commit bd91cc4796
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/web/actions/default/servers/create.go
View File

@@ -338,7 +338,7 @@ func (this *CreateAction) RunPost(params struct {
this.ErrorPage(err)
return
}
reverseProxyRef := &serverconfigs.ReverseProxyRef{
var reverseProxyRef = &serverconfigs.ReverseProxyRef{
IsOn: true,
ReverseProxyId: resp.ReverseProxyId,
}
@@ -355,7 +355,7 @@ func (this *CreateAction) RunPost(params struct {
var rootJSON []byte
var err error
if len(params.WebRoot) > 0 {
rootConfig := &serverconfigs.HTTPRootConfig{}
var rootConfig = &serverconfigs.HTTPRootConfig{}
rootConfig.IsOn = true
rootConfig.Dir = params.WebRoot
rootConfig.Indexes = []string{"index.html", "index.htm"}
@@ -375,7 +375,7 @@ func (this *CreateAction) RunPost(params struct {
}
// 包含条件
includeNodes := []maps.Map{}
var includeNodes = []maps.Map{}
includeNodesJSON, err := json.Marshal(includeNodes)
if err != nil {
this.ErrorPage(err)
@@ -383,7 +383,7 @@ func (this *CreateAction) RunPost(params struct {
}
// 排除条件
excludeNodes := []maps.Map{}
var excludeNodes = []maps.Map{}
excludeNodesJSON, err := json.Marshal(excludeNodes)
if err != nil {
this.ErrorPage(err)
@@ -396,7 +396,7 @@ func (this *CreateAction) RunPost(params struct {
AdminId: this.AdminId(),
Type: params.ServerType,
Name: params.Name,
ServerNamesJON: []byte(params.ServerNames),
ServerNamesJON: params.ServerNames,
Description: params.Description,
NodeClusterId: clusterId,
IncludeNodesJSON: includeNodesJSON,

7
web/public/js/utils.js
View File

@@ -180,7 +180,7 @@ window.teaweb = {
bytesAxis: function (stats, countFunc) {
let max = Math.max.apply(this, stats.map(countFunc))
let divider = 1
let unit = ""
let unit = "B"
if (max >= Math.pow(1024, 6)) {
unit = "E"
divider = Math.pow(1024, 6)
@@ -583,7 +583,10 @@ window.teaweb = {
show: true,
trigger: "item",
formatter: function (args) {
return tooltipFunc.apply(this, [args, values])
if (tooltipFunc != null) {
return tooltipFunc.apply(this, [args, values])
}
return null
}
},
grid: {

2
web/views/@default/clusters/cluster/settings/dns/index.html
View File

@@ -31,7 +31,7 @@
<td>自动设置CNAME记录<optional-label></optional-label></td>
<td>
<values-box :values="cnameRecords" name="cnameRecords" placeholder="记录名" ref="cnameRecords"></values-box>
<p class="comment">除集群已创建的网站服务之外，自动解析到集群的CNAME记录，比如<code-label @click.prevent="addCnameRecord('@')">@</code-label>、<code-label @click.prevent="addCnameRecord('www')">www</code-label>。</p>
<p class="comment">除集群已创建的网站服务之外，自动解析到集群的CNAME记录，比如<code-label @click.prevent="addCnameRecord('www')">www</code-label>。</p>
</td>
</tr>
<tr>

2
web/views/@default/dns/updateClusterPopup.html
View File

@@ -48,7 +48,7 @@
<td>自动设置CNAME记录</td>
<td>
<values-box :values="cnameRecords" name="cnameRecords" placeholder="记录名" ref="cnameRecords"></values-box>
<p class="comment">除集群已创建的网站服务之外，自动解析到集群的CNAME记录，比如<code-label @click.prevent="addCnameRecord('@')">@</code-label>、<code-label @click.prevent="addCnameRecord('www')">www</code-label>。</p>
<p class="comment">除集群已创建的网站服务之外，自动解析到集群的CNAME记录，比如<code-label @click.prevent="addCnameRecord('www')">www</code-label>。</p>
</td>
</tr>
<tr>