diff --git a/internal/web/actions/default/servers/logs/index.go b/internal/web/actions/default/servers/logs/index.go
index a93f93ef..2bec0cb3 100644
--- a/internal/web/actions/default/servers/logs/index.go
+++ b/internal/web/actions/default/servers/logs/index.go
@@ -29,6 +29,8 @@ func (this *IndexAction) RunGet(params struct {
RequestId string
ServerId int64
+
+ PageSize int64
}) {
if len(params.Day) == 0 {
params.Day = timeutil.Format("Y-m-d")
@@ -43,13 +45,17 @@ func (this *IndexAction) RunGet(params struct {
this.Data["accessLogs"] = []interface{}{}
this.Data["hasError"] = params.HasError
this.Data["hasWAF"] = params.HasWAF
+ this.Data["pageSize"] = params.PageSize
day := params.Day
ipList := []string{}
if len(day) > 0 && regexp.MustCompile(`\d{4}-\d{2}-\d{2}`).MatchString(day) {
day = strings.ReplaceAll(day, "-", "")
- size := int64(20)
+ size := params.PageSize
+ if size < 1 {
+ size = 20
+ }
this.Data["hasError"] = params.HasError
diff --git a/internal/web/actions/default/servers/server/log/history.go b/internal/web/actions/default/servers/server/log/history.go
index 74f620cb..5d615f59 100644
--- a/internal/web/actions/default/servers/server/log/history.go
+++ b/internal/web/actions/default/servers/server/log/history.go
@@ -28,6 +28,8 @@ func (this *HistoryAction) RunGet(params struct {
RequestId string
HasError int
+
+ PageSize int
}) {
if len(params.Day) == 0 {
params.Day = timeutil.Format("Y-m-d")
@@ -41,13 +43,17 @@ func (this *HistoryAction) RunGet(params struct {
this.Data["accessLogs"] = []interface{}{}
this.Data["hasError"] = params.HasError
this.Data["hasWAF"] = params.HasWAF
+ this.Data["pageSize"] = params.PageSize
day := params.Day
ipList := []string{}
if len(day) > 0 && regexp.MustCompile(`\d{4}-\d{2}-\d{2}`).MatchString(day) {
day = strings.ReplaceAll(day, "-", "")
- size := int64(20)
+ size := int64(params.PageSize)
+ if size < 1 {
+ size = 20
+ }
this.Data["hasError"] = params.HasError
diff --git a/internal/web/actions/default/servers/server/log/today.go b/internal/web/actions/default/servers/server/log/today.go
index 72892bb1..da170102 100644
--- a/internal/web/actions/default/servers/server/log/today.go
+++ b/internal/web/actions/default/servers/server/log/today.go
@@ -24,8 +24,15 @@ func (this *TodayAction) RunGet(params struct {
Keyword string
Ip string
Domain string
+
+ PageSize int
}) {
- size := int64(20)
+ this.Data["pageSize"] = params.PageSize
+
+ size := int64(params.PageSize)
+ if size < 1 {
+ size = 20
+ }
this.Data["path"] = this.Request.URL.Path
this.Data["hasError"] = params.HasError
diff --git a/web/public/js/components/common/page-size-selector.js b/web/public/js/components/common/page-size-selector.js
new file mode 100644
index 00000000..621aaf60
--- /dev/null
+++ b/web/public/js/components/common/page-size-selector.js
@@ -0,0 +1,33 @@
+Vue.component("page-size-selector", {
+ data: function () {
+ let query = window.location.search
+ let pageSize = 10
+ if (query.length > 0) {
+ query = query.substr(1)
+ let params = query.split("&")
+ params.forEach(function (v) {
+ let pieces = v.split("=")
+ if (pieces.length == 2 && pieces[0] == "pageSize") {
+ let pageSizeString = pieces[1]
+ if (pageSizeString.match(/^\d+$/)) {
+ pageSize = parseInt(pageSizeString, 10)
+ if (isNaN(pageSize) || pageSize < 1) {
+ pageSize = 10
+ }
+ }
+ }
+ })
+ }
+ return {
+ pageSize: pageSize
+ }
+ },
+ watch: {
+ pageSize: function () {
+ window.ChangePageSize(this.pageSize)
+ }
+ },
+ template: ``
+})
\ No newline at end of file
diff --git a/web/public/js/components/server/http-expires-time-config-box.js b/web/public/js/components/server/http-expires-time-config-box.js
index 183ba3e7..b8404b65 100644
--- a/web/public/js/components/server/http-expires-time-config-box.js
+++ b/web/public/js/components/server/http-expires-time-config-box.js
@@ -54,7 +54,7 @@ Vue.component("http-expires-time-config-box", {
| 自动计算时间 |
-
+
|
diff --git a/web/views/@default/servers/logs/index.html b/web/views/@default/servers/logs/index.html
index d412a79b..8300cb41 100644
--- a/web/views/@default/servers/logs/index.html
+++ b/web/views/@default/servers/logs/index.html
@@ -2,9 +2,9 @@
{$template "/datepicker"}
- 所有日志
- 错误日志
- WAF日志
+ 所有日志
+ 错误日志
+ WAF日志