Merge pull request #10 from CrazyMrYan/feat/full/1.2.0

feat: #9 Paging Example and Return Parameter Adjustment

Author: CrazyMrYan

README.md

@@ -16,6 +16,8 @@ nodejs 实现文件上传功能
 | 公开失效时间 | 否             | 否             | 是           |
 | 高级搜索功能 | 否             | 否             | 是           |
 
+[![YouTube](https://img.youtube.com/vi/5w1dCYBrf2k/0.jpg)](https://youtu.be/5w1dCYBrf2k)
+
 ### 使用方法
 
 ```shell

public/index.html

@@ -43,6 +43,12 @@
     .filter-buttons {
       margin-bottom: 20px;
     }
+
+    .pagination {
+      margin-top: 20px;
+      display: flex;
+      justify-content: center;
+    }
   </style>
 </head>
 
@@ -54,29 +60,34 @@
     type="application/javascript"></script>
   <script>
     const { createApp, ref, onMounted } = Vue;
-    const { ElTabs, ElTabPane, ElUpload, ElButton, ElMessage, ElSelect, ElOption, ElImage, ElLoading } = ElementPlus;
+    const { ElTabs, ElTabPane, ElUpload, ElButton, ElMessage, ElSelect, ElOption, ElImage, ElLoading, ElPagination } = ElementPlus;
     const PUBLIC_NETWORK_DOMAIN = 'http://localhost:3000';
+    
     createApp({
       components: {
-        ElTabs, ElTabPane, ElUpload, ElButton, ElMessage, ElSelect, ElOption, ElImage, ElLoading
+        ElTabs, ElTabPane, ElUpload, ElButton, ElMessage, ElSelect, ElOption, ElImage, ElLoading, ElPagination
       },
       setup() {
         const uploadStatus = ref('');
         const fileList = ref([]);
         const fileType = ref('all');
         const loading = ref(false);
         const images = ref([]);
-        const activeTab = ref('1')
+        const activeTab = ref('1');
+        const imageTotal = ref(0);
+        const pageSize = ref(10);
+        const currentPage = ref(1);
 
-        const fetchImages = async () => {
+        const fetchImages = async (page = 1, size = 10) => {
           loading.value = true;
           try {
-            const response = await fetch(`${PUBLIC_NETWORK_DOMAIN}/files?type=${fileType.value}`);
-            const data = await response.json();
-            images.value = data.map(file => ({
+            const response = await fetch(`${PUBLIC_NETWORK_DOMAIN}/files?type=${fileType.value}&limit=${size}&offset=${(page - 1) * size}`);
+            const { total, items } = await response.json();
+            images.value = items.map(file => ({
               ...file,
               preview: `${file.thumb_location ?? file.filelocation}`
             }));
+            imageTotal.value = total;
           } catch (error) {
             ElMessage.error('获取图片列表失败');
           } finally {
@@ -96,7 +107,7 @@
             const data = await response.json();
             file.status = 'success';
             ElMessage.success(`${file.name} 上传成功`);
-            fetchImages();
+            fetchImages(currentPage.value, pageSize.value);
           } catch (error) {
             file.status = 'error';
             ElMessage.error(`${file.name} 上传失败`);
@@ -134,16 +145,26 @@
             }
           }
 
-          fetchImages();
+          fetchImages(currentPage.value, pageSize.value);
         };
 
         const handleFilterChange = (value) => {
           fileType.value = value;
-          fetchImages();
+          fetchImages(currentPage.value, pageSize.value);
+        };
+
+        const handleSizeChange = (size) => {
+          pageSize.value = size;
+          fetchImages(currentPage.value, size);
+        };
+
+        const handleCurrentChange = (page) => {
+          currentPage.value = page;
+          fetchImages(page, pageSize.value);
         };
 
         onMounted(() => {
-          fetchImages();
+          fetchImages(currentPage.value, pageSize.value);
         });
 
         return {
@@ -158,47 +179,63 @@
           loading,
           handleFilterChange,
           activeTab,
+          pageSize,
+          currentPage,
+          imageTotal,
+          handleSizeChange,
+          handleCurrentChange
         };
       },
       template: `
-                <el-tabs v-model="activeTab" >
-                    <el-tab-pane label="上传文件" name="1">
-                        <div 
-                            class="upload-area" 
-                            @dragover="handleDragover" 
-                            @dragleave="handleDragleave" 
-                            @drop="handleDrop">
-                            <p>拖拽文件到此处或点击上传</p>
-                            <el-upload 
-                                :multiple="true"
-                                :file-list="fileList"
-                                :http-request="handleUpload"
-                                drag>
-                                <el-button>选择文件</el-button>
-                            </el-upload>
-                        </div>
-                    </el-tab-pane>
-                    <el-tab-pane label="图床" name="2">
-                        <div class="filter-buttons">
-                            <el-select v-model="fileType" @change="handleFilterChange" placeholder="选择类型">
-                                <el-option label="全部" value="all"></el-option>
-                                <el-option label="图片" value="image"></el-option>
-                                <el-option label="视频" value="video"></el-option>
-                                <el-option label="文件" value="file"></el-option>
-                            </el-select>
-                        </div>
-                            <div class="waterfall">
-                                <div class="waterfall-item" v-for="(image, index) in images" :key="index">
-                                    <a target="_blank" :href="image.filelocation">
-                                        <el-image :src="image.preview" :alt="image.filename" fit="cover" />
-                                    </a>
-                                </div>
-                            </div>
-                    </el-tab-pane>
-                </el-tabs>
-            `
+        <el-tabs v-model="activeTab">
+          <el-tab-pane label="上传文件" name="1">
+            <div 
+              class="upload-area" 
+              @dragover="handleDragover" 
+              @dragleave="handleDragleave" 
+              @drop="handleDrop">
+              <p>拖拽文件到此处或点击上传</p>
+              <el-upload 
+                :multiple="true"
+                :file-list="fileList"
+                :http-request="handleUpload"
+                drag>
+                <el-button>选择文件</el-button>
+              </el-upload>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="图床" name="2">
+            <div class="filter-buttons">
+              <el-select v-model="fileType" @change="handleFilterChange" placeholder="选择类型">
+                <el-option label="全部" value="all"></el-option>
+                <el-option label="图片" value="image"></el-option>
+                <el-option label="视频" value="video"></el-option>
+                <el-option label="文件" value="file"></el-option>
+              </el-select>
+            </div>
+            <div class="waterfall">
+              <p class="waterfall-item" v-for="(image, index) in images" :key="index">
+                  <a target="_blank" :href="image.filelocation">
+                    <el-image :src="image.preview" :alt="image.filename" fit="cover" />
+                  </a>
+              </p>
+            </div>
+            <div class="pagination">
+              <el-pagination
+                background
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="imageTotal"
+                :page-size="pageSize"
+                :current-page="currentPage"
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange">
+              </el-pagination>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+      `
     }).mount('#app');
   </script>
 </body>
 
