Merge pull request tangly1024#2834 from tangly1024/fix/custom-menu

修复菜单自定义名的bug
MingIXu · Oct 8, 2024 · eed528a · eed528a
2 parents 0dd7548 + 1f255c5
commit eed528a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/lib/db/getSiteData.js b/lib/db/getSiteData.js
@@ -275,16 +275,15 @@ function getCustomMenu({ collectionData, NOTION_CONFIG }) {
   const menuPages = collectionData.filter(
     post =>
       post.status === 'Published' &&
-      (post?.type === BLOG.NOTION_PROPERTY_NAME.type_menu ||
-        post?.type === BLOG.NOTION_PROPERTY_NAME.type_sub_menu)
+      (post?.type === 'Menu' || post?.type === 'SubMenu')
   )
   const menus = []
   if (menuPages && menuPages.length > 0) {
     menuPages.forEach(e => {
       e.show = true
-      if (e.type === BLOG.NOTION_PROPERTY_NAME.type_menu) {
+      if (e.type === 'Menu') {
         menus.push(e)
-      } else if (e.type === BLOG.NOTION_PROPERTY_NAME.type_sub_menu) {
+      } else if (e.type === 'SubMenu') {
         const parentMenu = menus[menus.length - 1]
         if (parentMenu) {
           if (parentMenu.subMenus) {

diff --git a/lib/notion/getPageProperties.js b/lib/notion/getPageProperties.js
@@ -149,20 +149,25 @@ function convertToJSON(str) {
  * 映射用户自定义表头
  */
 function mapProperties(properties) {
-  if (properties?.type === BLOG.NOTION_PROPERTY_NAME.type_post) {
-    properties.type = 'Post'
+  const typeMap = {
+    [BLOG.NOTION_PROPERTY_NAME.type_post]: 'Post',
+    [BLOG.NOTION_PROPERTY_NAME.type_page]: 'Page',
+    [BLOG.NOTION_PROPERTY_NAME.type_notice]: 'Notice',
+    [BLOG.NOTION_PROPERTY_NAME.type_menu]: 'Menu',
+    [BLOG.NOTION_PROPERTY_NAME.type_sub_menu]: 'SubMenu'
   }
-  if (properties?.type === BLOG.NOTION_PROPERTY_NAME.type_page) {
-    properties.type = 'Page'
-  }
-  if (properties?.type === BLOG.NOTION_PROPERTY_NAME.type_notice) {
-    properties.type = 'Notice'
+
+  const statusMap = {
+    [BLOG.NOTION_PROPERTY_NAME.status_publish]: 'Published',
+    [BLOG.NOTION_PROPERTY_NAME.status_invisible]: 'Invisible'
   }
-  if (properties?.status === BLOG.NOTION_PROPERTY_NAME.status_publish) {
-    properties.status = 'Published'
+
+  if (properties?.type && typeMap[properties.type]) {
+    properties.type = typeMap[properties.type]
   }
-  if (properties?.status === BLOG.NOTION_PROPERTY_NAME.status_invisible) {
-    properties.status = 'Invisible'
+
+  if (properties?.status && statusMap[properties.status]) {
+    properties.status = statusMap[properties.status]
   }
 }