Revert "Fix ellipsis display logic in pagination template"

This reverts commit 2fa851e6500752c0cea1da5cfdfc6d99e0a81a71.

diff --git a/tpl/tplimpl/embedded/templates.autogen.go b/tpl/tplimpl/embedded/templates.autogen.go
index 89dd1d4690e1e7f512db45f201774bb379a4d1d0..190c88e328698bc073d75a85ee462efa1dc8a673 100644 (file)
--- a/tpl/tplimpl/embedded/templates.autogen.go
+++ b/tpl/tplimpl/embedded/templates.autogen.go
@@ -260,7 +260,8 @@ if (!doNotTrack) {
   {{- $shouldEllipse := false -}}
   {{- range $pag.Pagers -}}
   {{- $right := sub .TotalPages .PageNumber -}}
-  {{- $showNumber := or (eq .TotalPages 5) (le .PageNumber 3) (eq $right 0) -}}
+  {{- $showNumber := or (le .PageNumber 3) (eq $right 0) -}}
+  {{- $showNumber := or $showNumber (and (gt .PageNumber (sub $pag.PageNumber 2)) (lt .PageNumber (add $pag.PageNumber 2))) -}}
   {{- if $showNumber -}}
     {{- $ellipsed = false -}}
     {{- $shouldEllipse = false -}}

diff --git a/tpl/tplimpl/embedded/templates/pagination.html b/tpl/tplimpl/embedded/templates/pagination.html
index 3c8a7e393f745bf67bae5d778752b8acc456fda3..7b60c5d059138dc8ec12f3bbe2149db0b061d963 100644 (file)
--- a/tpl/tplimpl/embedded/templates/pagination.html
+++ b/tpl/tplimpl/embedded/templates/pagination.html
@@ -13,7 +13,8 @@
   {{- $shouldEllipse := false -}}
   {{- range $pag.Pagers -}}
   {{- $right := sub .TotalPages .PageNumber -}}
-  {{- $showNumber := or (eq .TotalPages 5) (le .PageNumber 3) (eq $right 0) -}}
+  {{- $showNumber := or (le .PageNumber 3) (eq $right 0) -}}
+  {{- $showNumber := or $showNumber (and (gt .PageNumber (sub $pag.PageNumber 2)) (lt .PageNumber (add $pag.PageNumber 2))) -}}
   {{- if $showNumber -}}
     {{- $ellipsed = false -}}
     {{- $shouldEllipse = false -}}