From 5e3e8713acc48119b1b20c25183fd18fb4c481ea Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Thu, 13 Feb 2025 09:52:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=89=E5=BA=8F=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=97=A0=E6=B3=95=E8=A7=A3=E6=9E=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/extension/marked/pageforge-marked.js | 10 +---------
 package.json                             |  2 +-
 templates/components/list-item.js        | 15 ++-------------
 templates/components/list.js             | 12 ++++++++++--
 4 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/lib/extension/marked/pageforge-marked.js b/lib/extension/marked/pageforge-marked.js
index cc22ee7..ed61433 100644
--- a/lib/extension/marked/pageforge-marked.js
+++ b/lib/extension/marked/pageforge-marked.js
@@ -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);
     },
 
diff --git a/package.json b/package.json
index b5b0d94..424eb51 100644
--- a/package.json
+++ b/package.json
@@ -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": {
diff --git a/templates/components/list-item.js b/templates/components/list-item.js
index 71da710..a873881 100644
--- a/templates/components/list-item.js
+++ b/templates/components/list-item.js
@@ -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>`;
 };
\ No newline at end of file
diff --git a/templates/components/list.js b/templates/components/list.js
index 3a80341..2e634d9 100644
--- a/templates/components/list.js
+++ b/templates/components/list.js
@@ -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}>
     `;