Skip to content

Commit 42148a6

Browse files
committed
改进文字提示
1 parent 9687871 commit 42148a6

File tree

4 files changed

+35
-6
lines changed

4 files changed

+35
-6
lines changed

web/views/@default/clusters/cluster/createNode.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
<tr>
2424
<td class="title">节点名称 *</td>
2525
<td>
26-
<input type="text" name="name" maxlength="50" ref="focus"/>
26+
<input type="text" name="name" maxlength="50" ref="focus" v-model="name" @input="changeName"/>
2727
</td>
2828
</tr>
2929
<tr>
3030
<td>IP地址 *</td>
3131
<td>
3232
<node-ip-addresses-box></node-ip-addresses-box>
33-
<p class="comment">用于访问节点和域名解析等。</p>
33+
<p class="comment">用于访问节点和域名解析等<span v-if="defaultIP.length > 0"><strong>,如果没有填写默认为{{defaultIP}}</strong></span></p>
3434
</td>
3535
</tr>
3636
<tr v-if="dnsRoutes.length > 0">

web/views/@default/clusters/cluster/createNode.js

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Tea.context(function () {
55
this.sshPort = ""
66
this.grantId = 0
77
this.step = "info"
8+
this.name = ""
89

910
this.success = function (resp) {
1011
this.node = resp.data.node
@@ -170,4 +171,32 @@ Tea.context(function () {
170171
this.createNext = function () {
171172
teaweb.reload()
172173
}
174+
175+
this.defaultIP = ""
176+
this.changeName = function () {
177+
if (this.validateIP(this.name)) {
178+
this.defaultIP = this.name
179+
} else {
180+
this.defaultIP = ""
181+
}
182+
}
183+
184+
this.validateIP = function (v) {
185+
// 目前只支持ipv4
186+
let pieces = v.split(".")
187+
if (pieces.length != 4) {
188+
return false
189+
}
190+
for (let i = 0; i < pieces.length; i++) {
191+
if (!/^\d{1,3}$/.test(pieces[i])) {
192+
return false
193+
}
194+
let p = parseInt(pieces[i], 10)
195+
if (p > 255) {
196+
return false
197+
}
198+
}
199+
200+
return true
201+
}
173202
})

web/views/@default/servers/server/settings/https/requestCertPopup.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ <h3>申请免费证书</h3>
88
<tr>
99
<td class="title">证书包含的域名 *</td>
1010
<td>
11-
<span v-if="serverNames.length == 0" class="disabled">还没有设置域名,暂时不能申请。</span>
11+
<span v-if="serverNames.length == 0" class="disabled">还没有需要申请证书的域名,暂时不能申请。</span>
1212
<div v-if="serverNames.length > 0">
1313
<div v-for="(serverName, index) in serverNames" class="ui tiny basic label">
1414
<input type="hidden" name="serverNames" :value="serverName"/>

web/views/@default/setup/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@
4747

4848
<!-- 介绍 -->
4949
<div v-show="step == STEP_INTRO">
50-
<div>感谢你选择使用<strong>GoEdge</strong>集群服务系统,下面让我们一起开始配置系统。</div>
51-
<div class="margin">在这之前如果你还没有可用的MySQL数据库,请先安装数据库再进行</div>
50+
<div>感谢你选择使用<strong>GoEdge</strong>CDN系统,下面让我们一起开始配置系统。</div>
51+
<div class="margin">在这之前如果你还没有可用的MySQL数据库,请先安装MySQL数据库再进行</div>
5252
<div class="margin" style="color: grey">免责声明:GoEdge软件开发者并不对您的软件使用方法、服务对象、服务内容负道德或法律上的约束责任,在使用本软件时产生的一切法律风险自负。</div>
53-
<div class="margin" style="color: grey">用户协议:请在遵守中华人民共和国政策、法律、法规的前提下使用本软件;自愿承担因不当使用本软件产生的一切法律后果;承认GoEdge开发者拥有本软件的著作权;点击"开始"安装表示你同意此用户协议。</div>
53+
<div class="margin" style="color: grey">用户协议:请在遵守中华人民共和国政策、法律、法规的前提下使用本软件;自愿承担因不当使用本软件产生的一切法律后果;承认GoEdge开发者拥有本软件的所有著作权;点击"开始"安装表示你同意此用户协议。</div>
5454
<button class="ui button primary" style="margin-top: 10em" type="button" @click.prevent="goIntroNext()">开始<i class="icon long arrow right"></i></button>
5555
</div>
5656

0 commit comments

Comments
 (0)