From 091dd14eb6c4423469a4c5584ceb132855dfee48 Mon Sep 17 00:00:00 2001 From: xaoxuu Date: Sun, 17 Dec 2023 19:39:23 +0800 Subject: [PATCH] [opt] wiki --- languages/zh-CN.yml | 2 +- languages/zh-TW.yml | 2 +- layout/_partial/main/post_list/wiki_card.ejs | 7 ++-- layout/_partial/widgets/related.ejs | 33 +++++++------------ layout/index.ejs | 13 ++++---- scripts/events/lib/doc_tree.js | 34 ++++++++++++++------ source/css/_layout/list.styl | 2 ++ source/js/main.js | 1 - 8 files changed, 51 insertions(+), 43 deletions(-) diff --git a/languages/zh-CN.yml b/languages/zh-CN.yml index 49af285..568ac08 100755 --- a/languages/zh-CN.yml +++ b/languages/zh-CN.yml @@ -23,7 +23,7 @@ meta: related_posts: 您可能感兴趣的文章 comment_title: 快来参与讨论吧 back_to_top: 回到顶部 - more: '更多%s' + more: '更多「%s」' created: 发布于 updated: 更新于 license: 许可协议 diff --git a/languages/zh-TW.yml b/languages/zh-TW.yml index f49a3dc..f2e49ae 100755 --- a/languages/zh-TW.yml +++ b/languages/zh-TW.yml @@ -23,7 +23,7 @@ meta: related_posts: 您可能感興趣的文章 comment_title: 參與討論 back_to_top: 回到頁首 - more: '更多%s' + more: '更多「%s」' created: 發布於 updated: 更新於 license: 授權條款 diff --git a/layout/_partial/main/post_list/wiki_card.ejs b/layout/_partial/main/post_list/wiki_card.ejs index de80573..b75b7dc 100644 --- a/layout/_partial/main/post_list/wiki_card.ejs +++ b/layout/_partial/main/post_list/wiki_card.ejs @@ -13,8 +13,11 @@ function layoutDiv() { } el += '
'; if (proj.tags && proj.tags.length > 0) { - let tag = proj.tags[0]; - el += '
' + tag + '
'; + el += '
'; + for (let tag of proj.tags) { + el += '' + tag + ''; + } + el += '
'; } el += '

' + (proj.title || proj.name) + '

