预渲染category、tag

pages/category/[category]/page/[page].js

@@ -33,10 +33,8 @@ export async function getStaticProps({ params: { category, page } }) {
   const from = 'category-page-props'
   let props = await getGlobalNotionData({ from })
 
-  // 过滤状态
+  // 过滤状态类型
-  props.posts = props.allPages.filter(page => page.type === 'Post' && page.status === 'Published')
+  props.posts = props.allPages.filter(page => page.type === 'Post' && page.status === 'Published').filter(post => post && post.category && post.category.includes(category))
-  // 过滤类型
-  props.posts = props.posts.filter(post => post && post.category && post.category.includes(category))
   // 处理文章页数
   props.postCount = props.posts.length
   // 处理分页
@@ -55,11 +53,24 @@ export async function getStaticProps({ params: { category, page } }) {
 
 export async function getStaticPaths() {
   const from = 'category-paths'
-  const { categories } = await getGlobalNotionData({ from })
+  const { categories, allPages } = await getGlobalNotionData({ from })
+  const paths = []
+
+  categories?.forEach(category => {
+    // 过滤状态类型
+    const categoryPosts = allPages.filter(page => page.type === 'Post' && page.status === 'Published').filter(post => post && post.category && post.category.includes(category.name))
+    // 处理文章页数
+    const postCount = categoryPosts.length
+    const totalPages = Math.ceil(postCount / BLOG.POSTS_PER_PAGE)
+    if (totalPages > 1) {
+      for (let i = 1; i <= totalPages; i++) {
+        paths.push({ params: { category: category.name, page: '' + i } })
+      }
+    }
+  })
+
   return {
-    paths: Object.keys(categories).map(category => ({
+    paths,
-      params: { category: categories[category]?.name, page: '1' }
-    })),
     fallback: true
   }
 }

pages/tag/[tag]/index.js

@@ -28,10 +28,7 @@ export async function getStaticProps({ params: { tag } }) {
   const props = await getGlobalNotionData({ from })
 
   // 过滤状态
-  props.posts = props.allPages.filter(page => page.type === 'Post' && page.status === 'Published')
+  props.posts = props.allPages.filter(page => page.type === 'Post' && page.status === 'Published').filter(post => post && post.tags && post.tags.includes(tag))
-
-  // 处理标签
-  props.posts = props.posts.filter(post => post && post.tags && post.tags.includes(tag))
 
   // 处理文章页数
   props.postCount = props.posts.length

pages/tag/[tag]/page/[page].js

@@ -26,18 +26,16 @@ const Tag = props => {
 export async function getStaticProps({ params: { tag, page } }) {
   const from = 'tag-page-props'
   const props = await getGlobalNotionData({ from })
-  // 过滤状态
+  // 过滤状态、标签
-  props.posts = props.allPages.filter(page => page.type === 'Post' && page.status === 'Published')
+  props.posts = props.allPages.filter(page => page.type === 'Post' && page.status === 'Published').filter(post => post && post.tags && post.tags.includes(tag))
-  // 过滤标签
+  // 处理文章数
-  props.posts = props.posts.filter(post => post && post.tags && post.tags.includes(tag))
-  // 处理文章页数
   props.postCount = props.posts.length
   // 处理分页
   props.posts = props.posts.slice(BLOG.POSTS_PER_PAGE * (page - 1), BLOG.POSTS_PER_PAGE * page - 1)
 
   props.tag = tag
   props.page = page
-
+  delete props.allPages
   return {
     props,
     revalidate: 1
@@ -46,16 +44,22 @@ export async function getStaticProps({ params: { tag, page } }) {
 
 export async function getStaticPaths() {
   const from = 'tag-page-static-path'
-  const { tags } = await getGlobalNotionData({ from })
+  const { tags, allPages } = await getGlobalNotionData({ from })
-  const tagNames = []
+  const paths = []
-  tags.forEach(tag => {
+  tags?.forEach(tag => {
-    tagNames.push(tag.name)
+    // 过滤状态类型
+    const categoryPosts = allPages.filter(page => page.type === 'Post' && page.status === 'Published').filter(post => post && post.category && post.tags.includes(tag.name))
+    // 处理文章页数
+    const postCount = categoryPosts.length
+    const totalPages = Math.ceil(postCount / BLOG.POSTS_PER_PAGE)
+    if (totalPages > 1) {
+      for (let i = 1; i <= totalPages; i++) {
+        paths.push({ params: { tag: tag.name, page: '' + i } })
+      }
+    }
   })
-
   return {
-    paths: Object.keys(tagNames).map(index => ({
+    paths: paths,
-      params: { tag: tagNames[index], page: '1' }
-    })),
     fallback: true
   }
 }