From ed302370e9f4ba64ac0add905a41fd331db36e6c 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: Wed, 3 Feb 2021 11:18:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=B3=BB=E7=BB=9F=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/public/js/components/messages/message-row.js | 14 +++++++-------
 web/views/@default/@layout.html                  |  4 ++--
 web/views/@default/@layout.js                    |  7 +++++++
 web/views/@default/messages/index.html           |  2 +-
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/web/public/js/components/messages/message-row.js b/web/public/js/components/messages/message-row.js
index 48ae2b1f..16670b62 100644
--- a/web/public/js/components/messages/message-row.js
+++ b/web/public/js/components/messages/message-row.js
@@ -35,11 +35,11 @@ Vue.component("message-row", {
 			<strong>{{message.datetime}}</strong>
 			<span v-if="message.cluster != null && message.cluster.id != null">
 				<span> | </span>
-				<a :href="'/clusters/cluster?clusterId=' + message.cluster.id">集群：{{message.cluster.name}}</a>
+				<a :href="'/clusters/cluster?clusterId=' + message.cluster.id" target="_top">集群：{{message.cluster.name}}</a>
 			</span>
 			<span v-if="message.node != null && message.node.id != null">
 				<span> | </span>
-				<a :href="'/clusters/cluster/node?clusterId=' + message.cluster.id + '&nodeId=' + message.node.id">节点：{{message.node.name}}</a>
+				<a :href="'/clusters/cluster/node?clusterId=' + message.cluster.id + '&nodeId=' + message.node.id" target="_top">节点：{{message.node.name}}</a>
 			</span>
 			<a href=""  style="position: absolute; right: 1em" @click.prevent="readMessage(message.id)" title="标为已读"><i class="icon check"></i></a>
 		</td>
@@ -50,25 +50,25 @@ Vue.component("message-row", {
 			
 			<!-- 健康检查 -->
 			<div v-if="message.type == 'HealthCheckFailed'" 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 small basic" style="margin-bottom: 0.5em">{{param.node.name}}: {{param.error}}</a>
+				<a :href="'/clusters/cluster/node?clusterId=' + message.cluster.id + '&nodeId=' + param.node.id" v-for="param in params" class="ui label small basic" style="margin-bottom: 0.5em" target="_top">{{param.node.name}}: {{param.error}}</a>
 			</div>
 			
 			<!-- 集群DNS设置 -->
 			<div v-if="message.type == 'ClusterDNSSyncFailed'" style="margin-top: 0.8em">
-				<a :href="'/dns/clusters/cluster?clusterId=' + message.cluster.id">查看问题 &raquo;</a>
+				<a :href="'/dns/clusters/cluster?clusterId=' + message.cluster.id" target="_top">查看问题 &raquo;</a>
 			</div>
 			
 			<!-- 证书即将过期 -->
 			<div v-if="message.type == 'SSLCertExpiring'" style="margin-top: 0.8em">
-				<a href="" @click.prevent="viewCert(params.certId)">查看证书</a> &nbsp;|&nbsp; <a :href="'/servers/certs/acme'" v-if="params != null && params.acmeTaskId > 0">查看任务&raquo;</a>
+				<a href="" @click.prevent="viewCert(params.certId)" target="_top">查看证书</a> &nbsp;|&nbsp; <a :href="'/servers/certs/acme'" v-if="params != null && params.acmeTaskId > 0" target="_top">查看任务&raquo;</a>
 			</div>
 			
 			<!-- 证书续期成功 -->
 			<div v-if="message.type == 'SSLCertACMETaskSuccess'" style="margin-top: 0.8em">
-				<a href="" @click.prevent="viewCert(params.certId)">查看证书</a> &nbsp;|&nbsp; <a :href="'/servers/certs/acme'" v-if="params != null && params.acmeTaskId > 0">查看任务&raquo;</a>
+				<a href="" @click.prevent="viewCert(params.certId)" target="_top">查看证书</a> &nbsp;|&nbsp; <a :href="'/servers/certs/acme'" v-if="params != null && params.acmeTaskId > 0" target="_top">查看任务&raquo;</a>
 			</div>
 			<div v-if="message.type == 'SSLCertACMETaskFailed'" style="margin-top: 0.8em">
-				<a href="" @click.prevent="viewCert(params.certId)">查看证书</a> &nbsp;|&nbsp; <a :href="'/servers/certs/acme'" v-if="params != null && params.acmeTaskId > 0">查看任务&raquo;</a>
+				<a href="" @click.prevent="viewCert(params.certId)" target="_top">查看证书</a> &nbsp;|&nbsp; <a :href="'/servers/certs/acme'" v-if="params != null && params.acmeTaskId > 0" target="_top">查看任务&raquo;</a>
 			</div>
 		</td>
 	</tr>
diff --git a/web/views/@default/@layout.html b/web/views/@default/@layout.html
index 909e6bfd..bd056647 100644
--- a/web/views/@default/@layout.html
+++ b/web/views/@default/@layout.html
@@ -42,8 +42,8 @@
             </a>
 
             <!-- 消息 -->
-			<a href="/messages" class="item" :class="{active:teaMenu == 'message'}">
-                <span v-if="globalMessageBadge > 0" class="blink"><i class="icon bell"></i>消息({{globalMessageBadge}}) </span>
+			<a href="" class="item" :class="{active:teaMenu == 'message'}" @click.prevent="showMessages()">
+                <span v-if="globalMessageBadge > 0" class="blink hover-span"><i class="icon bell"></i><span>消息({{globalMessageBadge}}) </span></span>
                 <span v-if="globalMessageBadge == 0" class="hover-span"><i class="icon bell disabled"></i><span class="disabled">消息(0)</span></span>
             </a>
 
diff --git a/web/views/@default/@layout.js b/web/views/@default/@layout.js
index 89063fd5..21042543 100644
--- a/web/views/@default/@layout.js
+++ b/web/views/@default/@layout.js
@@ -59,6 +59,13 @@ Tea.context(function () {
             })
     }
 
+    this.showMessages = function () {
+        teaweb.popup("/messages", {
+            height: "24em",
+            width: "50em"
+        })
+    }
+
     /**
      * 底部伸展框
      */
diff --git a/web/views/@default/messages/index.html b/web/views/@default/messages/index.html
index 00aefd27..d89a1800 100644
--- a/web/views/@default/messages/index.html
+++ b/web/views/@default/messages/index.html
@@ -1,4 +1,4 @@
-{$layout}
+{$layout "layout_popup"}
 
 <first-menu v-if="messages.length > 0">
 	<a href="" class="item" @click.prevent="updatePageRead()">[当前页已读]</a>