From 884342d6af52e2a899e48ddc2f5170122c81bd9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= <iwind.liu@gmail.com>
Date: Thu, 18 Nov 2021 14:30:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8A=82=E7=82=B9IP=E9=98=88=E5=80=BC=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=8A=82=E7=82=B9=E5=81=A5=E5=BA=B7=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../node/node-ip-address-thresholds-box.js    | 55 +++++++++++++++----
 .../node/node-ip-address-thresholds-view.js   | 34 ++++++++----
 .../@default/clusters/ip-addrs/addr/index.js  |  2 +-
 3 files changed, 67 insertions(+), 24 deletions(-)

diff --git a/web/public/js/components/node/node-ip-address-thresholds-box.js b/web/public/js/components/node/node-ip-address-thresholds-box.js
index d7cad0b2..99e8d418 100644
--- a/web/public/js/components/node/node-ip-address-thresholds-box.js
+++ b/web/public/js/components/node/node-ip-address-thresholds-box.js
@@ -127,6 +127,21 @@ Vue.component("node-ip-address-thresholds-box", {
 			this.itemReportGroups = []
 		},
 		confirmItem: function () {
+			// 特殊阈值快速添加
+			if (["nodeHealthCheckFailed"].$contains(this.itemCode)) {
+				// 添加
+				this.addingThreshold.items.push({
+					item: this.itemCode,
+					operator: this.itemOperator,
+					value: 0,
+					duration: 0,
+					durationUnit: "minute",
+					options: {}
+				})
+				this.cancelItem()
+				return
+			}
+
 			if (this.itemDuration.length == 0) {
 				let that = this
 				teaweb.warn("请输入统计周期", function () {
@@ -335,11 +350,20 @@ Vue.component("node-ip-address-thresholds-box", {
 	<!-- 已有条件 -->
 	<div v-if="thresholds.length > 0">
 		<div class="ui label basic small" v-for="(threshold, index) in thresholds">
-			<span v-for="(item, itemIndex) in threshold.items">[{{item.duration}}{{itemDurationUnitName(item.durationUnit)}}] {{itemName(item.item)}}
-			 <!-- 连通性 -->
-			<span v-if="item.item == 'connectivity' && item.options != null && item.options.groups != null && item.options.groups.length > 0">[<span v-for="(group, groupIndex) in item.options.groups">{{group.name}} <span v-if="groupIndex != item.options.groups.length - 1">&nbsp; </span></span>]</span>
-			
-			 <span  class="grey">[{{itemOperatorName(item.operator)}}]</span> &nbsp;{{item.value}}{{itemUnitName(item.item)}} &nbsp;<span v-if="itemIndex != threshold.items.length - 1" style="font-style: italic">AND &nbsp;</span></span>
+			<span v-for="(item, itemIndex) in threshold.items">
+				<span v-if="item.item != 'nodeHealthCheckFailed'">
+					[{{item.duration}}{{itemDurationUnitName(item.durationUnit)}}]
+				</span> 
+				{{itemName(item.item)}}
+				
+				<span v-if="item.item != 'nodeHealthCheckFailed'">
+					<!-- 连通性 -->
+					<span v-if="item.item == 'connectivity' && item.options != null && item.options.groups != null && item.options.groups.length > 0">[<span v-for="(group, groupIndex) in item.options.groups">{{group.name}} <span v-if="groupIndex != item.options.groups.length - 1">&nbsp; </span></span>]</span>
+				
+					<span  class="grey">[{{itemOperatorName(item.operator)}}]</span> &nbsp;{{item.value}}{{itemUnitName(item.item)}} 
+			 	</span>
+			 	&nbsp;<span v-if="itemIndex != threshold.items.length - 1" style="font-style: italic">AND &nbsp;</span>
+			</span>
 			-&gt;
 			<span v-for="(action, actionIndex) in threshold.actions">{{actionName(action.action)}}
 			<span v-if="action.action == 'switch'">到{{action.options.ips.join(", ")}}</span>
@@ -365,10 +389,17 @@ Vue.component("node-ip-address-thresholds-box", {
 					<!-- 已经添加的项目 -->
 					<div>
 						<div v-for="(item, index) in addingThreshold.items" class="ui label basic small" style="margin-bottom: 0.5em;">
-							[{{item.duration}}{{itemDurationUnitName(item.durationUnit)}}] {{itemName(item.item)}}
-							<!-- 连通性 -->
-							<span v-if="item.item == 'connectivity' && item.options != null && item.options.groups != null && item.options.groups.length > 0">[<span v-for="(group, groupIndex) in item.options.groups">{{group.name}} <span v-if="groupIndex != item.options.groups.length - 1">&nbsp; </span></span>]</span>
-							 <span class="grey">[{{itemOperatorName(item.operator)}}]</span> {{item.value}}{{itemUnitName(item.item)}} &nbsp;
+							<span v-if="item.item != 'nodeHealthCheckFailed'">
+								[{{item.duration}}{{itemDurationUnitName(item.durationUnit)}}]
+							</span> 
+							{{itemName(item.item)}}
+							
+							<span v-if="item.item != 'nodeHealthCheckFailed'">
+								<!-- 连通性 -->
+								<span v-if="item.item == 'connectivity' && item.options != null && item.options.groups != null && item.options.groups.length > 0">[<span v-for="(group, groupIndex) in item.options.groups">{{group.name}} <span v-if="groupIndex != item.options.groups.length - 1">&nbsp; </span></span>]</span>
+								 <span class="grey">[{{itemOperatorName(item.operator)}}]</span> {{item.value}}{{itemUnitName(item.item)}}
+							 </span> 
+							 &nbsp;
 							<a href="" title="删除" @click.prevent="removeItem(index)"><i class="icon remove small"></i></a>
 						</div>
 					</div>
@@ -385,7 +416,7 @@ Vue.component("node-ip-address-thresholds-box", {
 									<p class="comment" v-for="item in allItems" v-if="item.code == itemCode">{{item.description}}</p>
 								</td>
 							</tr>
-							<tr>
+							<tr v-show="itemCode != 'nodeHealthCheckFailed'">
 								<td>统计周期</td>
 								<td>
 									<div class="ui input right labeled">
@@ -394,7 +425,7 @@ Vue.component("node-ip-address-thresholds-box", {
 									</div>
 								</td>
 							</tr>
-							<tr>
+							<tr v-show="itemCode != 'nodeHealthCheckFailed'">
 								<td>操作符</td>
 								<td>
 									<select class="ui dropdown auto-width" v-model="itemOperator">
@@ -402,7 +433,7 @@ Vue.component("node-ip-address-thresholds-box", {
 									</select>
 								</td>
 							</tr>
-							<tr>
+							<tr v-show="itemCode != 'nodeHealthCheckFailed'">
 								<td>对比值</td>
 								<td>
 									<div class="ui input right labeled">
diff --git a/web/public/js/components/node/node-ip-address-thresholds-view.js b/web/public/js/components/node/node-ip-address-thresholds-view.js
index 7fb93641..5844a1af 100644
--- a/web/public/js/components/node/node-ip-address-thresholds-view.js
+++ b/web/public/js/components/node/node-ip-address-thresholds-view.js
@@ -98,17 +98,29 @@ Vue.component("node-ip-address-thresholds-view", {
 	template: `<div>
 	<!-- 已有条件 -->
 	<div v-if="thresholds.length > 0">
-		<div class="ui label basic small" v-for="(threshold, index) in thresholds" style="margin-bottom: 0.5em">
-			<span v-for="(item, itemIndex) in threshold.items">[{{item.duration}}{{itemDurationUnitName(item.durationUnit)}}] {{itemName(item.item)}}
-			  <!-- 连通性 -->
-			<span v-if="item.item == 'connectivity' && item.options != null && item.options.groups != null && item.options.groups.length > 0">[<span v-for="(group, groupIndex) in item.options.groups">{{group.name}} <span v-if="groupIndex != item.options.groups.length - 1">&nbsp; </span></span>]</span>
-			
-			 <span class="grey">[{{itemOperatorName(item.operator)}}]</span> {{item.value}}{{itemUnitName(item.item)}} &nbsp;<span v-if="itemIndex != threshold.items.length - 1" style="font-style: italic">AND &nbsp;</span></span>
-			-&gt;
-			<span v-for="(action, actionIndex) in threshold.actions">{{actionName(action.action)}}
-			<span v-if="action.action == 'switch'">到{{action.options.ips.join(", ")}}</span>
-			<span v-if="action.action == 'webHook'" class="small grey">({{action.options.url}})</span>
-			 &nbsp;<span v-if="actionIndex != threshold.actions.length - 1" style="font-style: italic">AND &nbsp;</span></span>
+		<div class="ui label basic small" v-for="(threshold, index) in thresholds" style="margin-bottom: 0.8em">
+			<span v-for="(item, itemIndex) in threshold.items">
+				<span>
+					<span v-if="item.item != 'nodeHealthCheckFailed'">
+						[{{item.duration}}{{itemDurationUnitName(item.durationUnit)}}]
+					</span>	 
+					{{itemName(item.item)}}
+					
+					<span v-if="item.item != 'nodeHealthCheckFailed'">
+						<!-- 连通性 -->
+						<span v-if="item.item == 'connectivity' && item.options != null && item.options.groups != null && item.options.groups.length > 0">[<span v-for="(group, groupIndex) in item.options.groups">{{group.name}} <span v-if="groupIndex != item.options.groups.length - 1">&nbsp; </span></span>]</span>
+						
+						 <span class="grey">[{{itemOperatorName(item.operator)}}]</span> {{item.value}}{{itemUnitName(item.item)}} &nbsp;
+					 </span>
+				 </span>
+				 <span v-if="itemIndex != threshold.items.length - 1" style="font-style: italic">AND &nbsp;</span></span>
+				-&gt;
+				<span v-for="(action, actionIndex) in threshold.actions">{{actionName(action.action)}}
+				<span v-if="action.action == 'switch'">到{{action.options.ips.join(", ")}}</span>
+				<span v-if="action.action == 'webHook'" class="small grey">({{action.options.url}})</span>
+				 &nbsp;					 
+				 <span v-if="actionIndex != threshold.actions.length - 1" style="font-style: italic">AND &nbsp;</span>
+			 </span>
 		</div>
 	</div>
 </div>`
diff --git a/web/views/@default/clusters/ip-addrs/addr/index.js b/web/views/@default/clusters/ip-addrs/addr/index.js
index f334fef4..c84990af 100644
--- a/web/views/@default/clusters/ip-addrs/addr/index.js
+++ b/web/views/@default/clusters/ip-addrs/addr/index.js
@@ -5,7 +5,7 @@ Tea.context(function () {
 
 	this.updateUp = function (addrId, isUp) {
 		let status = isUp ? "在线" : "离线"
-		teaweb.confirm("确定要手动将节点设置为" + status + "吗？", function () {
+		teaweb.confirm("确定要手动将此IP设置为" + status + "吗？", function () {
 			this.$post(".up")
 				.params({
 					addrId: addrId,