mirror of
				https://github.com/TeaOSLab/EdgeAdmin.git
				synced 2025-11-04 05:00:25 +08:00 
			
		
		
		
	优化域名服务相关功能
This commit is contained in:
		@@ -51,8 +51,10 @@ Vue.component("ns-route-ranges-box", {
 | 
			
		||||
 | 
			
		||||
			this.ranges.push({
 | 
			
		||||
				type: "ipRange",
 | 
			
		||||
				ipFrom: this.ipRangeFrom,
 | 
			
		||||
				ipTo: this.ipRangeTo
 | 
			
		||||
				params: {
 | 
			
		||||
					ipFrom: this.ipRangeFrom,
 | 
			
		||||
					ipTo: this.ipRangeTo
 | 
			
		||||
				}
 | 
			
		||||
			})
 | 
			
		||||
			this.cancelIPRange()
 | 
			
		||||
		},
 | 
			
		||||
@@ -76,7 +78,7 @@ Vue.component("ns-route-ranges-box", {
 | 
			
		||||
	<div v-if="ranges.length > 0">
 | 
			
		||||
		<div class="ui label tiny basic" v-for="(range, index) in ranges">
 | 
			
		||||
			<span v-if="range.type == 'ipRange'">IP范围:</span>
 | 
			
		||||
			{{range.ipFrom}} - {{range.ipTo}}   <a href="" title="删除" @click.prevent="remove(index)"><i class="icon remove small"></i></a>
 | 
			
		||||
			{{range.params.ipFrom}} - {{range.params.ipTo}}   <a href="" title="删除" @click.prevent="remove(index)"><i class="icon remove small"></i></a>
 | 
			
		||||
		</div>
 | 
			
		||||
		<div class="ui divider"></div>
 | 
			
		||||
	</div>
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,5 @@
 | 
			
		||||
{$layout}
 | 
			
		||||
{$template "../menu"}
 | 
			
		||||
{$template "menu"}
 | 
			
		||||
 | 
			
		||||
<form method="post" class="ui form" data-tea-action="$" data-tea-success="success">
 | 
			
		||||
    <input type="hidden" name="clusterId" :value="clusterId"/>
 | 
			
		||||
@@ -17,11 +17,6 @@
 | 
			
		||||
                <p class="comment">用于访问节点和域名解析等。</p>
 | 
			
		||||
            </td>
 | 
			
		||||
        </tr>
 | 
			
		||||
        <tr>
 | 
			
		||||
            <td colspan="2">
 | 
			
		||||
                <more-options-indicator></more-options-indicator>
 | 
			
		||||
            </td>
 | 
			
		||||
        </tr>
 | 
			
		||||
    </table>
 | 
			
		||||
    <submit-btn></submit-btn>
 | 
			
		||||
</form>
 | 
			
		||||
@@ -39,12 +39,12 @@
 | 
			
		||||
        <td>
 | 
			
		||||
            <div  v-if="node.status.isActive">
 | 
			
		||||
                <span class="green">运行中</span>  
 | 
			
		||||
                <a href="" @click.prevent="stopNode()" v-if="!isStopping"><span>[通过SSH停止]</span></a>
 | 
			
		||||
                <!--<a href="" @click.prevent="stopNode()" v-if="!isStopping"><span>[通过SSH停止]</span></a>-->
 | 
			
		||||
                <span v-if="isStopping">[停止中...]</span>
 | 
			
		||||
            </div>
 | 
			
		||||
            <div v-else>
 | 
			
		||||
                <span class="red">已断开</span>  
 | 
			
		||||
                <a href="" @click.prevent="startNode()" v-if="node.isInstalled && !isStarting"><span>[通过SSH启动]</span></a>
 | 
			
		||||
                <!--<a href="" @click.prevent="startNode()" v-if="node.isInstalled && !isStarting"><span>[通过SSH启动]</span></a>-->
 | 
			
		||||
                <span v-if="node.isInstalled && isStarting">[启动中...]</span>
 | 
			
		||||
                <a v-if="!node.isInstalled" :href="'/ns/clusters/cluster/node/install?clusterId=' + clusterId + '&nodeId=' + node.id" ><span>去安装></span></a>
 | 
			
		||||
            </div>
 | 
			
		||||
@@ -59,20 +59,10 @@
 | 
			
		||||
            <td>内存用量</td>
 | 
			
		||||
            <td>{{node.status.memUsageText}}</td>
 | 
			
		||||
        </tr>
 | 
			
		||||
        <tr>
 | 
			
		||||
            <td>连接数</td>
 | 
			
		||||
            <td>{{node.status.connectionCount}}</td>
 | 
			
		||||
        </tr>
 | 
			
		||||
        <tr>
 | 
			
		||||
            <td>负载</td>
 | 
			
		||||
            <td>{{node.status.load1m}}   {{node.status.load5m}}   {{node.status.load15m}}   <tip-icon content="三个数字分别代表1分钟、5分钟、15分钟平均负载"></tip-icon></td>
 | 
			
		||||
        </tr>
 | 
			
		||||
        <tr>
 | 
			
		||||
            <td>缓存用量</td>
 | 
			
		||||
            <td>
 | 
			
		||||
                磁盘:{{node.status.cacheTotalDiskSize}}    内存:{{node.status.cacheTotalMemorySize}}
 | 
			
		||||
            </td>
 | 
			
		||||
        </tr>
 | 
			
		||||
        <tr>
 | 
			
		||||
            <td>版本</td>
 | 
			
		||||
            <td>v{{node.status.buildVersion}}
 | 
			
		||||
@@ -105,7 +95,7 @@
 | 
			
		||||
        <td>是否已安装</td>
 | 
			
		||||
        <td>
 | 
			
		||||
            <span v-if="node.isInstalled" class="green">已安装</span>
 | 
			
		||||
            <a v-else :href="'/ns/clusters/cluster/installNode?clusterId=' + clusterId + '&nodeId=' + nodeId" class="underline" title="点击进入安装界面"><span class="red">未安装</span></a>
 | 
			
		||||
            <a v-else :href="'/ns/clusters/cluster/node/install?clusterId=' + clusterId + '&nodeId=' + nodeId" class="underline" title="点击进入安装界面"><span class="red">未安装</span></a>
 | 
			
		||||
        </td>
 | 
			
		||||
    </tr>
 | 
			
		||||
</table>
 | 
			
		||||
@@ -14,12 +14,14 @@
 | 
			
		||||
            <td class="title">所属集群 *</td>
 | 
			
		||||
            <td>
 | 
			
		||||
                <ns-cluster-selector></ns-cluster-selector>
 | 
			
		||||
                <p class="comment">需要部署域名服务的集群。</p>
 | 
			
		||||
            </td>
 | 
			
		||||
        </tr>
 | 
			
		||||
        <tr>
 | 
			
		||||
            <td>所属用户</td>
 | 
			
		||||
            <td>
 | 
			
		||||
                <ns-user-selector></ns-user-selector>
 | 
			
		||||
                <p class="comment">当前域名所属的平台用户。</p>
 | 
			
		||||
            </td>
 | 
			
		||||
        </tr>
 | 
			
		||||
    </table>
 | 
			
		||||
 
 | 
			
		||||
@@ -26,7 +26,7 @@
 | 
			
		||||
        <tr>
 | 
			
		||||
            <td>记录值</td>
 | 
			
		||||
            <td>
 | 
			
		||||
                <input type="text" name="value" maxlength="1024"/>
 | 
			
		||||
                <input type="text" name="value" maxlength="512"/>
 | 
			
		||||
            </td>
 | 
			
		||||
        </tr>
 | 
			
		||||
        <tr>
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,7 @@
 | 
			
		||||
Tea.context(function () {
 | 
			
		||||
	this.createRecord = function () {
 | 
			
		||||
		teaweb.popup("/ns/domains/records/createPopup?domainId=" + this.domain.id, {
 | 
			
		||||
			height: "32em",
 | 
			
		||||
			callback: function () {
 | 
			
		||||
				teaweb.success("保存成功", function () {
 | 
			
		||||
					teaweb.reload()
 | 
			
		||||
@@ -11,6 +12,7 @@ Tea.context(function () {
 | 
			
		||||
 | 
			
		||||
	this.updateRecord = function (recordId) {
 | 
			
		||||
		teaweb.popup("/ns/domains/records/updatePopup?recordId=" + recordId, {
 | 
			
		||||
			height: "32em",
 | 
			
		||||
			callback: function () {
 | 
			
		||||
				teaweb.success("保存成功", function () {
 | 
			
		||||
					teaweb.reload()
 | 
			
		||||
 
 | 
			
		||||
@@ -26,7 +26,7 @@
 | 
			
		||||
        <tr>
 | 
			
		||||
            <td>记录值</td>
 | 
			
		||||
            <td>
 | 
			
		||||
                <input type="text" name="value" maxlength="1024" v-model="record.value"/>
 | 
			
		||||
                <input type="text" name="value" maxlength="512" v-model="record.value"/>
 | 
			
		||||
            </td>
 | 
			
		||||
        </tr>
 | 
			
		||||
        <tr>
 | 
			
		||||
 
 | 
			
		||||
@@ -8,19 +8,21 @@
 | 
			
		||||
        <tr>
 | 
			
		||||
            <td>域名 *</td>
 | 
			
		||||
            <td>
 | 
			
		||||
                <input type="text" name="name" maxlength="255" ref="focus" v-model="domain.name"/>
 | 
			
		||||
                {{domain.name}}
 | 
			
		||||
            </td>
 | 
			
		||||
        </tr>
 | 
			
		||||
        <tr>
 | 
			
		||||
            <td class="title">所属集群 *</td>
 | 
			
		||||
            <td>
 | 
			
		||||
                <ns-cluster-selector :v-cluster-id="domain.clusterId"></ns-cluster-selector>
 | 
			
		||||
                <p class="comment">需要部署域名服务的集群。</p>
 | 
			
		||||
            </td>
 | 
			
		||||
        </tr>
 | 
			
		||||
        <tr>
 | 
			
		||||
            <td>所属用户</td>
 | 
			
		||||
            <td>
 | 
			
		||||
                <ns-user-selector :v-user-id="domain.userId"></ns-user-selector>
 | 
			
		||||
                <p class="comment">当前域名所属的平台用户。</p>
 | 
			
		||||
            </td>
 | 
			
		||||
        </tr>
 | 
			
		||||
        <tr>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user