From 3a4dc4ab3cf6623f3dbe36d69ad921f05c9e186e Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Tue, 5 Apr 2022 15:58:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E8=AE=BF=E9=97=AE=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84Cookie=E8=BF=9B=E8=A1=8C=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../servers/server/log/viewPopup.html         | 23 ++++++++-------
 .../@default/servers/server/log/viewPopup.js  | 29 +++++++++++++++++++
 2 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/web/views/@default/servers/server/log/viewPopup.html b/web/views/@default/servers/server/log/viewPopup.html
index d6ac4626..944f332b 100644
--- a/web/views/@default/servers/server/log/viewPopup.html
+++ b/web/views/@default/servers/server/log/viewPopup.html
@@ -72,13 +72,13 @@
 </div>
 
 <div v-if="tab == 'response'">
-    <table class="ui table selectable small">
+    <table class="ui table definition selectable small">
         <tr>
             <td class="title">Status</td>
             <td>{{accessLog.status}} {{accessLog.statusMessage}}</td>
         </tr>
     </table>
-	<table class="ui table selectable small">
+	<table class="ui table definition selectable small" v-if="responseHeaders.length > 0">
         <tbody v-for="header in responseHeaders">
             <tr v-for="value in header.values">
                 <td class="title">
@@ -92,7 +92,7 @@
 </div>
 
 <div v-if="tab == 'request'">
-	<table class="ui table selectable small">
+	<table class="ui table definition selectable small">
         <tbody v-for="header in requestHeaders">
             <tr v-for="value in header.values">
                 <td class="title">
@@ -113,22 +113,25 @@
 </div>
 
 <div v-if="tab == 'cookie'">
-	<p class="comment" v-if="accessLog.cookie == null">暂时没有Cookie数据。</p>
+	<p class="comment" v-if="cookies.length == 0">暂时没有Cookie数据。</p>
 	<div v-else>
-		<table class="ui table selectable small">
-			<tr v-for="(v, k) in accessLog.cookie">
-				<td class="title">{{k}}</td>
-				<td>{{v}}</td>
+		<table class="ui table definition selectable small">
+			<tr v-for="cookie in cookies">
+				<td class="title">{{cookie.name}}</td>
+				<td>{{cookie.value}}</td>
 			</tr>
 		</table>
 	</div>
 </div>
 
 <div v-if="tab == 'client'">
-	<table class="ui table selectable small">
+	<table class="ui table definition selectable small">
 		<tr>
 			<td class="title">综合信息<em>(UserAgent)</em></td>
-			<td>{{accessLog.userAgent}}</td>
+			<td>
+                <span v-if="accessLog.userAgent != null && accessLog.userAgent.length > 0">{{accessLog.userAgent}}</span>
+                <span class="disabled" v-else>[没有设置]</span>
+            </td>
 		</tr>
 		<tr>
 			<td>IP</td>
diff --git a/web/views/@default/servers/server/log/viewPopup.js b/web/views/@default/servers/server/log/viewPopup.js
index 904b571e..59937653 100644
--- a/web/views/@default/servers/server/log/viewPopup.js
+++ b/web/views/@default/servers/server/log/viewPopup.js
@@ -5,6 +5,7 @@ Tea.context(function () {
 		this.tab = tab
 	}
 
+	// 请求Header
 	this.requestHeaders = []
 	if (this.accessLog.header != null) {
 		for (let k in this.accessLog.header) {
@@ -23,6 +24,7 @@ Tea.context(function () {
 		return (v1.name < v2.name) ? -1 : 1
 	})
 
+	// 响应Header
 	this.responseHeaders = []
 
 	if (this.accessLog.sentHeader != null) {
@@ -41,4 +43,31 @@ Tea.context(function () {
 	this.responseHeaders.sort(function (v1, v2) {
 		return (v1.name < v2.name) ? -1 : 1
 	})
+
+	// Cookie
+	this.cookies = []
+	if (this.accessLog.cookie != null) {
+		for (let k in this.accessLog.cookie) {
+			let v = this.accessLog.cookie[k]
+			if (typeof (v) != "string") {
+				continue
+			}
+			this.cookies.push({
+				name: k,
+				value: v
+			})
+		}
+	}
+	this.cookies.sort(function (v1, v2) {
+		if (v1.name.startsWith("_")) {
+			if (v2.name.startsWith("_")) {
+				return (v1.name < v2.name) ? -1 : 1
+			}
+			return -1
+		}
+		if (v2.name.startsWith("_")) {
+			return 1
+		}
+		return (v1.name.toUpperCase() < v2.name.toUpperCase()) ? -1 : 1
+	})
 })
\ No newline at end of file