From 428d8ab1b1a73a3cce69a477a999563ec0207830 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: Mon, 22 Aug 2022 11:16:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=98=E5=8F=A0=E8=AE=BF=E9=97=AE=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/public/js/components.js                         |  9 +++++++--
 web/public/js/components.src.js                     | 13 +++++++++++--
 .../components/server/http-access-log-config-box.js | 13 +++++++++++--
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/web/public/js/components.js b/web/public/js/components.js
index e2f69ddd..9737a6c8 100644
--- a/web/public/js/components.js
+++ b/web/public/js/components.js
@@ -2860,7 +2860,7 @@ Vue.component("traffic-map-box",{props:["v-stats","v-is-attack"],mounted:functio
 		状态码：{{options.statusCode}} / 提示内容：<span v-if="options.body != null && options.body.length > 0">[{{options.body.length}}字符]</span><span v-else class="disabled">[无]</span>  / 超时时间：{{options.timeout}}秒
 	</div>
 </div>	
-`}),Vue.component("http-access-log-config-box",{props:["v-access-log-config","v-fields","v-default-field-codes","v-is-location","v-is-group"],data:function(){let t=this,i=(setTimeout(function(){t.changeFields()},100),{isPrior:!1,isOn:!1,fields:[1,2,6,7],status1:!0,status2:!0,status3:!0,status4:!0,status5:!0,firewallOnly:!1,enableClientClosed:!1});return null!=this.vAccessLogConfig&&(i=this.vAccessLogConfig),this.vFields.forEach(function(e){null==t.vAccessLogConfig?e.isChecked=t.vDefaultFieldCodes.$contains(e.code):e.isChecked=i.fields.$contains(e.code)}),{accessLog:i,hasRequestBodyField:this.vFields.$contains(8)}},methods:{changeFields:function(){this.accessLog.fields=this.vFields.filter(function(e){return e.isChecked}).map(function(e){return e.code}),this.hasRequestBodyField=this.accessLog.fields.$contains(8)}},template:`<div>
+`}),Vue.component("http-access-log-config-box",{props:["v-access-log-config","v-fields","v-default-field-codes","v-is-location","v-is-group"],data:function(){let t=this,i=(setTimeout(function(){t.changeFields()},100),{isPrior:!1,isOn:!1,fields:[1,2,6,7],status1:!0,status2:!0,status3:!0,status4:!0,status5:!0,firewallOnly:!1,enableClientClosed:!1});return null!=this.vAccessLogConfig&&(i=this.vAccessLogConfig),this.vFields.forEach(function(e){null==t.vAccessLogConfig?e.isChecked=t.vDefaultFieldCodes.$contains(e.code):e.isChecked=i.fields.$contains(e.code)}),{accessLog:i,hasRequestBodyField:this.vFields.$contains(8),showAdvancedOptions:!1}},methods:{changeFields:function(){this.accessLog.fields=this.vFields.filter(function(e){return e.isChecked}).map(function(e){return e.code}),this.hasRequestBodyField=this.accessLog.fields.$contains(8)},changeAdvanced:function(e){this.showAdvancedOptions=e}},template:`<div>
 	<input type="hidden" name="accessLogJSON" :value="JSON.stringify(accessLog)"/>
 	<table class="ui table definition selectable" :class="{'opacity-mask': this.accessLog.firewallOnly}">
 		<prior-checkbox :v-config="accessLog" v-if="vIsLocation || vIsGroup"></prior-checkbox>
@@ -2875,7 +2875,12 @@ Vue.component("traffic-map-box",{props:["v-stats","v-is-attack"],mounted:functio
 				</td>
 			</tr>
 		</tbody>
-		<tbody  v-show="((!vIsLocation && !vIsGroup) || accessLog.isPrior) && accessLog.isOn">
+		<tbody v-show="((!vIsLocation && !vIsGroup) || accessLog.isPrior) && accessLog.isOn">
+			<tr>
+				<td colspan="2"><more-options-indicator @change="changeAdvanced"></more-options-indicator></td>
+			</tr>
+		</tbody>
+		<tbody v-show="((!vIsLocation && !vIsGroup) || accessLog.isPrior) && accessLog.isOn && showAdvancedOptions">
 			<tr>
 				<td>基础信息</td>
 				<td><p class="comment" style="padding-top: 0">默认记录客户端IP、请求URL等基础信息。</p></td>
diff --git a/web/public/js/components.src.js b/web/public/js/components.src.js
index 25c88654..fd3c11c9 100755
--- a/web/public/js/components.src.js
+++ b/web/public/js/components.src.js
@@ -8412,7 +8412,8 @@ Vue.component("http-access-log-config-box", {
 
 		return {
 			accessLog: accessLog,
-			hasRequestBodyField: this.vFields.$contains(8)
+			hasRequestBodyField: this.vFields.$contains(8),
+			showAdvancedOptions: false
 		}
 	},
 	methods: {
@@ -8423,6 +8424,9 @@ Vue.component("http-access-log-config-box", {
 				return v.code
 			})
 			this.hasRequestBodyField = this.accessLog.fields.$contains(8)
+		},
+		changeAdvanced: function (v) {
+			this.showAdvancedOptions = v
 		}
 	},
 	template: `<div>
@@ -8440,7 +8444,12 @@ Vue.component("http-access-log-config-box", {
 				</td>
 			</tr>
 		</tbody>
-		<tbody  v-show="((!vIsLocation && !vIsGroup) || accessLog.isPrior) && accessLog.isOn">
+		<tbody v-show="((!vIsLocation && !vIsGroup) || accessLog.isPrior) && accessLog.isOn">
+			<tr>
+				<td colspan="2"><more-options-indicator @change="changeAdvanced"></more-options-indicator></td>
+			</tr>
+		</tbody>
+		<tbody v-show="((!vIsLocation && !vIsGroup) || accessLog.isPrior) && accessLog.isOn && showAdvancedOptions">
 			<tr>
 				<td>基础信息</td>
 				<td><p class="comment" style="padding-top: 0">默认记录客户端IP、请求URL等基础信息。</p></td>
diff --git a/web/public/js/components/server/http-access-log-config-box.js b/web/public/js/components/server/http-access-log-config-box.js
index d0fce2e4..7d374478 100644
--- a/web/public/js/components/server/http-access-log-config-box.js
+++ b/web/public/js/components/server/http-access-log-config-box.js
@@ -35,7 +35,8 @@ Vue.component("http-access-log-config-box", {
 
 		return {
 			accessLog: accessLog,
-			hasRequestBodyField: this.vFields.$contains(8)
+			hasRequestBodyField: this.vFields.$contains(8),
+			showAdvancedOptions: false
 		}
 	},
 	methods: {
@@ -46,6 +47,9 @@ Vue.component("http-access-log-config-box", {
 				return v.code
 			})
 			this.hasRequestBodyField = this.accessLog.fields.$contains(8)
+		},
+		changeAdvanced: function (v) {
+			this.showAdvancedOptions = v
 		}
 	},
 	template: `<div>
@@ -63,7 +67,12 @@ Vue.component("http-access-log-config-box", {
 				</td>
 			</tr>
 		</tbody>
-		<tbody  v-show="((!vIsLocation && !vIsGroup) || accessLog.isPrior) && accessLog.isOn">
+		<tbody v-show="((!vIsLocation && !vIsGroup) || accessLog.isPrior) && accessLog.isOn">
+			<tr>
+				<td colspan="2"><more-options-indicator @change="changeAdvanced"></more-options-indicator></td>
+			</tr>
+		</tbody>
+		<tbody v-show="((!vIsLocation && !vIsGroup) || accessLog.isPrior) && accessLog.isOn && showAdvancedOptions">
 			<tr>
 				<td>基础信息</td>
 				<td><p class="comment" style="padding-top: 0">默认记录客户端IP、请求URL等基础信息。</p></td>