From f84409e97f1c5490d1ee5f0b7ab4d0fa3e21b7be Mon Sep 17 00:00:00 2001
From: tangly1024 <tlyong1992@hotmail.com>
Date: Fri, 7 Jan 2022 17:49:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=A8=A1=E5=BC=8F=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E6=96=87=E7=AB=A0=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 blog.config.js                   |  7 +++--
 components/ArticleDetail.js      |  6 ++--
 components/BlogPostCard.js       | 50 +++++++++++++++++++++++++-------
 components/BlogPostListPage.js   |  4 +--
 components/BlogPostListScroll.js | 15 +++++-----
 components/Logo.js               |  2 +-
 components/SideAreaLeft.js       |  2 ++
 components/SideBar.js            |  2 --
 components/SideBarDrawer.js      |  2 +-
 components/StickyBar.js          |  2 +-
 components/TopNav.js             | 26 ++++++++---------
 layouts/BaseLayout.js            |  3 +-
 lib/lang/en-US.js                |  4 ++-
 lib/lang/zh-CN.js                |  4 ++-
 lib/notion/getPostBlocks.js      | 16 ++++++++++
 pages/about.js                   |  1 +
 pages/article/[slug].js          |  5 ++--
 pages/index.js                   | 33 ++++++++++++++-------
 pages/page/[page].js             | 22 +++++++++-----
 pages/search.js                  |  4 +--
 styles/notion.css                |  5 ++--
 21 files changed, 143 insertions(+), 72 deletions(-)

