Skip to content

Commit

Permalink
Merge pull request #52 from devlive-community/dev-archive
Browse files Browse the repository at this point in the history
修复有序列表无法解析问题
  • Loading branch information
qianmoQ authored Feb 13, 2025
2 parents c05e5e7 + 5e3e871 commit 2607d80
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 25 deletions.
10 changes: 1 addition & 9 deletions lib/extension/marked/pageforge-marked.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,8 @@ const renderer = {
: ('escaped' in item && item.escaped ? item.text : loadComponent('span', {text: item.text}));
},

link(item) {
return loadComponent('a', {
...item,
raw: item.raw // 保留原始 markdown 文本
});
},

listitem(item) {
item.text = this.parser.parse(item.tokens, !!item.loose)

item.text = this.parser.parse(item.tokens, !!item.loose);
return loadComponent('list-item', item);
},

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pageforge",
"version": "2025.1.5",
"version": "2025.1.6",
"description": "PageForge 是一款现代化的静态页面生成与部署平台,旨在帮助用户快速创建精美的静态网站,并一键部署到 GitHub Pages。 无论是个人博客、项目文档还是企业官网,PageForge 都能让你轻松实现高效构建、智能部署和即时上线。",
"homepage": "https://pageforge.devlive.org",
"repository": {
Expand Down
15 changes: 2 additions & 13 deletions templates/components/list-item.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,14 @@
const {loadComponent} = require('../../lib/component-loader');

module.exports = function template(item) {
let listItemContent;

if (item.task) {
// 处理任务列表项
const text = item.text.replace(/\[([\sx])\]/g, '').trim();
const checkbox = loadComponent('checkbox', {
checked: item.checked,
text: text
});
listItemContent = `<li class="mb-2 flex items-start">${checkbox}</li>`;
}
else {
// 处理普通列表项
listItemContent = `
<li class="mb-2 flex gap-2 text-gray-700 leading-relaxed hover:text-gray-900">
<span class="text-gray-600 text-xl select-none w-4">•</span>
<span class="flex-1 w-[calc(100%-1rem)]">${item.text}</span>
</li>`;
return `<li class="mb-2 flex items-start">${checkbox}</li>`;
}

return listItemContent;
return `<li class="mb-2 text-gray-700">${item.text}</li>`;
};
12 changes: 10 additions & 2 deletions templates/components/list.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
module.exports = function template(item) {
const type = item.ordered ? 'ol' : 'ul';
const listClasses = 'my-4 pl-4 list-inside ' + (item.ordered ? 'list-decimal' : 'list-disc');

// 移除 list-inside 类,让数字显示在外部
const listClasses = ['my-4', 'pl-8'];
if (item.ordered) {
listClasses.push('list-decimal');
}
else {
listClasses.push('list-disc');
}

return `
<${type} class="${listClasses}">
<${type} class="${listClasses.join(' ')}">
${item.body}
</${type}>
`;
Expand Down

0 comments on commit 2607d80

Please sign in to comment.