-</html>
+</html>

routers/files.js

@@ -7,7 +7,7 @@ const tinify = require("tinify");
 const { Op } = require("sequelize");
 const { v4: uuidv4 } = require("uuid");
 const { detectFileType } = require("../utils/detectFileType");
-const File = require("../models/files");
+const Files = require("../models/files");
 const JSZip = require("jszip");
 const {
   imageMimeTypes,
@@ -86,7 +86,7 @@ router.post("/files", async (ctx) => {
       const fileUrl = `${process.env.PUBLIC_NETWORK_DOMAIN}/files/${fileId}/preview`;
       const thumbUrl = shouldGenerateThumb ? `${fileUrl}?type=thumb` : null;
 
-      await File.create({
+      await Files.create({
         id: fileId,
         filename: path.basename(realFilePath),
         filesize: (await fsp.stat(realFilePath)).size,
@@ -164,7 +164,7 @@ router.get("/files", async (ctx) => {
       };
     }
 
-    const files = await File.findAll({
+    const { rows, count } = await Files.findAndCountAll({
       where: {
         is_delete: false,
         is_public: true,
@@ -187,7 +187,10 @@ router.get("/files", async (ctx) => {
       ],
     });
 
-    ctx.body = files;
+    ctx.body = {
+      items: rows,
+      total: count,
+    };
   } catch (error) {
     ctx.status = 500;
     ctx.body = { message: "Error retrieving files", error: error.message };
@@ -200,7 +203,7 @@ router.get("/files/:id", async (ctx) => {
   const { id } = ctx.params;
 
   try {
-    const file = await File.findOne({
+    const file = await Files.findOne({
       where: {
         id,
         is_delete: false,
@@ -251,7 +254,7 @@ router.get("/files/:id/preview", async (ctx) => {
   const { type } = ctx.query; // 获取查询参数 'type'，可以是 'thumb' 或 'original'
 
   try {
-    const file = await File.findOne({
+    const file = await Files.findOne({
       where: {
         id,
         is_delete: false,
@@ -314,7 +317,7 @@ router.get("/files/:id/export", async (ctx) => {
   const { id } = ctx.params;
 
   try {
-    const file = await File.findOne({
+    const file = await Files.findOne({
       where: {
         id: id,
         is_delete: false,
@@ -372,7 +375,7 @@ router.get("/files/export", async (ctx) => {
   }
 
   try {
-    const files = await File.findAll({
+    const files = await Files.findAll({
       where: {
         id: { [Op.in]: fileIds },
         is_delete: false,