商业版支持L2节点

This commit is contained in:
GoEdgeLab
2022-04-04 12:08:18 +08:00
parent c4588803e7
commit 1373517c57
13 changed files with 113 additions and 42 deletions

View File

@@ -14,20 +14,20 @@
<p class="comment">每行一个节点IP。</p>
</td>
</tr>
<tr>
<td>所属区域</td>
<td>
<node-region-selector></node-region-selector>
<p class="comment">设置区域后才能根据区域进行流量统计和计费。</p>
</td>
</tr>
<tr>
<td>所属分组</td>
<td>
<node-group-selector :v-cluster-id="clusterId"></node-group-selector>
<p class="comment">用来筛选服务</p>
<p class="comment">用来筛选节点<span v-if="teaIsPlus">,同时可以在分组中设置二级缓存节点</span></p>
</td>
</tr>
<tr>
<td>所属区域</td>
<td>
<node-region-selector></node-region-selector>
<p class="comment">设置区域后可以根据区域进行流量统计和计费。</p>
</td>
</tr>
</table>
<submit-btn></submit-btn>
</form>

View File

@@ -41,20 +41,20 @@
<p class="comment">当前节点对应的DNS线路可用线路是根据集群设置的域名获取的注意DNS服务商可能对这些线路有其他限制。</p>
</td>
</tr>
<tr>
<td>所属区域</td>
<td>
<node-region-selector></node-region-selector>
<p class="comment">设置区域后才能根据区域进行流量统计和计费。</p>
</td>
</tr>
<tr>
<td>所属分组</td>
<td>
<node-group-selector :v-cluster-id="clusterId"></node-group-selector>
<p class="comment">用来筛选服务</p>
<p class="comment">用来筛选节点<span v-if="teaIsPlus">,同时可以在分组中设置二级缓存节点</span></p>
</td>
</tr>
<tr>
<td>所属区域</td>
<td>
<node-region-selector></node-region-selector>
<p class="comment">设置区域后可以根据区域进行流量统计和计费。</p>
</td>
</tr>
<tr>
<td colspan="2">
<more-options-indicator></more-options-indicator>

View File

@@ -1,14 +1,17 @@
<second-menu>
<a :href="'/clusters/cluster/nodes?clusterId=' + clusterId" class="item">{{currentClusterName}}</a>
<raquo-item></raquo-item>
<a :href="'/clusters/cluster/nodes?clusterId=' + clusterId + '&groupId=' + node.group.id" v-if="node.group != null" class="item" style="padding-left: 0">{{node.group.name}}</a>
<a :href="'/clusters/cluster/nodes?clusterId=' + clusterId + '&groupId=' + node.group.id" v-if="node.group != null" class="item">{{node.group.name}}</a>
<raquo-item v-if="node.group != null"></raquo-item>
<menu-item :href="'/clusters/cluster/node?clusterId=' + clusterId + '&nodeId=' + node.id">{{node.name}}</menu-item>
<menu-item :href="'/clusters/cluster/node?clusterId=' + clusterId + '&nodeId=' + node.id">
{{node.name}}
<sup v-if="node.level > 1">&nbsp; <span class="blue">L{{node.level}}</span></sup>
</menu-item>
<raquo-item></raquo-item>
<menu-item :href="'/clusters/cluster/node?clusterId=' + clusterId + '&nodeId=' + node.id" code="node" v-if="!teaIsPlus">节点详情</menu-item>
<menu-item :href="'/clusters/cluster/node/boards?clusterId=' + clusterId + '&nodeId=' + node.id" code="board" v-if="teaIsPlus">节点看板</menu-item>
<menu-item :href="'/clusters/cluster/node/detail?clusterId=' + clusterId + '&nodeId=' + node.id" code="node" v-if="teaIsPlus">节点详情</menu-item>
<menu-item :href="'/clusters/cluster/node/logs?clusterId=' + clusterId + '&nodeId=' + node.id" code="log">运行日志</menu-item>
<menu-item :href="'/clusters/cluster/node/install?clusterId=' + clusterId + '&nodeId=' + node.id" code="install">安装节点</menu-item>
<menu-item :href="'/clusters/cluster/node/update?clusterId=' + clusterId + '&nodeId=' + node.id" code="update">修改设置</menu-item>
<menu-item :href="'/clusters/cluster/node/update?clusterId=' + clusterId + '&nodeId=' + node.id" code="update">节点设置</menu-item>
</second-menu>

