From f8cc76be35d80d00fbde510f51b223abf1ff7076 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: Sun, 17 Apr 2022 17:08:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=AE=BF=E9=97=AE=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E4=B9=9F=E6=94=AF=E6=8C=81=E5=88=86=E8=A1=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/actions/default/servers/server/log/history.go  |  1 +
 .../web/actions/default/servers/server/log/today.go    |  2 ++
 .../server/http-access-log-partitions-box.js           | 10 +++++-----
 web/views/@default/servers/server/log/history.html     |  7 +++++--
 web/views/@default/servers/server/log/today.html       |  7 +++++--
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/internal/web/actions/default/servers/server/log/history.go b/internal/web/actions/default/servers/server/log/history.go
index 8b4635f3..2b56f4d8 100644
--- a/internal/web/actions/default/servers/server/log/history.go
+++ b/internal/web/actions/default/servers/server/log/history.go
@@ -53,6 +53,7 @@ func (this *HistoryAction) RunGet(params struct {
 	this.Data["pageSize"] = params.PageSize
 	this.Data["clusterId"] = params.ClusterId
 	this.Data["nodeId"] = params.NodeId
+	this.Data["partition"] = params.Partition
 
 	day := params.Day
 	ipList := []string{}
diff --git a/internal/web/actions/default/servers/server/log/today.go b/internal/web/actions/default/servers/server/log/today.go
index 4938f616..97a5698b 100644
--- a/internal/web/actions/default/servers/server/log/today.go
+++ b/internal/web/actions/default/servers/server/log/today.go
@@ -46,6 +46,8 @@ func (this *TodayAction) RunGet(params struct {
 	this.Data["hasWAF"] = params.HasWAF
 	this.Data["clusterId"] = params.ClusterId
 	this.Data["nodeId"] = params.NodeId
+	this.Data["partition"] = params.Partition
+	this.Data["day"] = timeutil.Format("Ymd")
 
 	resp, err := this.RPC().HTTPAccessLogRPC().ListHTTPAccessLogs(this.AdminContext(), &pb.ListHTTPAccessLogsRequest{
 		Partition:         params.Partition,
diff --git a/web/public/js/components/server/http-access-log-partitions-box.js b/web/public/js/components/server/http-access-log-partitions-box.js
index 77b9cebb..8c84a78d 100644
--- a/web/public/js/components/server/http-access-log-partitions-box.js
+++ b/web/public/js/components/server/http-access-log-partitions-box.js
@@ -31,10 +31,10 @@ Vue.component("http-access-log-partitions-box", {
 	methods: {
 		url: function (p) {
 			let u = window.location.toString()
-			u = u.replace(/\?partition=\d+/, "?")
-			u = u.replace(/\?requestId=\d+/, "?")
-			u = u.replace(/&partition=\d+/, "")
-			u = u.replace(/&requestId=\d+/, "")
+			u = u.replace(/\?partition=-?\d+/, "?")
+			u = u.replace(/\?requestId=-?\d+/, "?")
+			u = u.replace(/&partition=-?\d+/, "")
+			u = u.replace(/&requestId=-?\d+/, "")
 			if (u.indexOf("?") > 0) {
 				u += "&partition=" + p
 			} else {
@@ -53,7 +53,7 @@ Vue.component("http-access-log-partitions-box", {
 	template: `<div v-if="partitions.length > 1">
 	<div class="ui divider" style="margin-bottom: 0"></div>
 	<div class="ui menu text small blue" style="margin-bottom: 0; margin-top: 0">
-		<a v-for="p in partitions" :href="url(p.code)" class="item" :class="{active: selectedPartition == p.code, disabled: p.isDisabled}">分表{{p.code}}</a>
+		<a v-for="(p, index) in partitions" :href="url(p.code)" class="item" :class="{active: selectedPartition == p.code, disabled: p.isDisabled}">分表{{p.code+1}} &nbsp; &nbsp; <span class="disabled" v-if="index != partitions.length - 1">|</span></a>
 	</div>
 	<div class="ui divider" style="margin-top: 0"></div>
 </div>`
diff --git a/web/views/@default/servers/server/log/history.html b/web/views/@default/servers/server/log/history.html
index 56986e98..2fc7cd4a 100644
--- a/web/views/@default/servers/server/log/history.html
+++ b/web/views/@default/servers/server/log/history.html
@@ -37,6 +37,9 @@
         </http-access-log-search-box>
     </form>
 
+    <!-- 分区 -->
+    <http-access-log-partitions-box :v-day="day" :v-partition="partition"></http-access-log-partitions-box>
+
 	<p class="comment" v-if="accessLogs.length == 0">暂时还没有访问日志。</p>
 
 	<table class="ui table selectable" v-if="accessLogs.length > 0">
@@ -47,10 +50,10 @@
 	</table>
 
 	<div v-if="accessLogs.length > 0">
-		<a :href="path + '?serverId=' + serverId + '&requestId=' + lastRequestId + '&day=' + day + '&hasError=' + hasError + '&hasWAF=' + hasWAF + '&keyword=' + keyword + '&ip=' + ip + '&domain=' + domain + '&hour=' + hour + '&pageSize=' + pageSize" v-if="hasPrev">上一页</a>
+		<a :href="path + '?serverId=' + serverId + '&requestId=' + lastRequestId + '&day=' + day + '&hasError=' + hasError + '&hasWAF=' + hasWAF + '&keyword=' + keyword + '&ip=' + ip + '&domain=' + domain + '&hour=' + hour + '&pageSize=' + pageSize + '&partition=' + partition" v-if="hasPrev">上一页</a>
 		<span v-else class="disabled">上一页</span>
 		<span class="disabled">&nbsp; | &nbsp;</span>
-		<a :href="path + '?serverId=' + serverId + '&requestId=' + nextRequestId + '&day=' + day + '&hasError=' + hasError + '&hasWAF=' + hasWAF + '&keyword=' + keyword + '&ip=' + ip + '&domain=' + domain + '&hour=' + hour + '&pageSize=' + pageSize" v-if="hasMore">下一页</a>
+		<a :href="path + '?serverId=' + serverId + '&requestId=' + nextRequestId + '&day=' + day + '&hasError=' + hasError + '&hasWAF=' + hasWAF + '&keyword=' + keyword + '&ip=' + ip + '&domain=' + domain + '&hour=' + hour + '&pageSize=' + pageSize + '&partition=' + partition" v-if="hasMore">下一页</a>
 		<span v-else class="disabled">下一页</span>
         <page-size-selector></page-size-selector>
 	</div>
diff --git a/web/views/@default/servers/server/log/today.html b/web/views/@default/servers/server/log/today.html
index 53435250..512eecc2 100644
--- a/web/views/@default/servers/server/log/today.html
+++ b/web/views/@default/servers/server/log/today.html
@@ -25,6 +25,9 @@
         <http-access-log-search-box :v-ip="ip" :v-domain="domain" :v-keyword="keyword" :v-cluster-id="clusterId" :v-node-id="nodeId"></http-access-log-search-box>
     </form>
 
+    <!-- 分区 -->
+    <http-access-log-partitions-box :v-day="day" :v-partition="partition"></http-access-log-partitions-box>
+
 	<p class="comment" v-if="accessLogs.length == 0">今天暂时还没有访问日志。</p>
 
 	<table class="ui table selectable" v-if="accessLogs.length > 0">
@@ -35,10 +38,10 @@
 	</table>
 
 	<div v-if="accessLogs.length > 0">
-		<a :href="path + '?serverId=' + serverId + '&requestId=' + lastRequestId + '&hasError=' + hasError + '&hasWAF=' + hasWAF + '&keyword=' + keyword + '&ip=' + ip + '&domain=' + domain + '&pageSize=' + pageSize" v-if="hasPrev">上一页</a>
+		<a :href="path + '?serverId=' + serverId + '&requestId=' + lastRequestId + '&hasError=' + hasError + '&hasWAF=' + hasWAF + '&keyword=' + keyword + '&ip=' + ip + '&domain=' + domain + '&pageSize=' + pageSize + '&partition=' + partition" v-if="hasPrev">上一页</a>
 		<span v-else class="disabled">上一页</span>
 		<span class="disabled">&nbsp; | &nbsp;</span>
-		<a :href="path + '?serverId=' + serverId + '&requestId=' + nextRequestId + '&hasError=' + hasError + '&hasWAF=' + hasWAF + '&keyword=' + keyword + '&ip=' + ip + '&domain=' + domain + '&pageSize=' + pageSize" v-if="hasMore">下一页</a>
+		<a :href="path + '?serverId=' + serverId + '&requestId=' + nextRequestId + '&hasError=' + hasError + '&hasWAF=' + hasWAF + '&keyword=' + keyword + '&ip=' + ip + '&domain=' + domain + '&pageSize=' + pageSize + '&partition=' + partition" v-if="hasMore">下一页</a>
 		<span v-else class="disabled">下一页</span>
         <page-size-selector></page-size-selector>
 	</div>