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

节点选择认证时增加推荐

Browse Source
This commit is contained in:
刘祥超
2021-08-14 21:33:48 +08:00
parent 86a5992e8a
commit b3f62240c4
23 changed files with 238 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web/views/@default/clusters/cluster/createNode.html
View File

@@ -78,7 +78,7 @@
<tr>
<td>SSH登录认证</td>
<td>
<grant-selector></grant-selector>
<grant-selector :v-node-cluster-id="clusterId"></grant-selector>
</td>
</tr>
</tbody>
@@ -117,7 +117,7 @@
<tr>
<td>SSH登录认证 *</td>
<td>
<grant-selector :v-grant="node.grant" @change="changeGrant"></grant-selector>
<grant-selector :v-grant="node.grant" :v-node-cluster-id="clusterId" @change="changeGrant"></grant-selector>
</td>
</tr>
</table>
@@ -147,6 +147,8 @@ nodeId: "{{node.uniqueId}}"
secret: "{{node.secret}}"</source-code-box>
<div class="row">然后再使用<code-label>bin/edge-node start</code-label>命令启动节点。</div>
<div>
<div class="ui divider"></div>
<a href="" @click.prevent="finish">安装完成</a>
<a href="" @click.prevent="finish" style="float: right">跳过安装</a>
</div>
</div>

2
web/views/@default/clusters/cluster/node/detail.html
View File

@@ -113,7 +113,7 @@
<td>SSH登录认证</td>
<td>
<div v-if="node.login != null && node.login.grant != null && node.login.grant.id > 0">
<a :href="'/clusters/grants/grant?grantId=' + node.login.grant.id">{{node.login.grant.name}}<span class="small">（{{node.login.grant.methodName}}）</span></a>
<a :href="'/clusters/grants/grant?grantId=' + node.login.grant.id">{{node.login.grant.name}}<span class="small grey">（{{node.login.grant.methodName}}）</span><span class="small grey" v-if="node.login.grant.username.length > 0">（{{node.login.grant.username}}）</span></a>
</div>
<span v-else class="disabled">
尚未设置

2
web/views/@default/clusters/cluster/node/update.html
View File

@@ -68,7 +68,7 @@
<tr>
<td>SSH登录认证</td>
<td>
<grant-selector :v-grant="grant"></grant-selector>
<grant-selector :v-grant="grant" :v-node-cluster-id="clusterId"></grant-selector>
</td>
</tr>
<tr>

3
web/views/@default/clusters/cluster/node/update.js
View File

@@ -35,7 +35,8 @@ Tea.context(function () {
id: this.node.login.grant.id,
name: this.node.login.grant.name,
method: this.node.login.grant.method,
methodName: this.node.login.grant.methodName
methodName: this.node.login.grant.methodName,
username: this.node.login.grant.username
}
}
}

2
web/views/@default/clusters/cluster/updateNodeSSH.html
View File

@@ -23,7 +23,7 @@
<tr>
<td>SSH登录认证 *</td>
<td>
<grant-selector :v-grant="grant"></grant-selector>
<grant-selector :v-grant="grant" :v-node-cluster-id="clusterId"></grant-selector>
</td>
</tr>
</table>

29
web/views/@default/clusters/grants/selectPopup.css Normal file
View File

@@ -0,0 +1,29 @@
.grants-box {
margin-top: 1em;
}
.grant-box {
float: left;
width: 12em;
height: 4.5em;
overflow-x: hidden;
overflow-y: auto;
margin-right: 0.5em;
border: 1px #ccc solid;
margin-bottom: 0.5em;
padding: 0.5em 0.3em;
text-align: left;
cursor: pointer;
}
.grant-box .small {
font-size: 0.8em;
}
.grant-box div.method {
margin-top: 0.3em;
}
.grant-box div.method .small {
font-size: 0.8em;
}
.grant-box::-webkit-scrollbar {
width: 4px;
}
/*# sourceMappingURL=selectPopup.css.map */

1
web/views/@default/clusters/grants/selectPopup.css.map Normal file
View File

@@ -0,0 +1 @@
{"version":3,"sources":["selectPopup.less"],"names":[],"mappings":"AAAA;EACC,eAAA;;AAGD;EACC,WAAA;EACA,WAAA;EACA,aAAA;EACA,kBAAA;EACA,gBAAA;EACA,mBAAA;EACA,sBAAA;EACA,oBAAA;EACA,oBAAA;EACA,gBAAA;EACA,eAAA;;AAXD,UAaC;EACC,gBAAA;;AAdF,UAiBC,IAAG;EACF,iBAAA;;AAlBF,UAiBC,IAAG,OAGF;EACC,gBAAA;;AAKH,UAAU;EACT,UAAA","file":"selectPopup.css"}

39
web/views/@default/clusters/grants/selectPopup.html
View File

@@ -1,6 +1,6 @@
{$layout "layout_popup"}
<h3>选择认证</h3>
<h3>选择SSH认证</h3>
<form class="ui form">
<div class="ui fields inline">
@@ -10,12 +10,31 @@
</div>
</form>
<table class="ui table">
<tr>
<td>
<span v-if="grants.length == 0">暂时还没有可用的认证。</span>
<a class="ui label small basic" v-for="grant in grants" :class="{blue:grantId == grant.id}" @click.prevent="selectGrant(grant)" style="margin-bottom:0.5em">{{grant.name}} <span class="small">（{{grant.methodName}}）</span><span v-if="grant.username.length > 0" class="small">（{{grant.username}}）</span></a>
<p class="comment">请点击选中某个认证。</p>
</td>
</tr>
</table>
<div class="ui divider"></div>
<span v-if="grants.length == 0">暂时还没有可用的认证。</span>
<h4 v-if="suggestGrants.length > 0">可能的认证</h4>
<div class="grants-box" v-if="suggestGrants.length > 0">
<div class="grant-box" v-for="grant in suggestGrants">
<div :class="{blue:grantId == grant.id}" @click.prevent="selectGrant(grant)"><a href="">{{grant.name}}</a> <span v-if="grant.username.length > 0" class="small grey">（{{grant.username}}）</span>
<div class="method">
<span class="small grey">{{grant.methodName}}</span>
</div>
</div>
</div>
</div>
<div class="clear"></div>
<h4>全部认证</h4>
<div class="grants-box">
<div class="grant-box" v-for="grant in grants">
<div :class="{blue:grantId == grant.id}" @click.prevent="selectGrant(grant)"><a href="">{{grant.name}}</a> <span v-if="grant.username.length > 0" class="small grey">（{{grant.username}}）</span>
<div class="method">
<span class="small grey">{{grant.methodName}}</span>
</div>
</div>
</div>
</div>
<div class="clear"></div>
<p class="comment">请点击使用某个认证。</p>

33
web/views/@default/clusters/grants/selectPopup.less Normal file
View File

@@ -0,0 +1,33 @@
.grants-box {
margin-top: 1em;
}
.grant-box {
float: left;
width: 12em;
height: 4.5em;
overflow-x: hidden;
overflow-y: auto;
margin-right: 0.5em;
border: 1px #ccc solid;
margin-bottom: 0.5em;
padding: 0.5em 0.3em;
text-align: left;
cursor: pointer;
.small {
font-size: 0.8em;
}
div.method {
margin-top: 0.3em;
.small {
font-size: 0.8em;
}
}
}
.grant-box::-webkit-scrollbar {
width: 4px;
}