Merge pull request #103 from devlive-community/refactor-nodejs

qianmoQ · web-flow · commit c9bd7d875f04 · 2025-09-28T21:51:19.000+08:00
Refactor nodejs
diff --git a/backend/models/book.js b/backend/models/book.js
@@ -8,15 +8,15 @@ class Book {
      * @returns {Promise<number>} 插入的书籍
      */
     static async create(bookData) {
-        const { title, description, cover_image, slug, user_id, status = 'draft', is_public = false } = bookData
+        const { title, description, cover_image, slug, user_id, status = 'draft', is_public = false, order_col = 'created_at', order_dir = 'desc' } = bookData
 
         try {
             const pool = getPool()
             const connection = await pool.getConnection()
 
             const [result] = await connection.execute(
-                'INSERT INTO books (title, description, cover_image, slug, user_id, status, is_public) VALUES (?, ?, ?, ?, ?, ?, ?)',
-                [title, description || null, cover_image || null, slug, user_id, status, is_public]
+                'INSERT INTO books (title, description, cover_image, slug, user_id, status, is_public, order_col, order_dir) VALUES (?, ?, ?, ?, ?, ?, ?)',
+                [title, description || null, cover_image || null, slug, user_id, status, is_public, order_col, order_dir]
             )
             connection.release()
 
@@ -170,6 +170,8 @@ class Book {
                        b.status,
                        b.is_public,
                        b.view_count,
+                       b.order_col,
+                       b.order_dir,
                        DATE_FORMAT(b.created_at, '%Y-%m-%d %H:%i:%s') AS created_at,
                        DATE_FORMAT(b.updated_at, '%Y-%m-%d %H:%i:%s') AS updated_at,
                        b.user_id,
@@ -442,6 +444,14 @@ class Book {
                 fields.push('is_public = ?')
                 values.push(bookData.is_public)
             }
+            if (bookData.order_col !== undefined) {
+                fields.push('order_col = ?')
+                values.push(bookData.order_col)
+            }
+            if (bookData.order_dir !== undefined) {
+                fields.push('order_dir = ?')
+                values.push(bookData.order_dir)
+            }
 
             if (fields.length === 0) {
                 throw new Error('没有提供要更新的字段')
diff --git a/backend/models/document.js b/backend/models/document.js
@@ -120,7 +120,7 @@ class Document {
         }
     }
 
-    static async getDocumentTree(searchParams = {}) {
+    static async getDocumentTree(searchParams = {}, orderConfig = null) {
         try {
             const whereConditions = []
             const params = []
@@ -137,15 +137,15 @@ class Document {
 
             const whereClause = whereConditions.length > 0 ? 'WHERE ' + whereConditions.join(' AND ') : ''
 
+            const orderClause = this.buildOrderClause(orderConfig)
+
             const pool = getPool()
             const connection = await pool.getConnection()
             const [rows] = await connection.execute(`
                 SELECT *
-                FROM documents d ${ whereClause }
-                ORDER BY sort_order ASC, created_at ASC`, params)
+                FROM documents d ${ whereClause } ${ orderClause }`, params)
             connection.release()
 
-            // 构建树形结构
             const buildTree = (documents, parentId = null) => {
                 return documents
                     .filter(doc => doc.parent_id === parentId)
@@ -158,7 +158,7 @@ class Document {
             return buildTree(rows)
         }
         catch (error) {
-            console.error(`获取文档树失败 ${ bookId }:`, error)
+            console.error(`获取文档树失败 ${ searchParams.book_id }:`, error)
             throw error
         }
     }
@@ -279,7 +279,7 @@ class Document {
         }
     }
 
-    static async findAllByConditions(searchParams = {}) {
+    static async findAllByConditions(searchParams = {}, orderConfig = null) {
         try {
             const whereConditions = []
             const params = []
@@ -311,15 +311,16 @@ class Document {
 
             const whereClause = whereConditions.length > 0 ? 'WHERE ' + whereConditions.join(' AND ') : ''
 
+            const orderClause = this.buildOrderClause(orderConfig)
+
             const pool = getPool()
             const [rows] = await pool.query(`
                 SELECT d.*,
                        DATE_FORMAT(d.created_at, '%Y-%m-%d %H:%i:%s') AS created_at,
                        DATE_FORMAT(d.updated_at, '%Y-%m-%d %H:%i:%s') AS updated_at
                 FROM documents d
                          LEFT JOIN users u ON d.user_id = u.id
-                    ${ whereClause }
-                ORDER BY sort_order ASC, created_at ASC`, params)
+                    ${ whereClause } ${ orderClause }`, params)
 
             return rows || []
         }
@@ -328,6 +329,29 @@ class Document {
         }
     }
 
+    static buildOrderClause(orderConfig) {
+        if (!orderConfig || !orderConfig.order_col || !orderConfig.order_dir) {
+            return 'ORDER BY d.sort_order ASC, d.created_at ASC'
+        }
+
+        const { order_col, order_dir } = orderConfig
+
+        const allowedColumns = {
+            'created_at': 'd.created_at',
+            'updated_at': 'd.updated_at',
+            'sort_order': 'd.sort_order',
+            'title': 'd.title'
+        }
+
+        const allowedDirections = ['asc', 'desc']
+
+        if (!allowedColumns[order_col] || !allowedDirections.includes(order_dir.toLowerCase())) {
+            return 'ORDER BY d.sort_order ASC, d.created_at ASC'
+        }
+
+        return `ORDER BY ${ allowedColumns[order_col] } ${ order_dir.toUpperCase() }, d.sort_order ASC`
+    }
+
     static async findBySlug(slug) {
         try {
             const pool = getPool()
diff --git a/backend/routes/book.js b/backend/routes/book.js
@@ -16,7 +16,7 @@ router.get('/create', ensureAuthenticated, asyncHandler(async (req, res) => {
 
 router.post('/create', ensureAuthenticated, asyncHandler(async (req, res) => {
     try {
-        const { title, slug, description, status, is_public } = req.body
+        const { title, slug, description, status, is_public, order_col, order_dir } = req.body
         const user_id = req.user.id
 
         if (!title || !slug) {
@@ -41,7 +41,7 @@ router.post('/create', ensureAuthenticated, asyncHandler(async (req, res) => {
             return res.render('pages/book/info', { isEdit: false, error: `URL 路径 ${ slug } 已存在，请使用其他路径` })
         }
 
-        const book = await Book.create({ title, description, slug, user_id, status, is_public })
+        const book = await Book.create({ title, description, slug, user_id, status, is_public, order_col, order_dir })
 
         const coverFile = req.files?.find(file => file.fieldname === 'cover_image')
         if (coverFile) {
@@ -89,7 +89,9 @@ router.get('/reader/:username/:book_slug/:docs_slug?', asyncHandler(async (req,
     }
 
     const searchParams = { book_id: book.id, status: 'published' }
-    const documents = await Document.getDocumentTree(searchParams)
+    const orderConfig = { order_col: book.order_col, order_dir: book.order_dir }
+
+    const documents = await Document.getDocumentTree(searchParams, orderConfig)
     if (documents.length === 0) {
         return res.status(404).render('pages/error/global', {
             error: {
@@ -259,7 +261,11 @@ router.get('/:username/:slug/chapters', asyncHandler(async (req, res) => {
     const searchParams = { parent_id: null, book_id: book.id }
     if (book.user_id !== req.user?.id) { searchParams.status = 'published' }
 
-    const data = await Document.findAllByConditions(searchParams)
+    const orderConfig = {
+        order_col: book.order_col,
+        order_dir: book.order_dir
+    }
+    const data = await Document.findAllByConditions(searchParams, orderConfig)
 
     res.render('pages/book/chapters', { book, data })
 }))
@@ -303,7 +309,7 @@ router.put('/:username/:slug/edit', ensureAuthenticated, asyncHandler(async (req
             })
         }
 
-        const { title, slug, description, status, is_public, remove_cover } = req.body
+        const { title, slug, description, status, is_public, remove_cover, order_col, order_dir } = req.body
 
         if (!title || !slug) {
             return res.render('pages/book/info', { isEdit: true, book, error: '标题和 URL 路径是必填项' })
@@ -332,7 +338,9 @@ router.put('/:username/:slug/edit', ensureAuthenticated, asyncHandler(async (req
             slug,
             description,
             status: status || 'draft',
-            is_public: is_public === '1'
+            is_public: is_public === '1',
+            order_col: order_col || 'created_at',
+            order_dir: order_dir || 'asc'
         }
 
         const coverFile = req.files?.find(file => file.fieldname === 'cover_image')
diff --git a/backend/scripts/schema.sql b/backend/scripts/schema.sql
@@ -61,11 +61,11 @@ CREATE TABLE IF NOT EXISTS books
     cover_image VARCHAR(500) COMMENT '封面图片URL',
     slug        VARCHAR(255) NOT NULL COMMENT 'URL路径标识符',
     user_id     INT          NOT NULL COMMENT '作者ID',
-    status      ENUM ('draft', 'published', 'archived') DEFAULT 'draft' COMMENT '状态',
-    is_public   BOOLEAN                                 DEFAULT FALSE COMMENT '是否公开',
-    view_count  INT                                     DEFAULT 0 COMMENT '浏览次数',
-    created_at  TIMESTAMP                               DEFAULT CURRENT_TIMESTAMP,
-    updated_at  TIMESTAMP                               DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    status      ENUM ('draft', 'published', 'archived')         DEFAULT 'draft' COMMENT '状态',
+    is_public   BOOLEAN                                         DEFAULT FALSE COMMENT '是否公开',
+    view_count  INT                                             DEFAULT 0 COMMENT '浏览次数',
+    created_at  TIMESTAMP                                       DEFAULT CURRENT_TIMESTAMP,
+    updated_at  TIMESTAMP                                       DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     UNIQUE KEY unique_slug (slug),
     INDEX idx_user_id (user_id),
     INDEX idx_status (status),
diff --git a/frontend/views/components/tree.ejs b/frontend/views/components/tree.ejs
@@ -19,6 +19,7 @@
  *   - document: 文档图标
  * @param {String} linkPattern - 链接模式，默认'/document/writer/{username}/{bookSlug}/{docSlug}'
  *   可用占位符：{username}, {bookSlug}, {docSlug}, {docId}
+ * @param {Boolean} showPath - 是否显示路径，默认 true
  */
 
 const treeDocuments = typeof documents !== 'undefined' ? documents : [];
@@ -34,6 +35,7 @@ const treeShowStatusBadge = typeof showStatusBadge !== 'undefined' ? showStatusB
 const treeStatusField = typeof statusField !== 'undefined' ? statusField : 'status';
 const treeShowIcons = typeof showIcons !== 'undefined' ? showIcons : true;
 const treeLinkPattern = typeof linkPattern !== 'undefined' ? linkPattern : '/document/writer/{username}/{bookSlug}/{docSlug}';
+const treeShowPath = typeof showPath !== 'undefined' ? showPath : true;
 
 // 默认图标配置
 const defaultIcons = {
@@ -146,7 +148,9 @@ function generateDocumentLink(doc) {
 
                             <div class="flex items-center space-x-2">
                                 <span class="truncate text-sm"><%= doc.title %></span>
-                                <span class="text-xs <%= isCurrentDocument(doc) ? 'text-gray-200' : 'text-gray-400' %> flex-shrink-0">(<%= doc.slug %>)</span>
+                                <% if (treeShowPath) { %>
+                                    <span class="text-xs <%= isCurrentDocument(doc) ? 'text-gray-200' : 'text-gray-400' %> flex-shrink-0">(<%= doc.slug %>)</span>
+                                <% } %>
                                 <% if (treeShowStatusBadge) { %>
                                     <% const statusValue = doc[treeStatusField] || doc.status || ''; %>
                                     <% if (statusValue) { %>
diff --git a/frontend/views/pages/book/chapters.ejs b/frontend/views/pages/book/chapters.ejs
@@ -45,7 +45,7 @@
                                 <i class="fas fa-file-alt text-gray-300 text-6xl mb-4"></i>
                                 <h3 class="text-lg font-medium text-gray-900 mb-2">暂无文档</h3>
                                 <p class="text-gray-500 mb-6">这本书还没有任何文档，开始创建第一个文档吧</p>
-                                <a href="/document/writer/<%= book.username %>/<%= book.slug %>"
+                                <a href="/book/writer/<%= book.username %>/<%= book.slug %>"
                                    class="inline-flex items-center px-4 py-2 bg-blue-500 hover:bg-blue-600 text-white rounded-lg transition-colors">
                                     <i class="fas fa-plus mr-2"></i>
                                     创建文档
diff --git a/frontend/views/pages/book/info.ejs b/frontend/views/pages/book/info.ejs
@@ -20,46 +20,17 @@
                 </p>
             </div>
 
-            <form method="POST" action="<%= isEdit ? `/book/${ book.username }/${ book.slug }/edit` : '/book/create' %>" enctype="multipart/form-data" class="p-6 space-y-6">
+            <form method="POST" action="<%= isEdit ? `/book/${ book.username }/${ book.slug }/edit` : '/book/create' %>" enctype="multipart/form-data" class="<%= isEdit ? 'p-6 pt-0' : 'p-6' %> space-y-6">
                 <%- include('../../components/alert', { type: 'error', message: error }) %>
                 <%- include('../../components/alert', { type: 'success', message: success }) %>
                 <% if (isEdit) { %>
-                    <input type="hidden" name="_method" value="PUT">
+                    <input type="hidden" class="hidden" name="_method" value="PUT">
                 <% } %>
 
-                <!-- 书籍标题 -->
-                <div>
-                    <label for="title" class="block text-sm font-medium text-gray-700 mb-2">
-                        书籍标题 <span class="text-red-500">*</span>
-                    </label>
-                    <%- include('../../components/input', { type: 'text', name: 'title', id: 'title', value: isEdit ? book.title : '', required: true, placeholder: '请输入书籍标题' }) %>
-                </div>
-
-                <!-- URL路径 -->
-                <div>
-                    <label for="slug" class="block text-sm font-medium text-gray-700 mb-2">
-                        URL路径 <span class="text-red-500">*</span>
-                    </label>
-                    <div class="flex items-center">
-                        <%- include('../../components/input', { type: 'text', name: 'slug', prefix: `/book/${ isEdit ? book.username : user.username }/`, id: 'slug', value: isEdit ? book.slug : '', required: true, placeholder: '请输入URL路径' }) %>
-                    </div>
-                    <p class="mt-1 text-xs text-gray-500">
-                        只能包含小写字母、数字和连字符，将用于书籍的访问地址
-                    </p>
-                </div>
-
-                <!-- 书籍描述 -->
-                <div>
-                    <label for="description" class="block text-sm font-medium text-gray-700 mb-2">
-                        书籍描述
-                    </label>
-                    <%- include('../../components/textarea', { name: 'description', id: 'description', value: isEdit ? book.description : '', placeholder: '请输入书籍描述' }) %>
-                </div>
-
                 <!-- 封面图片 -->
                 <div>
                     <label for="cover_image" class="block text-sm font-medium text-gray-700 mb-2">
-                        封面图片
+                        封面图片 <span class="text-red-500">*</span>
                     </label>
 
                     <% if (isEdit && book.cover_image) { %>
@@ -90,6 +61,37 @@
                     </p>
                 </div>
 
+                <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
+                    <!-- 书籍标题 -->
+                    <div>
+                        <label for="title" class="block text-sm font-medium text-gray-700 mb-2">
+                            书籍标题 <span class="text-red-500">*</span>
+                        </label>
+                        <%- include('../../components/input', { type: 'text', name: 'title', id: 'title', value: isEdit ? book.title : '', required: true, placeholder: '请输入书籍标题' }) %>
+                    </div>
+
+                    <!-- URL路径 -->
+                    <div>
+                        <label for="slug" class="block text-sm font-medium text-gray-700 mb-2">
+                            URL路径 <span class="text-red-500">*</span>
+                        </label>
+                        <div class="flex items-center">
+                            <%- include('../../components/input', { type: 'text', name: 'slug', prefix: `/book/${ isEdit ? book.username : user.username }/`, id: 'slug', value: isEdit ? book.slug : '', required: true, placeholder: '请输入URL路径' }) %>
+                        </div>
+                        <p class="mt-1 text-xs text-gray-500">
+                            只能包含小写字母、数字和连字符，将用于书籍的访问地址
+                        </p>
+                    </div>
+                </div>
+
+                <!-- 书籍描述 -->
+                <div>
+                    <label for="description" class="block text-sm font-medium text-gray-700 mb-2">
+                        书籍描述
+                    </label>
+                    <%- include('../../components/textarea', { name: 'description', id: 'description', value: isEdit ? book.description : '', placeholder: '请输入书籍描述' }) %>
+                </div>
+
                 <!-- 状态设置 -->
                 <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
                     <!-- 发布状态 -->
@@ -112,11 +114,33 @@
                     </div>
                 </div>
 
+                <!-- 排序 -->
+                <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
+                    <!-- 排序字段 -->
+                    <div>
+                        <label for="order_col" class="block text-sm font-medium text-gray-700 mb-2">
+                            排序字段
+                        </label>
+                        <%- include('../../components/select', { id: 'order_col', name: 'order_col', value: isEdit ? book.order_col : 'created_at', required: true, options: [ { value: 'created_at', label: '创建时间' }, { value: 'updated_at', label: '更新时间' }, { value: 'view_count', label: '浏览量' } ] }) %>
+                        <p class="mt-1 text-xs text-gray-500">
+                            用于标记书籍的排序字段，只有在书籍目录和阅读时生效。
+                        </p>
+                    </div>
+
+                    <!-- 排序方式 -->
+                    <div>
+                        <label for="order_dir" class="block text-sm font-medium text-gray-700 mb-2">
+                            排序方式
+                        </label>
+                        <%- include('../../components/select', { id: 'order_dir', name: 'order_dir', value: isEdit ? book.order_dir : 'asc', required: true, options: [ { value: 'asc', label: '升序' }, { value: 'desc', label: '降序' } ] }) %>
+                    </div>
+                </div>
+
                 <!-- 操作按钮 -->
                 <div class="flex items-center justify-between pt-6 border-t border-gray-200">
                     <div class="flex space-x-3">
                         <%- include('../../components/button', { type: 'submit', icon: 'fas fa-save', text: isEdit ? '保存修改' : '创建书籍' }) %>
-                        <%- include('../../components/button', { href: isEdit ? `/books/${ book.slug }` : '/books', icon: 'fas fa-times', text: '取消', variant: 'outline' }) %>
+                        <%- include('../../components/button', { href: isEdit ? `/book/${authUser.username}/${ book.slug }` : '/book/${authUser.username}', icon: 'fas fa-times', text: '取消', variant: 'outline' }) %>
                     </div>
                 </div>
             </form>
diff --git a/frontend/views/pages/document/reader.ejs b/frontend/views/pages/document/reader.ejs
