From 7a5bcf775723d7d4561af7a9c19c366518105ccc 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: Tue, 20 Oct 2020 20:29:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/public/js/components/messages/message-row.js |  2 +-
 web/public/js/utils.js                           | 13 +++++++++----
 web/views/@default/@layout.html                  |  2 +-
 web/views/@default/@layout.js                    |  2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/web/public/js/components/messages/message-row.js b/web/public/js/components/messages/message-row.js
index 344434d3..c783c037 100644
--- a/web/public/js/components/messages/message-row.js
+++ b/web/public/js/components/messages/message-row.js
@@ -28,7 +28,7 @@ Vue.component("message-row", {
 			{{message.body}}
 			
 			<div v-if="message.type == 'HealthCheckFail'" style="margin-top: 0.8em">
-				<a :href="'/clusters/cluster/node?clusterId=' + message.cluster.id + '&nodeId=' + param.node.id" v-for="param in params" class="ui label tiny">{{param.node.name}}</a>
+				<a :href="'/clusters/cluster/node?clusterId=' + message.cluster.id + '&nodeId=' + param.node.id" v-for="param in params" class="ui label tiny" style="margin-bottom: 0.5em">{{param.node.name}}: {{param.error}}</a>
 			</div>
 		</td>
 	</tr>
diff --git a/web/public/js/utils.js b/web/public/js/utils.js
index dec98012..14b1b6be 100644
--- a/web/public/js/utils.js
+++ b/web/public/js/utils.js
@@ -210,12 +210,11 @@ window.teaweb = {
 		});
 	},
 	confirm: function (message, callback) {
-		var width = "20em";
+		let width = "20em";
 		if (message.length > 30) {
 			width = "30em";
 		}
-		Swal.fire({
-			text: message,
+		let config = {
 			confirmButtonText: "确定",
 			cancelButtonText: "取消",
 			showCancelButton: true,
@@ -233,7 +232,13 @@ window.teaweb = {
 					callback.call(Tea.Vue);
 				}
 			}
-		});
+		}
+		if (message.startsWith("html:")) {
+			config.html = message.substring(5)
+		} else {
+			config.text = message
+		}
+		Swal.fire(config);
 	},
 	reload: function () {
 		window.location.reload()
diff --git a/web/views/@default/@layout.html b/web/views/@default/@layout.html
index 6604dc2c..b8e452c0 100644
--- a/web/views/@default/@layout.html
+++ b/web/views/@default/@layout.html
@@ -27,7 +27,7 @@
 		</a>
 
         <div class="right menu">
-			<a href="" class="item" v-if="globalChangedClusters.length > 0" @click.prevent="syncClustersConfigs()"><i class="icon refresh"></i>{{globalChangedClusters.length}}个集群服务已变更，点此同步</a>
+			<a href="" class="item" v-if="globalChangedClusters.length > 0" @click.prevent="syncClustersConfigs()"><span class="blink"><i class="icon refresh"></i></span>{{globalChangedClusters.length}}个集群服务变更</a>
 			<a href="/messages" class="item" :class="{active:teaMenu == 'message'}"><span :class="{'blink':globalMessageBadge > 0}"><i class="icon bell"></i>消息({{globalMessageBadge}}) </span></a>
 			<a href="/settings/profile" class="item"  :class="{active: teaMenu == 'settings'}">
 				<i class="icon user" v-if="teaUserAvatar.length == 0"></i>
diff --git a/web/views/@default/@layout.js b/web/views/@default/@layout.js
index 1aafc82e..7cde84d9 100644
--- a/web/views/@default/@layout.js
+++ b/web/views/@default/@layout.js
@@ -88,7 +88,7 @@ Tea.context(function () {
 	 * 同步集群配置
 	 */
 	this.syncClustersConfigs = function () {
-		teaweb.confirm("确定要同步集群服务配置吗？", function () {
+		teaweb.confirm("html:有若干个集群配置已变更！<br/>确定要同步配置到边缘节点吗？", function () {
 			this.$post("/clusters/sync")
 				.success(function () {
 					this.globalChangedClusters = [];