From cde964fe82f0347a21081245e602b7ca97e7248c Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Sat, 18 Sep 2021 11:02:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/components/messages/message-row.js     | 80 +++++++++++--------
 web/views/@default/messages/index.html        |  2 +-
 2 files changed, 46 insertions(+), 36 deletions(-)

diff --git a/web/public/js/components/messages/message-row.js b/web/public/js/components/messages/message-row.js
index b0919b07..20ad437b 100644
--- a/web/public/js/components/messages/message-row.js
+++ b/web/public/js/components/messages/message-row.js
@@ -1,41 +1,51 @@
 Vue.component("message-row", {
-    props: ["v-message"],
-    data: function () {
-        let paramsJSON = this.vMessage.params
-        let params = null
-        if (paramsJSON != null && paramsJSON.length > 0) {
-            params = JSON.parse(paramsJSON)
-        }
+	props: ["v-message", "v-can-close"],
+	data: function () {
+		let paramsJSON = this.vMessage.params
+		let params = null
+		if (paramsJSON != null && paramsJSON.length > 0) {
+			params = JSON.parse(paramsJSON)
+		}
 
-        return {
-            message: this.vMessage,
-            params: params
-        }
-    },
-    methods: {
-        viewCert: function (certId) {
-            teaweb.popup("/servers/certs/certPopup?certId=" + certId, {
-                height: "28em",
-                width: "48em"
-            })
-        },
-        readMessage: function (messageId) {
-            Tea.action("/messages/readPage")
-                .params({"messageIds": [messageId]})
-                .post()
-                .success(function () {
-                    // 刷新父级页面Badge
-                    if (window.parent.Tea != null && window.parent.Tea.Vue != null) {
-                        window.parent.Tea.Vue.checkMessagesOnce()
-                    }
+		return {
+			message: this.vMessage,
+			params: params,
+			isClosing: false
+		}
+	},
+	methods: {
+		viewCert: function (certId) {
+			teaweb.popup("/servers/certs/certPopup?certId=" + certId, {
+				height: "28em",
+				width: "48em"
+			})
+		},
+		readMessage: function (messageId) {
+			let that = this
 
-                    // 刷新当前页面
-                    teaweb.reload()
-                })
-        }
-    },
-    template: `<div>
-<table class="ui table selectable">
+			Tea.action("/messages/readPage")
+				.params({"messageIds": [messageId]})
+				.post()
+				.success(function () {
+					// 刷新父级页面Badge
+					if (window.parent.Tea != null && window.parent.Tea.Vue != null) {
+						window.parent.Tea.Vue.checkMessagesOnce()
+					}
+
+					// 刷新当前页面
+					if (that.vCanClose && typeof (NotifyPopup) != "undefined") {
+						that.isClosing = true
+						setTimeout(function () {
+							NotifyPopup({})
+						}, 1000)
+					} else {
+						teaweb.reload()
+					}
+				})
+		}
+	},
+	template: `<div>
+<table class="ui table selectable" v-if="!isClosing">
 	<tr :class="{error: message.level == 'error', positive: message.level == 'success', warning: message.level == 'warning'}">
 		<td style="position: relative">
 			<strong>{{message.datetime}}</strong>
diff --git a/web/views/@default/messages/index.html b/web/views/@default/messages/index.html
index d89a1800..352e06b4 100644
--- a/web/views/@default/messages/index.html
+++ b/web/views/@default/messages/index.html
@@ -8,6 +8,6 @@
 
 <p class="comment" v-if="messages.length == 0">暂时还没有消息。</p>
 
-<message-row v-for="message in messages" :v-message="message" :key="message.id"></message-row>
+<message-row v-for="message in messages" :v-message="message" :key="message.id" :v-can-close="messages.length == 1"></message-row>
 
 <div class="page" v-html="page"></div>
\ No newline at end of file