From 41acdc09ec6676427ba4fdaf38b729c82cd6fd59 Mon Sep 17 00:00:00 2001 From: "tangly1024.com" Date: Wed, 12 Jun 2024 16:22:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BC=AA=E9=9D=99=E6=80=81?= =?UTF-8?q?=E5=88=86=E9=A1=B5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- themes/example/components/BlogListPage.js | 1 + themes/game/components/PaginationSimple.js | 1 + themes/heo/components/PaginationNumber.js | 1 + themes/hexo/components/PaginationNumber.js | 1 + themes/movie/components/PaginationNumber.js | 56 +++++++++------------ themes/next/components/PaginationNumber.js | 50 ++++++++++++------ themes/nobelium/components/BlogListPage.js | 1 + themes/plog/components/BlogListPage.js | 1 + themes/simple/components/BlogListPage.js | 1 + 9 files changed, 66 insertions(+), 47 deletions(-) diff --git a/themes/example/components/BlogListPage.js b/themes/example/components/BlogListPage.js index f9ae29a4..b8a1e573 100644 --- a/themes/example/components/BlogListPage.js +++ b/themes/example/components/BlogListPage.js @@ -24,6 +24,7 @@ export const BlogListPage = props => { .split('?')[0] .replace(/\/page\/[1-9]\d*/, '') .replace(/\/$/, '') + .replace('.html', '') const showPageCover = siteConfig('EXAMPLE_POST_LIST_COVER', null, CONFIG) diff --git a/themes/game/components/PaginationSimple.js b/themes/game/components/PaginationSimple.js index 3f5a2760..6df710f5 100644 --- a/themes/game/components/PaginationSimple.js +++ b/themes/game/components/PaginationSimple.js @@ -17,6 +17,7 @@ const PaginationSimple = ({ page, showNext }) => { .split('?')[0] .replace(/\/page\/[1-9]\d*/, '') .replace(/\/$/, '') + .replace('.html', '') return (
diff --git a/themes/heo/components/PaginationNumber.js b/themes/heo/components/PaginationNumber.js index 0ffc7bfb..a68f33e5 100644 --- a/themes/heo/components/PaginationNumber.js +++ b/themes/heo/components/PaginationNumber.js @@ -21,6 +21,7 @@ const PaginationNumber = ({ page, totalPage }) => { .split('?')[0] .replace(/\/page\/[1-9]\d*/, '') .replace(/\/$/, '') + .replace('.html', '') const pages = generatePages(pagePrefix, page, currentPage, totalPage) const [value, setValue] = useState('') diff --git a/themes/hexo/components/PaginationNumber.js b/themes/hexo/components/PaginationNumber.js index e99a0c5d..57d755dd 100644 --- a/themes/hexo/components/PaginationNumber.js +++ b/themes/hexo/components/PaginationNumber.js @@ -16,6 +16,7 @@ const PaginationNumber = ({ page, totalPage }) => { .split('?')[0] .replace(/\/page\/[1-9]\d*/, '') .replace(/\/$/, '') + .replace('.html', '') const pages = generatePages(pagePrefix, page, currentPage, totalPage) return ( diff --git a/themes/movie/components/PaginationNumber.js b/themes/movie/components/PaginationNumber.js index effc1835..64323b9c 100644 --- a/themes/movie/components/PaginationNumber.js +++ b/themes/movie/components/PaginationNumber.js @@ -22,6 +22,7 @@ const PaginationNumber = ({ page, totalPage }) => { .split('?')[0] .replace(/\/page\/[1-9]\d*/, '') .replace(/\/$/, '') + .replace('.html', '') const pages = generatePages(pagePrefix, page, currentPage, totalPage) if (pages?.length <= 1) { return <> @@ -46,7 +47,7 @@ const PaginationNumber = ({ page, totalPage }) => { return ( <> {/* pc端分页按钮 */} -
+
{/* 上一页 */} { : `${pagePrefix}/page/${currentPage - 1}`, query: router.query.s ? { s: router.query.s } : {} }} - rel="prev" - className={`${currentPage === 1 ? 'invisible' : 'block'}`} - > -
- -
+ rel='prev' + className={`${currentPage === 1 ? 'invisible' : 'block'}`}> +
+ +
{locale.PAGINATION.PREV}
{/* 分页 */} -
+
{pages} {/* 跳转页码 */} -
+
+ className='w-0 group-hover:w-20 group-hover:px-3 transition-all duration-200 bg-gray-100 border-none outline-none h-full rounded-lg' + onInput={handleInputChange}>
+ className='cursor-pointer hover:bg-indigo-600 dark:bg-[#1e1e1e] dark:hover:bg-yellow-600 hover:text-white px-4 py-2 group-hover:px-2 group-hover:mx-1 group-hover:rounded bg-white'>
@@ -93,12 +91,11 @@ const PaginationNumber = ({ page, totalPage }) => { pathname: `${pagePrefix}/page/${currentPage + 1}`, query: router.query.s ? { s: router.query.s } : {} }} - rel="next" - className={`${+showNext ? 'block' : 'invisible'} `} - > -
- -
+ rel='next' + className={`${+showNext ? 'block' : 'invisible'} `}> +
+ +
{locale.PAGINATION.NEXT}
@@ -107,7 +104,7 @@ const PaginationNumber = ({ page, totalPage }) => { {/* 移动端分页 */} -
+
{/* 上一页 */} { : `${pagePrefix}/page/${currentPage - 1}`, query: router.query.s ? { s: router.query.s } : {} }} - rel="prev" - className={`${showPrev ? 'block' : 'hidden'} dark:text-white relative w-full flex-1 h-14 flex items-center transition-all duration-200 justify-center py-2 px-2 bg-white dark:bg-[#1e1e1e] border rounded-xl cursor-pointer`} - > + rel='prev' + className={`${showPrev ? 'block' : 'hidden'} dark:text-white relative w-full flex-1 h-14 flex items-center transition-all duration-200 justify-center py-2 px-2 bg-white dark:bg-[#1e1e1e] border rounded-xl cursor-pointer`}> {locale.PAGINATION.PREV} - {showPrev && showNext &&
} + {showPrev && showNext &&
} {/* 下一页 */} { pathname: `${pagePrefix}/page/${currentPage + 1}`, query: router.query.s ? { s: router.query.s } : {} }} - rel="next" - className={`${+showNext ? 'block' : 'hidden'} dark:text-white relative w-full flex-1 h-14 flex items-center transition-all duration-200 justify-center py-2 px-2 bg-white dark:bg-[#1e1e1e] border rounded-xl cursor-pointer`} - > + rel='next' + className={`${+showNext ? 'block' : 'hidden'} dark:text-white relative w-full flex-1 h-14 flex items-center transition-all duration-200 justify-center py-2 px-2 bg-white dark:bg-[#1e1e1e] border rounded-xl cursor-pointer`}> {locale.PAGINATION.NEXT}
@@ -163,8 +158,7 @@ function getPageElement(page, currentPage, pagePrefix) { ? 'bg-indigo-600 dark:bg-yellow-600 text-white ' : 'dark:bg-[#1e1e1e] bg-white') + ' hover:border-indigo-600 dark:hover:bg-yellow-600 dark:border-gray-600 px-4 border py-2 rounded-lg drop-shadow-sm duration-200 transition-colors' - } - > + }> {page} ) @@ -197,7 +191,7 @@ function generatePages(pagePrefix, page, currentPage, totalPage) { } if (startPage > 2) { pages.push( -
+
...{' '}
) diff --git a/themes/next/components/PaginationNumber.js b/themes/next/components/PaginationNumber.js index af72c797..02c61693 100644 --- a/themes/next/components/PaginationNumber.js +++ b/themes/next/components/PaginationNumber.js @@ -16,6 +16,8 @@ const PaginationNumber = ({ page, totalPage }) => { .split('?')[0] .replace(/\/page\/[1-9]\d*/, '') .replace(/\/$/, '') + .replace('.html', '') + const pages = generatePages(pagePrefix, page, currentPage, totalPage) return ( @@ -67,22 +69,14 @@ const PaginationNumber = ({ page, totalPage }) => { ) } -function getPageElement(pagePrefix, page, currentPage) { - return ( - - {page} - - ) -} +/** + * 生成分页按钮组 + * @param {*} pagePrefix + * @param {*} page + * @param {*} currentPage + * @param {*} totalPage + * @returns + */ function generatePages(pagePrefix, page, currentPage, totalPage) { const pages = [] const groupCount = 7 // 最多显示页签数 @@ -126,4 +120,28 @@ function generatePages(pagePrefix, page, currentPage, totalPage) { } return pages } +/** + * 生成分页按钮对象 + * @param {*} pagePrefix + * @param {*} page + * @param {*} currentPage + * @returns + */ +function getPageElement(pagePrefix, page, currentPage) { + return ( + + {page} + + ) +} + export default PaginationNumber diff --git a/themes/nobelium/components/BlogListPage.js b/themes/nobelium/components/BlogListPage.js index 0c313ba4..6998c522 100644 --- a/themes/nobelium/components/BlogListPage.js +++ b/themes/nobelium/components/BlogListPage.js @@ -19,6 +19,7 @@ export const BlogListPage = props => { .split('?')[0] .replace(/\/page\/[1-9]\d*/, '') .replace(/\/$/, '') + .replace('.html', '') return (
diff --git a/themes/plog/components/BlogListPage.js b/themes/plog/components/BlogListPage.js index 68790295..9224c16b 100644 --- a/themes/plog/components/BlogListPage.js +++ b/themes/plog/components/BlogListPage.js @@ -20,6 +20,7 @@ export const BlogListPage = props => { .split('?')[0] .replace(/\/page\/[1-9]\d*/, '') .replace(/\/$/, '') + .replace('.html', '') const blogPostRefs = useRef([]) diff --git a/themes/simple/components/BlogListPage.js b/themes/simple/components/BlogListPage.js index 0345185b..1219aac7 100644 --- a/themes/simple/components/BlogListPage.js +++ b/themes/simple/components/BlogListPage.js @@ -32,6 +32,7 @@ export default function BlogListPage(props) { .split('?')[0] .replace(/\/page\/[1-9]\d*/, '') .replace(/\/$/, '') + .replace('.html', '') return (