最后更新时间

lib/lang/en-US.js

@@ -32,7 +32,9 @@ export default {
     ARTICLE_DETAIL: 'Article Details',
     PASSWORD_ERROR: 'Password Error!',
     ARTICLE_LOCK_TIPS: 'Please Enter the password:',
-    SUBMIT: 'Submit'
+    SUBMIT: 'Submit',
+    POST_TIME: 'Post on',
+    LAST_EDITED_TIME: 'Last edited time'
   },
   PAGINATION: {
     PREV: 'Prev',

lib/lang/zh-CN.js

@@ -34,7 +34,9 @@ export default {
     ARTICLE_DETAIL: '文章详情',
     PASSWORD_ERROR: '密码错误！',
     ARTICLE_LOCK_TIPS: '文章已上锁，请输入访问密码',
-    SUBMIT: '提交'
+    SUBMIT: '提交',
+    POST_TIME: '发布于',
+    LAST_EDITED_TIME: '最后更新'
   },
   PAGINATION: {
     PREV: '上一页',

lib/lang/zh-TW.js

@@ -34,7 +34,9 @@ export default {
     ARTICLE_DETAIL: '完整文章',
     PASSWORD_ERROR: '密碼錯誤！',
     ARTICLE_LOCK_TIPS: '文章已上鎖，請輸入訪問密碼',
-    SUBMIT: '提交'
+    SUBMIT: '提交',
+    POST_TIME: '发布于',
+    LAST_EDITED_TIME: '最后更新日期'
   },
   PAGINATION: {
     PREV: '上一頁',

lib/notion/getAllPosts.js

@@ -2,6 +2,7 @@ import BLOG from '@/blog.config'
 import getAllPageIds from './getAllPageIds'
 import getPageProperties from './getPageProperties'
 import { defaultMapImageUrl } from 'react-notion-x'
+import formatDate from '@/lib/formatDate'
 import { getNotionPageData } from '@/lib/notion/getNotionData'
 import { delCacheData } from '@/lib/cache/cache_manager'
 
@@ -12,7 +13,7 @@ import { delCacheData } from '@/lib/cache/cache_manager'
  * @param pageType 页面类型数组 ['Post','Page']
  * @returns {Promise<*[]>}
  */
-export async function getAllPosts ({ notionPageData, from, pageType }) {
+export async function getAllPosts({ notionPageData, from, pageType }) {
   if (!notionPageData) {
     notionPageData = await getNotionPageData({ from })
   }
@@ -31,8 +32,8 @@ export async function getAllPosts ({ notionPageData, from, pageType }) {
     const id = pageIds[i]
     const properties = (await getPageProperties(id, pageBlock, schema)) || null
     properties.slug = properties.slug ?? properties.id
-    properties.createdTime = new Date(pageBlock[id].value?.created_time).toString() // FIXME 似乎没有created_time 字段了
-    properties.lastEditedTime = new Date(pageBlock[id].value?.last_edited_time).toString() // FIXME 似乎没有created_time 字段了
+    properties.createdTime = formatDate(new Date(pageBlock[id].value?.created_time).toString(), BLOG.LANG)
+    properties.lastEditedTime = formatDate(new Date(pageBlock[id].value?.last_edited_time).toString(), BLOG.LANG)
     properties.fullWidth = pageBlock[id].value?.format?.page_full_width ?? false
     properties.page_cover = getPostCover(id, pageBlock) ?? null
     properties.content = pageBlock[id].value?.content ?? []
@@ -65,7 +66,7 @@ export async function getAllPosts ({ notionPageData, from, pageType }) {
 }
 
 // 从Block获取封面图;优先取PageCover，否则取内容图片
-function getPostCover (id, block) {
+function getPostCover(id, block) {
   const pageCover = block[id].value?.format?.page_cover
   if (pageCover) {
     if (pageCover.startsWith('/')) return 'https://www.notion.so' + pageCover
@@ -78,7 +79,7 @@ function getPostCover (id, block) {
  * @param {*} param0
  * @returns
  */
-export async function getAllPostCount ({ notionPageData, from }) {
+export async function getAllPostCount({ notionPageData, from }) {
   if (!notionPageData) {
     notionPageData = await getNotionPageData({ from })
   }

lib/notion/getPageProperties.js

@@ -1,7 +1,7 @@
 import { getTextContent, getDateValue } from 'notion-utils'
 import { NotionAPI } from 'notion-client'
 
-async function getPageProperties (id, block, schema, authToken) {
+async function getPageProperties(id, block, schema, authToken) {
   const rawProperties = Object.entries(block?.[id]?.value?.properties || [])
   const excludeProperties = ['date', 'select', 'multi_select', 'person']
   const properties = {}

lib/notion/getPostBlocks.js

@@ -2,7 +2,7 @@ import BLOG from '@/blog.config'
 import { NotionAPI } from 'notion-client'
 import { getDataFromCache, setDataToCache } from '@/lib/cache/cache_manager'
 
-export async function getPostBlocks (id, from, slice, retryCount = 3) {
+export async function getPostBlocks(id, from, slice, retryCount = 3) {
   const cacheKey = 'page_block_' + id
   let pageBlock = await getDataFromCache(cacheKey)
   if (pageBlock) {
@@ -32,13 +32,13 @@ export async function getPostBlocks (id, from, slice, retryCount = 3) {
 }
 
 /**
- *
+ * 获取到的blockMap删除不需要的字段
  * @param {*} id 页面ID
  * @param {*} pageBlock 页面元素
  * @param {*} slice 截取数量
  * @returns
  */
-function filterPostBlocks (id, pageBlock, slice) {
+function filterPostBlocks(id, pageBlock, slice) {
   const clonePageBlock = deepClone(pageBlock)
   let count = 0
 
@@ -51,8 +51,6 @@ function filterPostBlocks (id, pageBlock, slice) {
     count++
     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
@@ -67,7 +65,7 @@ function filterPostBlocks (id, pageBlock, slice) {
   return clonePageBlock
 }
 
-function deepClone (obj) {
+function deepClone(obj) {
   const newObj = Array.isArray(obj) ? [] : {}
   if (obj && typeof obj === 'object') {
     for (const key in obj) {

themes/example/LayoutSlug.js

@@ -2,6 +2,9 @@ import { getPageTableOfContents } from 'notion-utils'
 import LayoutBase from './LayoutBase'
 import { ArticleLock } from './components/ArticleLock'
 import NotionPage from '@/components/NotionPage'
+import Link from 'next/link'
+import { useGlobal } from '@/lib/global'
+import formatDate from '@/lib/formatDate'
 
 export const LayoutSlug = props => {
   const { post, lock, validPassword } = props
@@ -10,6 +13,9 @@ export const LayoutSlug = props => {
     post.toc = getPageTableOfContents(post, post.blockMap)
   }
 
+  const { locale } = useGlobal()
+  const date = formatDate(post?.date?.start_date || post.createdTime, locale.LOCALE)
+
   return (
     <LayoutBase {...props}>
       <div>
@@ -18,6 +24,42 @@ export const LayoutSlug = props => {
         {lock && <ArticleLock password={post.password} validPassword={validPassword} />}
 
         {!lock && <section id="notion-article" className="px-1">
+          <section className="flex-wrap flex mt-2 text-gray-400 dark:text-gray-400 font-light leading-8">
+            <div>
+              <Link href={`/category/${post.category}`} passHref>
+                <a className="cursor-pointer text-md mr-2 hover:text-black dark:hover:text-white border-b dark:border-gray-500 border-dashed">
+                  <i className="mr-1 fas fa-folder-open" />
+                  {post.category}
+                </a>
+              </Link>
+              <span className='mr-2'>|</span>
+
+              {post.type[0] !== 'Page' && (<>
+                <Link
+                  href={`/archive#${post?.date?.start_date?.substr(0, 7)}`}
+                  passHref
+                >
+                  <a className="pl-1 mr-2 cursor-pointer hover:text-gray-700 dark:hover:text-gray-200 border-b dark:border-gray-500 border-dashed">
+                    {date}
+                  </a>
+                </Link>
+                <span className='mr-2'>|</span>
+                <span className='mx-2 text-gray-400 dark:text-gray-500'>
+                  {locale.COMMON.LAST_EDITED_TIME}: {post.lastEditedTime}
+                </span>
+                <span className='mr-2'>|</span>
+
+              </>)}
+
+              <span className="hidden busuanzi_container_page_pv font-light mr-2">
+                <i className='mr-1 fas fa-eye' />
+                &nbsp;
+                <span className="mr-2 busuanzi_value_page_pv" />
+              </span>
+            </div>
+
+          </section>
+
           {post.blockMap && <NotionPage post={post} />}
         </section>}
 

themes/fukasawa/components/ArticleDetail.js

@@ -51,13 +51,15 @@ export default function ArticleDetail({ post, recommendPosts, prev, next }) {
                 </a>
               </Link>
               <span className='mr-2'>|</span>
+              <span className='mx-2 text-gray-400 dark:text-gray-500'>
+                {locale.COMMON.LAST_EDITED_TIME}: {post.lastEditedTime}
+              </span>
             </>)}
 
-            <div className="hidden busuanzi_container_page_pv font-light mr-2">
+            <div className=" busuanzi_container_page_pv font-light mr-2">
               <i className='mr-1 fas fa-eye' />
               &nbsp;
               <span className="mr-2 busuanzi_value_page_pv" />
-              <span className='mr-2'>|</span>
             </div>
           </div>
 

themes/hexo/components/HeaderArticle.js

@@ -3,7 +3,7 @@ import { useGlobal } from '@/lib/global'
 import formatDate from '@/lib/formatDate'
 import { useEffect } from 'react'
 
-export default function HeaderArticle ({ post, siteInfo }) {
+export default function HeaderArticle({ post, siteInfo }) {
   const headerImage = post?.page_cover ? `url("${post.page_cover}")` : `url("${siteInfo?.pageCover}")`
   const { isDarkMode } = useGlobal()
 
@@ -47,52 +47,53 @@ export default function HeaderArticle ({ post, siteInfo }) {
   }
 
   return (
-      <div
-        id="header"
-        className="w-full h-96 relative md:flex-shrink-0 overflow-hidden bg-cover bg-center bg-no-repeat animate__animated animate__fadeIn"
-        style={{ backgroundImage: headerImage }}
-      >
-        <header className="animate__slideInDown animate__animated bg-black bg-opacity-70 absolute top-0 w-full h-96 py-10 flex justify-center items-center font-sans">
-          <div className='mt-24'>
-            {/* 文章Title */}
-            <div className="font-bold text-xl shadow-text flex justify-center text-white dark:text-white font-sans">
-              {post.title}
-            </div>
+    <div
+      id="header"
+      className="w-full h-96 relative md:flex-shrink-0 overflow-hidden bg-cover bg-center bg-no-repeat animate__animated animate__fadeIn"
+      style={{ backgroundImage: headerImage }}
+    >
+      <header className="animate__slideInDown animate__animated bg-black bg-opacity-70 absolute top-0 w-full h-96 py-10 flex justify-center items-center font-sans">
+        <div className='mt-24'>
+          {/* 文章Title */}
+          <div className="font-bold text-xl shadow-text flex justify-center text-white dark:text-white font-sans">
+            {post.title}
+          </div>
 
-            <section className="flex-wrap shadow-text flex text-sm justify-center mt-2 text-white dark:text-gray-400 font-light leading-8">
-              <div className='dark:text-gray-200'>
-                {post.category && <>
-                  <Link href={`/category/${post.category}`} passHref>
-                  <a className="cursor-pointer mr-2 dark:hover:text-white border-b dark:border-gray-500 border-dashed">
+          <section className="flex-wrap shadow-text flex text-sm justify-center mt-2 text-white dark:text-gray-400 font-light leading-8">
+            <div className='dark:text-gray-200'>
+              {post.category && <>
+                <Link href={`/category/${post.category}`} passHref>
+                  <div className="cursor-pointer mr-2 dark:hover:text-white border-b dark:border-gray-500 border-dashed">
                     <i className="mr-1 fas fa-folder-open" />
                     {post.category}
-                  </a>
+                  </div>
+                </Link>
+              </>}
+            </div>
+            <div className='flex justify-center'>
+              {post.type[0] !== 'Page' && (
+                <>
+                  <Link
+                    href={`/archive#${post?.date?.start_date?.substr(0, 7)}`}
+                    passHref
+                  >
+                    <a className="pl-1 mr-2 cursor-pointer border-b dark:border-gray-500 border-dashed">
+                      {locale.COMMON.POST_TIME}: {date}
+                    </a>
                   </Link>
-                  <span className="mr-2">|</span>
-                </>}
-
-                {post.type[0] !== 'Page' && (
-                  <>
-                    <Link
-                      href={`/archive#${post?.date?.start_date?.substr(0, 7)}`}
-                      passHref
-                    >
-                      <a className="pl-1 mr-2 cursor-pointer hover:underline border-b dark:border-gray-500 border-dashed">
-                      <i className="far fa-calendar-alt mr-1"/> {date}
-                      </a>
-                    </Link>
-                  </>
-                )}
-
-                <div className="hidden busuanzi_container_page_pv font-light mr-2">
-                  <span className="mr-2">|</span>
-                  <span className="mr-2 busuanzi_value_page_pv" />
-                  次访问
-                </div>
+                </>
+              )}
+              <div className="pl-1 mr-2">
+                {locale.COMMON.LAST_EDITED_TIME}: {post.lastEditedTime}
               </div>
-            </section>
-          </div>
-        </header>
-      </div>
+            </div>
+            <div className=" busuanzi_container_page_pv font-light mr-2">
+              <span className="mr-2 busuanzi_value_page_pv" />
+              次访问
+            </div>
+          </section>
+        </div>
+      </header>
+    </div>
   )
 }

themes/medium/components/ArticleDetail.js

@@ -37,6 +37,9 @@ export const ArticleDetail = props => {
         </>
       </Link>
       <div className="text-gray-500">{date}</div>
+      <div className='mx-2 text-gray-300 dark:text-gray-600'>
+        {locale.COMMON.LAST_EDITED_TIME}: {post.lastEditedTime}
+      </div>
       <div className="hidden busuanzi_container_page_pv text-gray-500 font-light mr-2">
         <i className="ml-3 mr-0.5 fas fa-eye" />
         &nbsp;

themes/next/components/ArticleDetail.js

@@ -42,7 +42,7 @@ export default function ArticleDetail(props) {
         </div>
 
         <section className="flex-wrap flex mt-2 text-gray-400 dark:text-gray-400 font-light leading-8">
-          <div>
+          <div className='flex  flex-wrap'>
             {post.category && <>
               <Link href={`/category/${post.category}`} passHref>
                 <a className="cursor-pointer text-md mr-2 hover:text-black dark:hover:text-white border-b dark:border-gray-500 border-dashed">
@@ -61,19 +61,23 @@ export default function ArticleDetail(props) {
                 </a>
               </Link>
               <span className='mr-2'>|</span>
+              <div className="hidden busuanzi_container_page_pv font-light mr-2">
+                <i className='mr-1 fas fa-eye' />
+                &nbsp;
+                <span className="mr-2 busuanzi_value_page_pv" />
+              </div>
+
             </>)}
 
-            <div className="hidden busuanzi_container_page_pv font-light mr-2">
-              <i className='mr-1 fas fa-eye' />
-              &nbsp;
-              <span className="mr-2 busuanzi_value_page_pv" />
-              <span className='mr-2'>|</span>
-            </div>
           </div>
+
+          <div className='mr-2'>
+            <i className='far fa-clock mr-2' />{locale.COMMON.LAST_EDITED_TIME} {post.lastEditedTime}
+          </div>
+
           <div className='flex flex-nowrap whitespace-nowrap items-center font-light text-md'>
             <WordCount />
           </div>
-
         </section>
 
       </header>}