View File

@@ -84,6 +84,12 @@
<span v-else class="disabled">没有设置分组。</span>
</td>
</tr>
<tr v-if="teaIsPlus">
<td>级别</td>
<td>
<span :class="{blue: node.levelInfo.code > 1}">{{node.levelInfo.name}}</span>
</td>
</tr>
<tr>
<td colspan="2"><more-options-indicator>更多选项</more-options-indicator></td>
</tr>

View File

@@ -30,24 +30,30 @@
<p class="comment">用于访问节点和域名解析等。</p>
</td>
</tr>
<tr>
<td>所属区域</td>
<td>
<node-region-selector :v-region="node.region"></node-region-selector>
<p class="comment">设置区域后才能根据区域进行流量统计和计费。</p>
</td>
</tr>
<tr>
<td>所属分组</td>
<td>
<node-group-selector :v-cluster-id="clusterId" :v-group="node.group"></node-group-selector>
<p class="comment">用来筛选服务</p>
<p class="comment">用来筛选节点<span v-if="teaIsPlus">,同时可以在分组中设置二级缓存节点</span></p>
</td>
</tr>
<tr>
<td>所属区域</td>
<td>
<node-region-selector :v-region="node.region"></node-region-selector>
<p class="comment">设置区域后可以根据区域进行流量统计和计费。</p>
</td>
</tr>
<tr>
<td colspan="2"><more-options-indicator></more-options-indicator></td>
</tr>
<tbody v-show="moreOptionsVisible">
<tr v-if="teaIsPlus">
<td>级别</td>
<td>
<node-level-selector :v-node-level="node.level"></node-level-selector>
</td>
</tr>
<tr>
<td>是否启用</td>
<td>

View File

@@ -31,12 +31,18 @@
<option value="2">未安装</option>
</select>
</div>
<div class="ui field" v-if="teaIsPlus && levels.length > 0">
<select class="ui dropdown" name="level" v-model="level">
<option value="0">[级别]</option>
<option v-for="levelInfo in levels" :value="levelInfo.code">{{levelInfo.name}}</option>
</select>
</div>
<div class="ui field">
<input type="text" name="keyword" placeholder="关键词" v-model="keyword" style="width:10em"/>
</div>
<div class="ui field">
<button class="ui button" type="submit">搜索</button> &nbsp;
<a :href="'/clusters/cluster/nodes?clusterId=' + clusterId" v-if="regionId >0 || groupId > 0 || installState > 0 || activeState > 0 || keyword.length > 0">[清除条件]</a>
<a :href="'/clusters/cluster/nodes?clusterId=' + clusterId" v-if="regionId > 0 || groupId > 0 || installState > 0 || activeState > 0 || keyword.length > 0 || level > 0">[清除条件]</a>
</div>
</div>
</form>
@@ -66,7 +72,7 @@
</tr>
</thead>
<tr v-for="node in nodes">
<td><a :href="'/clusters/cluster/node?clusterId=' + clusterId + '&nodeId=' + node.id">{{node.name}}</a>
<td><a :href="'/clusters/cluster/node?clusterId=' + clusterId + '&nodeId=' + node.id">{{node.name}}<sup v-if="node.level > 1"><span class="blue"> &nbsp;L{{node.level}}</span></sup></a>
<div v-if="node.region != null">
<grey-label>区域:{{node.region.name}}</grey-label>
</div>

View File

@@ -1,7 +1,7 @@
<second-menu>
<menu-item :href="'/clusters/cluster?clusterId=' + clusterId">{{currentClusterName}}</menu-item>
<span class="disabled item" style="padding: 0">&raquo;</span>
<menu-item :href="'/clusters/cluster/settings?clusterId=' + clusterId">设置</menu-item>
<span class="disabled item" style="padding: 0" v-if="leftMenuActiveItem != null">&raquo;</span>
<raquo-item></raquo-item>
<menu-item :href="'/clusters/cluster/settings?clusterId=' + clusterId">集群设置</menu-item>
<raquo-item></raquo-item>
<a class="item active" v-if="leftMenuActiveItem != null" :href="leftMenuActiveItem.url">"{{leftMenuActiveItem.name}}"设置</a>
</second-menu>