可以在节点列表中直接修改节点所属线路

2026-01-02 09:06:37 +08:00 · 2021-08-29 14:00:59 +08:00
parent 160bdc2451
commit 5f69199b50
14 changed files with 235 additions and 5 deletions
--- a/web/public/js/components/dns/dns-route-selector.js
+++ b/web/public/js/components/dns/dns-route-selector.js
@@ -94,7 +94,7 @@ Vue.component("dns-route-selector", {
 				</select>
 			</div>
 			<div class="ui field">
-				<input type="text" placeholder="搜索..." size="10" v-model="keyword" ref="keywordRef"/>
+				<input type="text" placeholder="搜索..." size="10" v-model="keyword" ref="keywordRef" @keyup.enter="confirm" @keypress.enter.prevent="1"/>
 			</div>
 			
 			<div class="ui field">
--- a/web/views/@default/@layout.html
+++ b/web/views/@default/@layout.html
@@ -11,7 +11,6 @@
    {$end}
    <link rel="stylesheet" type="text/css" href="/_/@default/@layout.css" media="all"/>
    {$TEA.SEMANTIC}
-	<link rel="stylesheet" type="text/css" href="/_/@default/@layout_override.css" media="all"/>

    {$TEA.VUE}
    {$echo "header"}
@@ -20,6 +19,8 @@
 	<script type="text/javascript" src="/js/utils.js"></script>
 	<script type="text/javascript" src="/js/sweetalert2/dist/sweetalert2.all.min.js"></script>
 	<script type="text/javascript" src="/js/date.tea.js"></script>
+
+    <link rel="stylesheet" type="text/css" href="/_/@default/@layout_override.css" media="all"/>
 </head>
 <body>

--- a/web/views/@default/@layout_override.css
+++ b/web/views/@default/@layout_override.css
@@ -45,4 +45,7 @@ select.dropdown {
 .message .icon.warning {
  font-size: 2em !important;
 }
+body.swal2-shown {
+  overflow: auto !important;
+}
 /*# sourceMappingURL=@layout_override.css.map */
--- a/web/views/@default/@layout_override.css.map
+++ b/web/views/@default/@layout_override.css.map
@@ -1 +1 @@
-{"version":3,"sources":["@layout_override.less"],"names":[],"mappings":"AACA,GAAG,OAAO,SAAU,MAAK,MAAM,QAAS,OAAM;AAAS,GAAG,OAAO,SAAU,MAAK,MAAM,QAAS,QAAO;EACrG,oCAAA;;AAGD,GAAG,OAAO,SAAU,MAAK,QAAS,OAAM;AAAS,GAAG,OAAO,SAAU,MAAK,QAAS,QAAO;EACzF,oCAAA;;AAGD,GAAG,MAAM;EACR,kCAAA;;AAGD,GAAG,MAAM,MAAM;EACd,iCAAA;;AAID,IACC;EACC,2BAAA;;AAKF,KAAK;EACJ,sBAAA;;AAGD,KAAK,KAAK;EACT,yBAAA;;AAID,KACC,GAAE;AADH,KACY,GAAE;EACZ,6BAAA;EACA,0BAAA;EACA,2BAAA;;AAJF,KAOC,GAAE;EACD,WAAA;;AARF,KAWC,GAAE;EACD,UAAA;;AAZF,KAeC,GAAE;EACD,UAAA;;AAKF,QAAQ;EACP,qBAAA;;AAID,MAAM;EACL,uBAAA;;AAID,QACC,MAAK;EACJ,yBAAA","file":"@layout_override.css"}
+{"version":3,"sources":["@layout_override.less"],"names":[],"mappings":"AACA,GAAG,OAAO,SAAU,MAAK,MAAM,QAAS,OAAM;AAAS,GAAG,OAAO,SAAU,MAAK,MAAM,QAAS,QAAO;EACrG,oCAAA;;AAGD,GAAG,OAAO,SAAU,MAAK,QAAS,OAAM;AAAS,GAAG,OAAO,SAAU,MAAK,QAAS,QAAO;EACzF,oCAAA;;AAGD,GAAG,MAAM;EACR,kCAAA;;AAGD,GAAG,MAAM,MAAM;EACd,iCAAA;;AAID,IACC;EACC,2BAAA;;AAKF,KAAK;EACJ,sBAAA;;AAGD,KAAK,KAAK;EACT,yBAAA;;AAID,KACC,GAAE;AADH,KACY,GAAE;EACZ,6BAAA;EACA,0BAAA;EACA,2BAAA;;AAJF,KAOC,GAAE;EACD,WAAA;;AARF,KAWC,GAAE;EACD,UAAA;;AAZF,KAeC,GAAE;EACD,UAAA;;AAKF,QAAQ;EACP,qBAAA;;AAID,MAAM;EACL,uBAAA;;AAID,QACC,MAAK;EACJ,yBAAA;;AAKF,IAAI;EACH,yBAAA","file":"@layout_override.css"}
--- a/web/views/@default/@layout_override.less
+++ b/web/views/@default/@layout_override.less
@@ -67,4 +67,9 @@ select.dropdown {
 	.icon.warning {
 		font-size: 2em !important;
 	}
+}
+
+// popup
+body.swal2-shown {
+	overflow: auto !important;
 }
--- a/web/views/@default/clusters/cluster/node/updateDNSPopup.html
+++ b/web/views/@default/clusters/cluster/node/updateDNSPopup.html
@@ -0,0 +1,37 @@
+{$layout "layout_popup"}
+
+<h3>修改节点DNS设置</h3>
+
+<form class="ui form" data-tea-action="$" data-tea-success="success">
+	<input type="hidden" name="nodeId" :value="nodeId"/>
+	<input type="hidden" name="domainId" :value="domainId"/>
+	<csrf-token></csrf-token>
+
+	<table class="ui table definition selectable">
+		<tr v-if="domainName.length > 0">
+			<td>主域名</td>
+			<td>{{domainName}}
+				<p class="comment">由当前节点所属集群设置。</p>
+			</td>
+		</tr>
+		<tr>
+			<td class="title">IP地址 *</td>
+			<td>
+				<input type="text" name="ipAddr" maxlength="64" ref="focus" v-model="ipAddr"/>
+				<p class="comment">用于域名解析的节点IP地址。</p>
+			</td>
+		</tr>
+		<tr v-if="domainId > 0">
+			<td>线路</td>
+			<td>
+				<p class="comment" v-if="allRoutes.length == 0">没有可选的线路。</p>
+				<div v-if="allRoutes.length > 0">
+					<dns-route-selector :v-all-routes="allRoutes" :v-routes="routes"></dns-route-selector>
+					<p class="comment">当前节点IP对应的线路。</p>
+				</div>
+			</td>
+		</tr>
+	</table>
+
+	<submit-btn></submit-btn>
+</form>
--- a/web/views/@default/clusters/cluster/nodes.css
+++ b/web/views/@default/clusters/cluster/nodes.css
@@ -4,4 +4,19 @@
 a .red {
  border-bottom: 1px #db2828 dashed;
 }
+.routes-box a {
+  margin-left: 0.4em;
+  display: none;
+}
+.routes-box.show-link a {
+  display: inline;
+  font-size: 1em;
+}
+.routes-box:hover a {
+  display: inline;
+}
+a.small {
+  font-size: 0.8em;
+  text-align: center;
+}
 /*# sourceMappingURL=nodes.css.map */
--- a/web/views/@default/clusters/cluster/nodes.css.map
+++ b/web/views/@default/clusters/cluster/nodes.css.map
@@ -1 +1 @@
-{"version":3,"sources":["nodes.less"],"names":[],"mappings":"AAAA,MAAO;EACN,oBAAA;;AAGD,CACC;EACC,iCAAA","file":"nodes.css"}
+{"version":3,"sources":["nodes.less"],"names":[],"mappings":"AAAA,MAAO;EACN,oBAAA;;AAGD,CACC;EACC,iCAAA;;AAIF,WACC;EACC,kBAAA;EACA,aAAA;;AAIF,WAAW,UACV;EACC,eAAA;EACA,cAAA;;AAIF,WAAW,MACV;EACC,eAAA;;AAIF,CAAC;EACA,gBAAA;EACA,kBAAA","file":"nodes.css"}
--- a/web/views/@default/clusters/cluster/nodes.html
+++ b/web/views/@default/clusters/cluster/nodes.html
@@ -88,12 +88,18 @@
 				</div>
 			</div>
 		</td>
-		<td>
+		<td class="routes-box" :class="{'show-link': node.dnsRouteNames.length == 0 &&  hasClusterDNS}">
 			<div v-if="node.dnsRouteNames.length > 0">
 				<div v-for="routeName in node.dnsRouteNames">
 					<tiny-basic-label>{{routeName}}</tiny-basic-label>
 				</div>
+                <div>
+                    <a href="" @click.prevent="updateNodeDNS(node.id)" class="small">[修改]</a>
+                </div>
 			</div>
+            <span v-else-if="hasClusterDNS">
+                <a href="" @click.prevent="updateNodeDNS(node.id)" class="small">[设置]</a>
+            </span>
 			<span v-else class="disabled">-</span>
 		</td>
 		<td class="center">
--- a/web/views/@default/clusters/cluster/nodes.js
+++ b/web/views/@default/clusters/cluster/nodes.js
@@ -21,4 +21,17 @@ Tea.context(function () {
 				.refresh()
 		})
 	}
+
+	this.updateNodeDNS = function (nodeId) {
+		let that = this
+		teaweb.popup("/clusters/cluster/node/updateDNSPopup?clusterId=" + this.clusterId + "&nodeId=" + nodeId, {
+			width: "46em",
+			height: "26em",
+			callback: function () {
+				teaweb.success("保存成功", function () {
+					teaweb.reload()
+				})
+			}
+		})
+	}
 })
--- a/web/views/@default/clusters/cluster/nodes.less
+++ b/web/views/@default/clusters/cluster/nodes.less
@@ -6,4 +6,29 @@ a {
 	.red {
 		border-bottom: 1px #db2828 dashed;
 	}
+}
+
+.routes-box {
+	a {
+		margin-left: 0.4em;
+		display: none;
+	}
+}
+
+.routes-box.show-link {
+	a {
+		display: inline;
+		font-size: 1em;
+	}
+}
+
+.routes-box:hover {
+	a {
+		display: inline;
+	}
+}
+
+a.small {
+	font-size: 0.8em;
+	text-align: center;
 }