'; if (proj.description) { diff --git a/layout/_partial/widgets/related.ejs b/layout/_partial/widgets/related.ejs index ae247fe..deafec0 100644 --- a/layout/_partial/widgets/related.ejs +++ b/layout/_partial/widgets/related.ejs @@ -3,34 +3,25 @@ function layoutDiv() { if (page.layout !== "wiki") { return ''; } - var related = []; - const { shelf, tree } = theme.wiki; - let proj = tree[page.wiki]; - if (proj?.related?.length > 0) { - proj.related.filter(pid => shelf.includes(pid)).forEach((pid, i) => { - let p = tree[pid]; - if (p && p.title !== proj?.title && p.homepage) { - related.push(p); - } - }); + let thisItemObject = theme.wiki.tree[page.wiki]; + if (thisItemObject == null) { + return ''; } + const relatedItems = thisItemObject.relatedItems; var el = ''; - if (related.length > 0) { + for (let relatedItem of relatedItems) { el += ''; el += '
'; - var title = __('btn.wiki'); - if (proj.tags && proj.tags[0]) { - title = proj.tags[0]; - } - el += '' + __('meta.more', title) + ''; + el += '' + __('meta.more', relatedItem.name) + ''; el += '
'; el += '
'; - for (let p of related) { + for (let id of relatedItem.items) { // 同一个分组中的其它项目 - el += ''; - el += '' + p.title + ''; - if (p.description && p.description.length > 0) { - el += '' + p.description + ''; + let item = theme.wiki.tree[id]; + el += ''; + el += '' + item.title + ''; + if (item.description && item.description.length > 0) { + el += '' + item.description + ''; } el += ''; } diff --git a/layout/index.ejs b/layout/index.ejs index 517ed50..fa33141 100755 --- a/layout/index.ejs +++ b/layout/index.ejs @@ -22,7 +22,7 @@ function layout_post_card(layout, post, content) { return el; } -function layout_posts(partial) { +function layout_post_list(partial) { var el = ''; el += '
'; if (is_home()) { @@ -48,9 +48,8 @@ function layout_posts(partial) { return el; } -function layout_wikis(partial) { +function layout_wiki_list(partial) { var el = ''; - var wikis = []; const { shelf, tree } = theme.wiki; for (let pid of shelf) { let proj = tree[pid]; @@ -61,12 +60,12 @@ function layout_wikis(partial) { continue; } if (page.filter === false) { - // all wikis + // wikiList el += '
'; el += layout_post_card('wiki', proj.homepage, partial(proj)); el += '
'; } else if (proj.tags && proj.tags.includes(page.tagName) === true) { - // filtered wikis + // filtered wikiList el += '
'; el += layout_post_card('wiki', proj.homepage, partial(proj)); el += '
'; @@ -78,13 +77,13 @@ function layout_wikis(partial) { <% if (page.menu_id === 'post') { %> <%- partial('_partial/main/navbar/list_post') %> - <%- layout_posts(function(post){ + <%- layout_post_list(function(post){ return partial('_partial/main/post_list/post_card', {post: post}) }) %> <%- partial('_partial/main/post_list/paginator') %> <% } else if (page.menu_id === 'wiki') { %> <%- partial('_partial/main/navbar/list_wiki') %> - <%- layout_wikis(function(proj){ + <%- layout_wiki_list(function(proj){ return partial('_partial/main/post_list/wiki_card', {proj: proj}) }) %> <% } %> diff --git a/scripts/events/lib/doc_tree.js b/scripts/events/lib/doc_tree.js index 1d5736f..53e09ba 100644 --- a/scripts/events/lib/doc_tree.js +++ b/scripts/events/lib/doc_tree.js @@ -58,7 +58,9 @@ module.exports = ctx => { // wiki 所有页面 const wiki_pages = pages.filter(p => (p.layout === 'wiki')).map(p => new WikiPage(p)) const wiki_list = Object.keys(wiki.tree) - + // 上架的项目列表 + wiki.shelf = ctx.locals.get('data').wiki + // 数据整合：项目标签 var all_tag_name = [] for (let id of wiki_list) { @@ -158,17 +160,25 @@ module.exports = ctx => { // 全站所有的项目标签 var all_tags = {} all_tag_name.forEach((tag_name, i) => { - var subs = [] + var items = [] for (let id of wiki_list) { let item = wiki.tree[id] - if (item.tags && item.tags.includes(tag_name) === true && subs.includes(tag_name) === false) { - subs.push(item.id) + // 过滤掉找不到页面的项目 + if (item.homepage == null) { + continue + } + // 过滤掉未上架的项目 + if (!wiki.shelf.includes(item.id)) { + continue + } + if (item.tags && item.tags.includes(tag_name) === true && items.includes(tag_name) === false) { + items.push(item.id) } } all_tags[tag_name] = { name: tag_name, path: (ctx.config.wiki_dir || 'wiki') + '/tags/' + tag_name + '/index.html', - items: subs + items: items } }) @@ -176,13 +186,17 @@ module.exports = ctx => { for (let id of wiki_list) { let item = wiki.tree[id] if (item.tags) { - var related = [] + var relatedItems = [] item.tags.forEach((tag_name, i) => { - let tagObj = all_tags[tag_name] - related = related.concat(tagObj.items) - related = [...new Set(related)] + let relatedOtherItems = all_tags[tag_name].items.filter(name => name != item.id) + if (relatedOtherItems.length > 0) { + relatedItems.push({ + name: tag_name, + items: relatedOtherItems + }) + } }) - item.related = related + item.relatedItems = relatedItems } } diff --git a/source/css/_layout/list.styl b/source/css/_layout/list.styl index bb2f309..7ac9284 100644 --- a/source/css/_layout/list.styl +++ b/source/css/_layout/list.styl @@ -164,3 +164,5 @@ word-wrap: break-word p:last-child margin-bottom: 0 + .cap+.cap + margin-left: 4px \ No newline at end of file diff --git a/source/js/main.js b/source/js/main.js index c1f2350..98c4090 100644 --- a/source/js/main.js +++ b/source/js/main.js @@ -323,7 +323,6 @@ if (stellar.plugins.fancybox) { var needFancybox = document.querySelectorAll(selector).length !== 0; if (!needFancybox) { const els = document.getElementsByClassName('stellar-memos-api'); - console.log('els', els); if (els != undefined && els.length > 0) { needFancybox = true; }