diff --git a/blog.config.js b/blog.config.js
index 25f98757..059ad0a9 100644
--- a/blog.config.js
+++ b/blog.config.js
@@ -9,7 +9,10 @@ const BLOG = {
   home: { // 首页
     showHomeBanner: false, // 首页是否显示大图及标语 [true,false]
     homeBannerStrings: ['Hi，我是一个程序员', 'Hi，我是一个打工人', 'Hi，我是一个干饭人', '欢迎来到我的博客🎉'], // 首页大图标语文字
-    homeBannerImage: './bg_image.jpg' // 背景图地址
+    homeBannerImage: './bg_image.jpg', // 背景图地址
+    showPostCover: false, // 文章列表显示封面图
+    showPreview: true, // 列表展示文章预览
+    showSummary: false // 显示用户自定义摘要
   },
   lang: 'zh-CN', // ['zh-CN','en-US'] default lang => see /lib/lang.js for more.
   notionPageId: process.env.NOTION_PAGE_ID || 'bee1fccfa3bd47a1a7be83cc71372d83', // Important page_id！！！
@@ -23,7 +26,7 @@ const BLOG = {
   postListStyle: 'page', // ['page','scroll] 文章列表样式:页码分页、单页滚动加载
   postsPerPage: 6, // post counts per page
   sortByDate: false,
-  autoCollapsedNavBar: true, // the automatically collapsed navigation bar
+  topNavType: 'normal', // ['fixed','autoCollapse','normal'] 分别是固定顶部、固定底部滑动时自动折叠，不固定
   menu: { // 菜单栏设置
     showAbout: false, // 显示关于
     showCategory: true, // 显示分类
diff --git a/components/ArticleDetail.js b/components/ArticleDetail.js
index 3a2e141d..097a5242 100644
--- a/components/ArticleDetail.js
+++ b/components/ArticleDetail.js
@@ -30,7 +30,7 @@ import WordCount from './WordCount'
  * @param {*} param0
  * @returns
  */
-export default function ArticleDetail ({ post, blockMap, recommendPosts, prev, next }) {
+export default function ArticleDetail ({ post, recommendPosts, prev, next }) {
   const targetRef = useRef(null)
   const drawerRight = useRef(null)
   const url = BLOG.link + useRouter().asPath
@@ -125,9 +125,9 @@ export default function ArticleDetail ({ post, blockMap, recommendPosts, prev, n
 
             {/* Notion文章主体 */}
             <section id='notion-article' className='px-1'>
-              {blockMap && (
+              {post.blockMap && (
                 <NotionRenderer
-                  recordMap={blockMap}
+                  recordMap={post.blockMap}
                   mapPageUrl={mapPageUrl}
                   components={{
                     equation: Equation,
diff --git a/components/BlogPostCard.js b/components/BlogPostCard.js
index e2ccbf81..6811ff93 100644
--- a/components/BlogPostCard.js
+++ b/components/BlogPostCard.js
@@ -3,24 +3,25 @@ import Link from 'next/link'
 import React from 'react'
 import Image from 'next/image'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import { faFolder } from '@fortawesome/free-solid-svg-icons'
+import { faAngleDoubleRight, faFolder } from '@fortawesome/free-solid-svg-icons'
 import TagItemMini from './TagItemMini'
+import { Code, Collection, CollectionRow, Equation, NotionRenderer } from 'react-notion-x'
+import { useGlobal } from '@/lib/global'
 
-const BlogPostCard = ({ post }) => {
+const BlogPostCard = ({ post, showSummary }) => {
+  const { locale } = useGlobal()
   return (
-    <div key={post.id} className='shadow animate__animated animate__fadeIn flex xl:flex-row flex-col-reverse justify-between md:hover:shadow-xl duration-300
+    <div key={post.id} className='shadow border animate__animated animate__fadeIn flex flex-col-reverse justify-between md:hover:shadow-xl duration-300
         w-full bg-white dark:bg-gray-800 dark:hover:bg-gray-700 dark:border-gray-600'>
 
-      <div className='p-8 flex flex-col justify-between w-full'>
+      <div className='lg:p-8 p-4 flex flex-col justify-between w-full'>
         <Link href={`${BLOG.path}/article/${post.slug}`} passHref>
-          <a className='cursor-pointer text-xl xl:text-2xl leading-tight text-black dark:text-gray-100 hover:text-blue-500 dark:hover:text-blue-400'>
+          <a className='cursor-pointer font-bold text-3xl text-center leading-tight text-gray-700 dark:text-gray-100 hover:text-blue-500 dark:hover:text-blue-400'>
             {post.title}
           </a>
         </Link>
 
-        <p className='my-8 text-gray-700 dark:text-gray-300 text-md font-light leading-7'>{post.summary}</p>
-
-        <div className='flex items-center justify-between flex-wrap dark:text-gray-500 text-gray-400 hover:text-blue-500 dark:hover:text-blue-400 '>
+        <div className='flex mt-2 items-center justify-center flex-wrap dark:text-gray-500 text-gray-400 hover:text-blue-500 dark:hover:text-blue-400 '>
           <div>
           <Link href={`/category/${post.category}`} passHref>
             <a className='cursor-pointer font-light text-sm hover:underline transform'>
@@ -37,11 +38,36 @@ const BlogPostCard = ({ post }) => {
           </div>
         </div>
 
+        {showSummary && <p className='mt-4 text-gray-700 dark:text-gray-300 text-sm font-light leading-7'>
+          {post.summary}
+        </p>}
+
+        {BLOG.home?.showPreview && post?.blockMap && <div className='max-h-screen overflow-hidden truncate max-w-full'>
+          <NotionRenderer
+                  recordMap={post.blockMap}
+                  mapPageUrl={mapPageUrl}
+                  components={{
+                    equation: Equation,
+                    code: Code,
+                    collectionRow: CollectionRow,
+                    collection: Collection
+                  }}
+                />
+        </div> }
+
+        <div className='border-b-2 w-full border-dashed py-2'></div>
+
+        <Link href={`${BLOG.path}/article/${post.slug}`} passHref>
+          <div className='flex items-center cursor-pointer pt-6 justify-end leading-tight'>
+            <a className='bg-black p-2 text-white'>{locale.COMMON.ARTICLE_DETAIL}
+             <FontAwesomeIcon icon={faAngleDoubleRight} /></a>
+          </div>
+        </Link>
       </div>
 
-      {post?.page_cover && (
+      {BLOG.home?.showPostCover && post?.page_cover && (
         <Link href={`${BLOG.path}/article/${post.slug}`} passHref>
-        <div className='h-60 w-full xl:max-w-xs relative xl:h-full duration-200 cursor-pointer transform overflow-hidden'>
+        <div className='h-72 w-full relative duration-200 cursor-pointer transform overflow-hidden'>
           <Image className='hover:scale-105 transform duration-500' src={post?.page_cover} alt={post.title} layout='fill' objectFit='cover' loading='lazy' />
         </div>
       </Link>
@@ -50,4 +76,8 @@ const BlogPostCard = ({ post }) => {
   )
 }
 
+const mapPageUrl = id => {
+  return 'https://www.notion.so/' + id.replace(/-/g, '')
+}
+
 export default BlogPostCard
diff --git a/components/BlogPostListPage.js b/components/BlogPostListPage.js
index 0162bbd6..4305f986 100644
--- a/components/BlogPostListPage.js
+++ b/components/BlogPostListPage.js
@@ -18,9 +18,9 @@ const BlogPostListPage = ({ page = 1, posts = [], postCount }) => {
     return <BlogPostListEmpty />
   } else {
     return (
-      <div id="container" className='mt-10'>
+      <div id="container">
         {/* 文章列表 */}
-        <div className="flex flex-wrap space-y-8 mx-5 md:mx-0">
+        <div className="flex flex-wrap lg:space-y-4 space-y-1">
           {posts.map(post => (
             <BlogPostCard key={post.id} post={post} />
           ))}
diff --git a/components/BlogPostListScroll.js b/components/BlogPostListScroll.js
index 154669ca..07fd9be1 100644
--- a/components/BlogPostListScroll.js
+++ b/components/BlogPostListScroll.js
@@ -1,10 +1,9 @@
-import BlogPostCard from '@/components/BlogPostCard'
 import BLOG from '@/blog.config'
-
-import React, { useCallback, useEffect, useRef, useState } from 'react'
-import throttle from 'lodash.throttle'
+import BlogPostCard from '@/components/BlogPostCard'
 import BlogPostListEmpty from '@/components/BlogPostListEmpty'
 import { useGlobal } from '@/lib/global'
+import throttle from 'lodash.throttle'
+import React, { useCallback, useEffect, useRef, useState } from 'react'
 
 /**
  * 博客列表滚动分页
@@ -14,7 +13,7 @@ import { useGlobal } from '@/lib/global'
  * @returns {JSX.Element}
  * @constructor
  */
-const BlogPostListScroll = ({ posts = [], currentSearch, currentCategory, currentTag }) => {
+const BlogPostListScroll = ({ posts = [], currentSearch, showSummary = BLOG.home.showSummary }) => {
   const postsPerPage = BLOG.postsPerPage
   const [page, updatePage] = useState(1)
   const postsToShow = getPostByPage(page, posts, postsPerPage)
@@ -53,12 +52,12 @@ const BlogPostListScroll = ({ posts = [], currentSearch, currentCategory, curren
   if (!postsToShow || postsToShow.length === 0) {
     return <BlogPostListEmpty currentSearch={currentSearch} />
   } else {
-    return <div id='container' className='mt-10' ref={targetRef}>
+    return <div id='container' ref={targetRef}>
 
       {/* 文章列表 */}
-      <div className='flex flex-wrap space-y-8 mx-5 md:mx-0'>
+      <div className='flex flex-wrap space-y-8'>
         {postsToShow.map(post => (
-          <BlogPostCard key={post.id} post={post}/>
+          <BlogPostCard key={post.id} post={post} showSummary={showSummary}/>
         ))}
       </div>
 
diff --git a/components/Logo.js b/components/Logo.js
index bc8a2104..6713339e 100644
--- a/components/Logo.js
+++ b/components/Logo.js
@@ -4,7 +4,7 @@ import React from 'react'
 
 const Logo = () => {
   return <Link href='/' passHref>
-        <div className='flex flex-col justify-center items-center cursor-pointer bg-gray-800 space-y-3 h-32 font-bold mb-4'>
+        <div className='flex flex-col justify-center items-center cursor-pointer bg-black space-y-3 h-32 font-bold'>
           <div className='font-serif text-xl text-white'> {BLOG.title}</div>
           <div className='text-sm text-gray-300 font-light'> {BLOG.description}</div>
         </div>
diff --git a/components/SideAreaLeft.js b/components/SideAreaLeft.js
index 29351393..832ee465 100644
--- a/components/SideAreaLeft.js
+++ b/components/SideAreaLeft.js
@@ -30,7 +30,9 @@ const SideAreaLeft = ({ title, tags, currentTag, post, postCount, categories, cu
       {/* 菜单 */}
       <section className='shadow hidden lg:block mb-5 pb-4 bg-white dark:bg-gray-800 hover:shadow-xl duration-200'>
         <Logo/>
+        <div className='pt-2'>
         <MenuButtonGroup allowCollapse={true} />
+        </div>
         {BLOG.menu.showSearch && <div className='px-5 pt-2'>
            <SearchInput currentTag={currentTag} currentSearch={currentSearch} />
         </div>}
diff --git a/components/SideBar.js b/components/SideBar.js
index 3e355a0e..31f798d5 100644
--- a/components/SideBar.js
+++ b/components/SideBar.js
@@ -6,7 +6,6 @@ import { faAngleDoubleRight, faTag, faThList } from '@fortawesome/free-solid-svg
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import Link from 'next/link'
 import React from 'react'
-import Logo from './Logo'
 
 /**
  * 侧边栏
@@ -30,7 +29,6 @@ const SideBar = ({ title, tags, currentTag, post, slot, categories, currentCateg
         <InfoCard />
       </section>
 
-      <Logo/>
       {/* 分类  */}
       {categories && (
         <section className='mt-8'>
diff --git a/components/SideBarDrawer.js b/components/SideBarDrawer.js
index a28a288b..87b731d4 100644
--- a/components/SideBarDrawer.js
+++ b/components/SideBarDrawer.js
@@ -48,7 +48,7 @@ const SideBarDrawer = ({ post, currentTag, cRef, tags, slot, categories, current
   }
 
   return <div id='sidebar-wrapper' className='hidden'>
-    <div id='sidebar-drawer' className='-ml-80 bg-white dark:bg-gray-900 flex flex-col duration-300 fixed h-full left-0 overflow-y-scroll scroll-hidden top-0 z-50 shadow-2xl'>
+    <div id='sidebar-drawer' className='-ml-80 bg-white dark:bg-gray-900 flex flex-col duration-300 fixed h-full left-0 overflow-y-scroll scroll-hidden top-0 z-50'>
       <SideBar tags={tags} post={post} slot={slot} categories={categories} currentCategory={currentCategory} />
     </div>
     {/* 背景蒙版 */}
diff --git a/components/StickyBar.js b/components/StickyBar.js
index 20acd2a1..b52c581b 100644
--- a/components/StickyBar.js
+++ b/components/StickyBar.js
@@ -36,7 +36,7 @@ const StickyBar = ({ children }) => {
 
   return (
     <div id='sticky-bar' className='sticky flex-grow justify-center top-14 md:top-0 duration-500 z-10 pb-16'>
-      <div className='glassmorphism dark:border-gray-600 px-5 absolute shadow-xl border w-full hidden-scroll'>
+      <div className='glassmorphism dark:border-gray-600 px-5 absolute shadow-md border w-full hidden-scroll'>
           <div id='tag-container' className="md:pl-3 overflow-x-auto">
               { children }
           </div>
diff --git a/components/TopNav.js b/components/TopNav.js
index 0bbd3a45..20fe43d8 100644
--- a/components/TopNav.js
+++ b/components/TopNav.js
@@ -3,10 +3,10 @@ import SideBarDrawer from '@/components/SideBarDrawer'
 import { useGlobal } from '@/lib/global'
 import { faBars, faSearch } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import Link from 'next/link'
-import { useCallback, useEffect, useRef } from 'react'
-import SearchDrawer from './SearchDrawer'
 import throttle from 'lodash.throttle'
+import { useCallback, useEffect, useRef } from 'react'
+import Logo from './Logo'
+import SearchDrawer from './SearchDrawer'
 
 let windowTop = 0
 
@@ -35,7 +35,7 @@ const TopNav = ({ tags, currentTag, post, slot, categories, currentCategory, aut
 
   // 监听滚动
   useEffect(() => {
-    if (BLOG.autoCollapsedNavBar) {
+    if (BLOG.topNavType === 'autoCollapse') {
       scrollTrigger()
       window.addEventListener('scroll', scrollTrigger)
     }
@@ -43,30 +43,28 @@ const TopNav = ({ tags, currentTag, post, slot, categories, currentCategory, aut
       BLOG.autoCollapsedNavBar && window.removeEventListener('scroll', scrollTrigger)
     }
   }, [])
-  return (<div id='top-nav' className='sticky top-0 z-40 block lg:hidden'>
+  return (<div id='top-nav' className='z-40 block lg:hidden'>
     {/* 侧面抽屉 */}
     <SideBarDrawer post={post} currentTag={currentTag} cRef={drawer} tags={tags} slot={slot} categories={categories} currentCategory={currentCategory}/>
     <SearchDrawer cRef={searchDrawer}/>
 
     {/* 导航栏 */}
-    <div id='sticky-nav' className='flex animate__animated animate__fadeIn fixed lg:relative w-full top-0 z-20 transform duration-500'>
-      <div className='w-full flex justify-between items-center p-4 glassmorphism'>
+    <div id='sticky-nav' className={`${BLOG.topNavType !== 'normal' ? 'fixed' : ''} flex animate__animated animate__fadeIn  lg:relative w-full top-0 z-20 transform duration-500`}>
+      <div className='w-full flex justify-between items-center p-4 bg-black text-white'>
         {/* 左侧LOGO 标题 */}
         <div className='flex flex-none flex-grow-0'>
           <div onClick={() => { drawer.current.handleSwitchSideDrawerVisible() }}
-               className='w-8 cursor-pointer dark:text-gray-300'>
+               className='w-8 cursor-pointer'>
             <FontAwesomeIcon icon={faBars} size={'lg'}/>
           </div>
+        </div>
 
-          <Link href='/' passHref>
-            <a>
-             <h1 className='cursor-pointer ml-2 w-full hover:scale-105 duration-200 transform font-serif dark:text-gray-200 whitespace-nowrap overflow-x-hidden'>{ BLOG.title }</h1>
-            </a>
-          </Link>
+        <div className='flex'>
+         <Logo/>
         </div>
 
         {/* 右侧功能 */}
-        <div className='mr-1 flex flex-nowrap flex-grow justify-end items-center text-sm space-x-4 font-serif dark:text-gray-200'>
+        <div className='mr-1 flex justify-end items-center text-sm space-x-4 font-serif dark:text-gray-200'>
           <div className="cursor-pointer block lg:hidden" onClick={() => { searchDrawer?.current?.show() }}>
             <FontAwesomeIcon icon={faSearch} className="mr-2" />{locale.NAV.SEARCH}
           </div>
diff --git a/layouts/BaseLayout.js b/layouts/BaseLayout.js
index 92ef74b8..4df9da40 100644
--- a/layouts/BaseLayout.js
+++ b/layouts/BaseLayout.js
@@ -1,3 +1,4 @@
+import BLOG from '@/blog.config'
 import CommonHead from '@/components/CommonHead'
 import FloatDarkModeButton from '@/components/FloatDarkModeButton'
 import Footer from '@/components/Footer'
@@ -59,7 +60,7 @@ const BaseLayout = ({
 
       <main id='wrapper' className='flex justify-center flex-1 mx-auto pb-12'>
           <SideAreaLeft targetRef={targetRef} post={post} postCount={postCount} tags={tags} currentSearch={currentSearch} currentTag={currentTag} categories={categories} currentCategory={currentCategory}/>
-          <section id='center' className='flex-grow mt-14 md:mt-0 max-w-5xl min-h-screen' ref={targetRef}>
+          <section id='center' className={`${BLOG.topNavType !== 'normal' ? 'mt-14' : ''} flex-grow md:mt-0 max-w-5xl min-h-screen w-full`} ref={targetRef}>
             {onLoading
               ? <LoadingCover/>
               : <>
diff --git a/lib/lang/en-US.js b/lib/lang/en-US.js
index fa0619ea..87a4f034 100644
--- a/lib/lang/en-US.js
+++ b/lib/lang/en-US.js
@@ -26,7 +26,9 @@ export default {
     POSTS: 'Posts',
     VISITORS: 'Visitors',
     VIEWS: 'Views',
-    COPYRIGHT_NOTICE: 'All articles in this blog, except for special statements, adopt BY-NC-SA agreement. Please indicate the source!'
+    COPYRIGHT_NOTICE: 'All articles in this blog, except for special statements, adopt BY-NC-SA agreement. Please indicate the source!',
+    RESULT_OF_SEARCH: 'Results Found',
+    ARTICLE_DETAIL: 'Article Details'
   },
   PAGINATION: {
     PREV: 'Prev',
diff --git a/lib/lang/zh-CN.js b/lib/lang/zh-CN.js
index a27ac784..02e07cf0 100644
--- a/lib/lang/zh-CN.js
+++ b/lib/lang/zh-CN.js
@@ -28,7 +28,9 @@ export default {
     POSTS: '篇文章',
     VISITORS: '位访客',
     VIEWS: '次查看',
-    COPYRIGHT_NOTICE: '本文采用 CC BY-NC-SA 4.0 许可协议，转载请注明出处。'
+    COPYRIGHT_NOTICE: '本文采用 CC BY-NC-SA 4.0 许可协议，转载请注明出处。',
+    RESULT_OF_SEARCH: '篇搜索到的结果',
+    ARTICLE_DETAIL: '文章详情'
   },
   PAGINATION: {
     PREV: '上一页',
diff --git a/lib/notion/getPostBlocks.js b/lib/notion/getPostBlocks.js
index 175c426b..744cf83b 100644
--- a/lib/notion/getPostBlocks.js
+++ b/lib/notion/getPostBlocks.js
@@ -20,6 +20,22 @@ export async function getPostBlocks (id, from) {
     return null
   }
 
+  // 去掉不用的字段
+  for (const j in pageBlock?.block) {
+    const b = pageBlock?.block[j]
+    if (b) {
+      delete b.role
+      delete b.value?.version
+      delete b.value?.created_time
+      delete b.value?.last_edited_time
+      delete b.value?.created_by_table
+      delete b.value?.created_by_id
+      delete b.value?.last_edited_by_table
+      delete b.value?.last_edited_by_id
+      delete b.value?.space_id
+    }
+  }
+
   if (pageBlock) {
     await setDataToCache(cacheKey, pageBlock)
   }
diff --git a/pages/about.js b/pages/about.js
index ebc2f4d9..28a93342 100644
--- a/pages/about.js
+++ b/pages/about.js
@@ -59,6 +59,7 @@ export async function getStaticProps () {
   const blockMap = await getPostBlocks(post.id, 'slug')
   post.toc = []
   if (blockMap) {
+    post.blockMap = blockMap
     post.content = Object.keys(blockMap.block)
     post.toc = getPageTableOfContents(post, blockMap)
   }
diff --git a/pages/article/[slug].js b/pages/article/[slug].js
index 3a6a113e..8f055522 100644
--- a/pages/article/[slug].js
+++ b/pages/article/[slug].js
@@ -13,7 +13,6 @@ import { getPageTableOfContents } from 'notion-utils'
  */
 const Slug = ({
   post,
-  blockMap,
   tags,
   prev,
   next,
@@ -45,7 +44,6 @@ const Slug = ({
     >
       <ArticleDetail
         post={post}
-        blockMap={blockMap}
         recommendPosts={recommendPosts}
         prev={prev}
         next={next}
@@ -78,8 +76,10 @@ export async function getStaticProps ({ params: { slug } }) {
 
   const blockMap = await getPostBlocks(post.id, 'slug')
   if (blockMap) {
+    post.blockMap = blockMap
     post.content = Object.keys(blockMap.block)
     post.toc = getPageTableOfContents(post, blockMap)
+    delete post.content
   }
 
   // 上一篇、下一篇文章关联
@@ -92,7 +92,6 @@ export async function getStaticProps ({ params: { slug } }) {
   return {
     props: {
       post,
-      blockMap,
       tags,
       prev,
       next,
diff --git a/pages/index.js b/pages/index.js
index 0f44ac31..080cc3c5 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -1,10 +1,11 @@
 import BLOG from '@/blog.config'
-import BaseLayout from '@/layouts/BaseLayout'
-import BlogPostListScroll from '@/components/BlogPostListScroll'
-import { getGlobalNotionData } from '@/lib/notion/getNotionData'
-import Header from '@/components/Header'
 import BlogPostListPage from '@/components/BlogPostListPage'
+import BlogPostListScroll from '@/components/BlogPostListScroll'
+import Header from '@/components/Header'
 import LatestPostsGroup from '@/components/LatestPostsGroup'
+import BaseLayout from '@/layouts/BaseLayout'
+import { getPostBlocks } from '@/lib/notion'
+import { getGlobalNotionData } from '@/lib/notion/getNotionData'
 
 export async function getStaticProps () {
   const from = 'index'
@@ -19,12 +20,20 @@ export async function getStaticProps () {
   const page = 1
   let postsToShow = []
   if (BLOG.postListStyle !== 'page') {
-    postsToShow = Object.create(allPosts)
+    postsToShow = Array.from(allPosts)
   } else {
     postsToShow = allPosts.slice(
       BLOG.postsPerPage * (page - 1),
       BLOG.postsPerPage * page
     )
+    for (const i in postsToShow) {
+      const post = postsToShow[i]
+      const blockMap = await getPostBlocks(post.id, 'slug')
+      if (blockMap) {
+        post.blockMap = blockMap
+      }
+    }
+    console.log('加载文章预览完成')
   }
 
   return {
@@ -47,15 +56,19 @@ const Index = ({ posts, tags, meta, categories, postCount, latestPosts }) => {
       meta={meta}
       tags={tags}
       sideBarSlot={<LatestPostsGroup posts={latestPosts} />}
-      rightAreaSlot={BLOG.widget?.showLatestPost && <LatestPostsGroup posts={latestPosts} />}
+      rightAreaSlot={
+        BLOG.widget?.showLatestPost && <LatestPostsGroup posts={latestPosts} />
+      }
       postCount={postCount}
       categories={categories}
     >
       {BLOG.postListStyle !== 'page'
-        ? (<BlogPostListScroll posts={posts} tags={tags} />)
-        : (<BlogPostListPage posts={posts} tags={tags} postCount={postCount} />)
-      }
-
+        ? (
+        <BlogPostListScroll posts={posts} tags={tags} showSummary={true} />
+          )
+        : (
+        <BlogPostListPage posts={posts} tags={tags} postCount={postCount} />
+          )}
     </BaseLayout>
   )
 }
diff --git a/pages/page/[page].js b/pages/page/[page].js
index a60a4476..ac2fe86a 100644
--- a/pages/page/[page].js
+++ b/pages/page/[page].js
@@ -3,6 +3,7 @@ import BlogPostListPage from '@/components/BlogPostListPage'
 import Header from '@/components/Header'
 import LatestPostsGroup from '@/components/LatestPostsGroup'
 import BaseLayout from '@/layouts/BaseLayout'
+import { getPostBlocks } from '@/lib/notion'
 import { getGlobalNotionData } from '@/lib/notion/getNotionData'
 import Custom404 from '../404'
 
@@ -46,15 +47,20 @@ export async function getStaticProps ({ params: { page } }) {
     type: 'website'
   }
   // 处理分页
-  let postsToShow = []
-  if (BLOG.postListStyle !== 'page') {
-    postsToShow = Object.create(allPosts)
-  } else {
-    postsToShow = allPosts.slice(
-      BLOG.postsPerPage * (page - 1),
-      BLOG.postsPerPage * page
-    )
+  const postsToShow = allPosts.slice(
+    BLOG.postsPerPage * (page - 1),
+    BLOG.postsPerPage * page
+  )
+
+  for (const i in postsToShow) {
+    const post = postsToShow[i]
+    const blockMap = await getPostBlocks(post.id, 'slug')
+    if (blockMap) {
+      post.blockMap = blockMap
+    }
   }
+  console.log('加载文章预览完成')
+
   return {
     props: {
       page,
diff --git a/pages/search.js b/pages/search.js
index 5c56d584..498a4c0f 100644
--- a/pages/search.js
+++ b/pages/search.js
@@ -55,11 +55,11 @@ const Search = ({ posts, tags, categories, postCount, latestPosts }) => {
       <StickyBar>
         <div className="p-4 dark:text-gray-200">
           <FontAwesomeIcon icon={faSearch} className="mr-1" />{' '}
-          {locale.NAV.SEARCH}： {searchKey}
+           {filteredPosts.length} {locale.COMMON.RESULT_OF_SEARCH}
         </div>
       </StickyBar>
       <div className="md:mt-5">
-        <BlogPostListScroll posts={filteredPosts} tags={tags} />
+        <BlogPostListScroll posts={filteredPosts} tags={tags} showSummary={true}/>
       </div>
     </BaseLayout>
   )
diff --git a/styles/notion.css b/styles/notion.css
index eace4c58..b8466a2a 100644
--- a/styles/notion.css
+++ b/styles/notion.css
@@ -387,8 +387,9 @@
 }
 
 .notion-h1 {
-  font-size: 1.875em;
+  font-size: 1.575em;
   margin-top: 1.08em;
+  @apply border-b w-full
 }
 
 .notion-header-anchor {
@@ -1584,7 +1585,7 @@ svg.notion-page-icon {
 /* NOTION CSS OVERRIDE */
 
 .notion {
-  @apply text-gray-600 dark:text-gray-300;
+  @apply dark:text-gray-300;
   overflow-wrap: break-word;
 }
 .notion,