Merge branch 'main' of https://github.com/tangly1024/NotionNext

Author: actions-user

components/NotionPage.js

@@ -31,7 +31,7 @@ const NotionPage = ({ post, className }) => {
   // 页面首次打开时执行的勾子
   useEffect(() => {
     // 检测当前的url并自动滚动到对应目标
-    autoScrollToTarget()
+    autoScrollToHash()
   }, [])
 
   // 页面文章发生变化时会执行的勾子
@@ -144,9 +144,9 @@ const processGalleryImg = zoom => {
 }
 
 /**
- * 根据url参数自动滚动到指定区域
+ * 根据url参数自动滚动到锚位置
  */
-const autoScrollToTarget = () => {
+const autoScrollToHash = () => {
   setTimeout(() => {
     // 跳转到指定标题
     const needToJumpToTitle = window.location.hash

lib/config.js

@@ -2,7 +2,7 @@
 
 import BLOG from '@/blog.config'
 import { useGlobal } from './global'
-import { deepClone } from './utils'
+import { deepClone, isUrl } from './utils'
 
 /**
  * 读取配置顺序
@@ -32,6 +32,8 @@ export const siteConfig = (key, defaultVal = null, extendConfig = {}) => {
     case 'POST_LIST_STYLE':
     case 'POST_LIST_PREVIEW':
     case 'POST_URL_PREFIX_MAPPING_CATEGORY':
+    case 'IS_TAG_COLOR_DISTINGUISHED':
+    case 'TAG_SORT_BY_COUNT':
       return convertVal(extendConfig[key] || defaultVal || BLOG[key])
     default:
   }
@@ -89,46 +91,62 @@ export const siteConfig = (key, defaultVal = null, extendConfig = {}) => {
     return defaultVal
   }
 
-  // 从Notion_CONFIG读取的配置通常都是字符串，适当转义
   return convertVal(val)
 }
 
 /**
- * 配置默认都是string类型；
- * 识别配置的值是否数字、布尔、[]数组，若是则转成对应类型
+ * 从环境变量和NotionConfig读取的配置都是string类型；
+ * 这里识别出配置的字符值若为否 数字、布尔、[]数组，{}对象，若是则转成对应类型
+ * 使用JSON和eval两个函数
  * @param {*} val
  * @returns
  */
 export const convertVal = val => {
-  if (typeof val === 'string') {
-    // 解析布尔
-    if (val === 'true' || val === 'false') {
-      return JSON.parse(val)
-    }
+  // 如果传入参数本身就是obj、数组、boolean 就无需处理
+  if (typeof val !== 'string' || !val) {
+    return val
+  }
 
-    // 解析数字，parseInt将字符串转换为数字
-    if (/^\d+$/.test(val)) {
-      return parseInt(val)
-    }
-    //  转移 [] , {} 这种json串为json对象
-    try {
-      const parsedJson = JSON.parse(val)
-      // 检查解析后的结果是否是对象或数组
-      if (typeof parsedJson === 'object' && parsedJson !== null) {
-        return parsedJson
-      }
-    } catch (error) {
-      // JSON 解析失败，返回原始字符串值
-      return val
-    }
+  // 解析数字，parseInt将字符串转换为数字
+  if (/^\d+$/.test(val)) {
+    return parseInt(val)
   }
 
-  try {
+  // 检测是否url
+  if (isUrl(val)) {
+    return val
+  }
+  // 检测是否url
+  if (val === 'true' || val === 'false') {
     return JSON.parse(val)
+  }
+
+  // 配置值前可能有污染的空格
+  if (!val.indexOf('[') > 0 || val.indexOf('{')) {
+    return val
+  }
+
+  // 转换 [] , {} , true/false 这类字符串为对象
+  try {
+    // 尝试解析json
+    const parsedJson = JSON.parse(val)
+    if (parsedJson !== null) {
+      return parsedJson
+    }
   } catch (error) {
-    // 如果值是一个字符串但不是有效的 JSON 格式，直接返回字符串
+    // try {
+    //   // 尝试解析对象,对象解析能力不如上一步的json
+    //   const evalObj = eval('(' + val + ')')
+    //   if (evalObj !== null) {
+    //     return evalObj
+    //   }
+    // } catch (error) {
+    //   // Ojbject 解析失败，返回原始字符串值
+    //   return val
+    // }
     return val
   }
+  return val
 }
 
 /**

lib/notion/convertInnerUrl.js

@@ -8,8 +8,15 @@ import { checkStrIsNotionId, getLastPartOfUrl, isBrowser } from '../utils'
  */
 export const convertInnerUrl = allPages => {
   if (isBrowser) {
+    const allAnchorTags = document
+      ?.getElementById('notion-article')
+      ?.getElementsByTagName('a')
+
+    if (!allAnchorTags) {
+      return
+    }
     const currentURL = window.location.origin + window.location.pathname
-    const allAnchorTags = document.getElementsByTagName('a') // 或者使用 document.querySelectorAll('a') 获取 NodeList
+    // url替换成slug
     for (const anchorTag of allAnchorTags) {
       // 检查url
       if (anchorTag?.href) {
@@ -24,20 +31,19 @@ export const convertInnerUrl = allPages => {
           }
         }
       }
+    }
 
-      for (const anchorTag of allAnchorTags) {
-        if (anchorTag?.target === '_blank') {
-          const hrefWithoutQueryHash = anchorTag.href
-            .split('?')[0]
-            .split('#')[0]
-          const hrefWithRelativeHash =
-            currentURL.split('#')[0] || '' + anchorTag.href.split('#')[1] || ''
-          if (
-            currentURL === hrefWithoutQueryHash ||
-            currentURL === hrefWithRelativeHash
-          ) {
-            anchorTag.target = '_self'
-          }
+    // 链接在当前页面打开
+    for (const anchorTag of allAnchorTags) {
+      if (anchorTag?.target === '_blank') {
+        const hrefWithoutQueryHash = anchorTag.href.split('?')[0].split('#')[0]
+        const hrefWithRelativeHash =
+          currentURL.split('#')[0] || '' + anchorTag.href.split('#')[1] || ''
+        if (
+          currentURL === hrefWithoutQueryHash ||
+          currentURL === hrefWithRelativeHash
+        ) {
+          anchorTag.target = '_self'
         }
       }
     }

lib/notion/getPageProperties.js

@@ -6,10 +6,12 @@ import formatDate from '../utils/formatDate'
 import md5 from 'js-md5'
 import { siteConfig } from '../config'
 import {
-  checkContainHttp,
+  checkStartWithHttp,
   convertUrlStartWithOneSlash,
+  getLastSegmentFromUrl,
   sliceUrlFromHttp
 } from '../utils'
+import { extractLangPrefix } from '../utils/pageId'
 import { mapImgUrl } from './mapImage'
 
 /**
@@ -197,7 +199,7 @@ export function adjustPageProperties(properties, NOTION_CONFIG) {
   }
 
   // 检查处理外链
-  properties.href = checkContainHttp(properties?.href)
+  properties.href = checkStartWithHttp(properties?.href)
     ? sliceUrlFromHttp(properties?.href)
     : convertUrlStartWithOneSlash(properties?.href)
 
@@ -208,6 +210,18 @@ export function adjustPageProperties(properties, NOTION_CONFIG) {
     properties.target = '_self'
   }
 
+  // 如果跳转链接是多语言，则在新窗口打开
+  if (BLOG.NOTION_PAGE_ID.indexOf(',') > 0) {
+    const siteIds = BLOG.NOTION_PAGE_ID.split(',')
+    for (let index = 0; index < siteIds.length; index++) {
+      const siteId = siteIds[index]
+      const prefix = extractLangPrefix(siteId)
+      if (getLastSegmentFromUrl(properties.href) === prefix) {
+        properties.target = '_blank'
+      }
+    }
+  }
+
   // 密码字段md5
   properties.password = properties.password
     ? md5(properties.slug + properties.password)

lib/utils/index.js

@@ -81,8 +81,21 @@ export function convertUrlStartWithOneSlash(str) {
   return str
 }
 
+/**
+ * 是否是一个相对或绝对路径的ur类
+ * @param {*} str
+ * @returns
+ */
+export function isUrl(str) {
+  if (!str) {
+    return false
+  }
+
+  return str?.indexOf('/') === 0 || checkStartWithHttp(str)
+}
+
 // 检查是否外链
-export function checkContainHttp(str) {
+export function checkStartWithHttp(str) {
   // 检查字符串是否包含http
   if (str?.includes('http:') || str?.includes('https:')) {
     // 如果包含，找到http的位置
@@ -354,3 +367,19 @@ export const scanAndConvertToLinks = node => {
     }
   }
 }
+
+/**
+ * 获取url最后一个斜杆后面的内容
+ * @param {*} url
+ * @returns
+ */
+export function getLastSegmentFromUrl(url) {
+  if (!url) {
+    return ''
+  }
+  // 去掉 URL 中的查询参数部分
+  const trimmedUrl = url.split('?')[0]
+  // 获取最后一个斜杠后面的内容
+  const segments = trimmedUrl.split('/')
+  return segments[segments.length - 1]
+}

lib/utils/post.js

@@ -1,7 +1,7 @@
 /**
  * 文章相关工具
  */
-import { checkContainHttp } from '.'
+import { checkStartWithHttp } from '.'
 
 /**
  * 获取文章的关联推荐文章列表，目前根据标签关联性筛选
@@ -50,7 +50,7 @@ export function checkSlugHasNoSlash(row) {
   }
   return (
     (slug.match(/\//g) || []).length === 0 &&
-    !checkContainHttp(slug) &&
+    !checkStartWithHttp(slug) &&
     row.type.indexOf('Menu') < 0
   )
 }
@@ -67,7 +67,7 @@ export function checkSlugHasOneSlash(row) {
   }
   return (
     (slug.match(/\//g) || []).length === 1 &&
-    !checkContainHttp(slug) &&
+    !checkStartWithHttp(slug) &&
     row.type.indexOf('Menu') < 0
   )
 }
@@ -85,6 +85,6 @@ export function checkSlugHasMorThanTwoSlash(row) {
   return (
     (slug.match(/\//g) || []).length >= 2 &&
     row.type.indexOf('Menu') < 0 &&
-    !checkContainHttp(slug)
+    !checkStartWithHttp(slug)
   )
 }

themes/heo/components/Header.js

@@ -144,11 +144,9 @@ const Header = props => {
             ${fixedNav ? 'fixed' : 'relative bg-transparent'} 
             ${textWhite ? 'text-white ' : 'text-black dark:text-white'}  
             ${navBgWhite ? 'bg-white dark:bg-[#18171d] shadow' : 'bg-transparent'}`}>
-        <div className='flex h-full mx-auto justify-between items-center max-w-[86rem] px-8'>
+        <div className='flex h-full mx-auto justify-between items-center max-w-[86rem] px-6'>
           {/* 左侧logo */}
-          <div className='flex'>
-            <Logo {...props} />
-          </div>
+          <Logo {...props} />
 
           {/* 中间菜单 */}
           <div

themes/heo/components/Hero.js

@@ -162,24 +162,31 @@ function TagsGroupBar() {
  * @returns
  */
 function GroupMenu() {
+  const url_1 = siteConfig('HEO_HERO_CATEGORY_1', {}, CONFIG)?.url || ''
+  const title_1 = siteConfig('HEO_HERO_CATEGORY_1', {}, CONFIG)?.title || ''
+  const url_2 = siteConfig('HEO_HERO_CATEGORY_2', {}, CONFIG)?.url || ''
+  const title_2 = siteConfig('HEO_HERO_CATEGORY_2', {}, CONFIG)?.title || ''
+  const url_3 = siteConfig('HEO_HERO_CATEGORY_3', {}, CONFIG)?.url || ''
+  const title_3 = siteConfig('HEO_HERO_CATEGORY_3', {}, CONFIG)?.title || ''
+
   return (
     <div className='h-[165px] select-none xl:h-20 flex flex-col justify-between xl:space-y-0 xl:flex-row w-28 lg:w-48 xl:w-full xl:flex-nowrap xl:space-x-3'>
       <Link
-        href={siteConfig('HEO_HERO_CATEGORY_1', null, CONFIG)?.url}
+        href={url_1}
         className='group relative overflow-hidden bg-gradient-to-r from-blue-500 to-blue-400 flex h-20 justify-start items-center text-white rounded-xl xl:hover:w-1/2 xl:w-1/3 transition-all duration-500 ease-in'>
         <div className='font-bold lg:text-lg  pl-5 relative -mt-2'>
-          {siteConfig('HEO_HERO_CATEGORY_1', null, CONFIG)?.title}
+          {title_1}
           <span className='absolute -bottom-0.5 left-5 w-5 h-0.5 bg-white rounded-full'></span>
         </div>
         <div className='hidden lg:block absolute right-6  duration-700 ease-in-out transition-all scale-[2] translate-y-6 rotate-12 opacity-20 group-hover:opacity-80 group-hover:scale-100 group-hover:translate-y-0 group-hover:rotate-0'>
           <i className='fa-solid fa-star text-4xl'></i>
         </div>
       </Link>
       <Link
-        href={siteConfig('HEO_HERO_CATEGORY_2', null, CONFIG)?.url}
+        href={url_2}
         className='group relative overflow-hidden bg-gradient-to-r from-red-500 to-yellow-500 flex h-20 justify-start items-center text-white rounded-xl xl:hover:w-1/2 xl:w-1/3 transition-all duration-500 ease-in'>
         <div className='font-bold lg:text-lg pl-5 relative -mt-2'>
-          {siteConfig('HEO_HERO_CATEGORY_2', null, CONFIG)?.title}
+          {title_2}
           <span className='absolute -bottom-0.5 left-5 w-5 h-0.5 bg-white rounded-full'></span>
         </div>
         <div className='hidden lg:block absolute right-6  duration-700 ease-in-out transition-all scale-[2] translate-y-6 rotate-12 opacity-20 group-hover:opacity-80 group-hover:scale-100 group-hover:translate-y-0 group-hover:rotate-0'>
@@ -188,10 +195,10 @@ function GroupMenu() {
       </Link>
       {/* 第三个标签在小屏上不显示 */}
       <Link
-        href={siteConfig('HEO_HERO_CATEGORY_3', null, CONFIG)?.url}
+        href={url_3}
         className='group relative overflow-hidden bg-gradient-to-r from-teal-300 to-cyan-300 hidden h-20 xl:flex justify-start items-center text-white rounded-xl xl:hover:w-1/2 xl:w-1/3 transition-all duration-500 ease-in'>
         <div className='font-bold text-lg pl-5 relative -mt-2'>
-          {siteConfig('HEO_HERO_CATEGORY_3', null, CONFIG)?.title}
+          {title_3}
           <span className='absolute -bottom-0.5 left-5 w-5 h-0.5 bg-white rounded-full'></span>
         </div>
         <div className='absolute right-6 duration-700 ease-in-out transition-all scale-[2] translate-y-6 rotate-12 opacity-20 group-hover:opacity-80 group-hover:scale-100 group-hover:translate-y-0 group-hover:rotate-0'>