From 1708c65c341c7f38ec1319b5b6269216546675f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BB=9D=E5=B0=98?= <237809796@qq.com>
Date: Wed, 4 Feb 2026 10:09:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E9=80=BB=E8=BE=91=E5=92=8C=E8=AF=AD=E6=B3=95?=
 =?UTF-8?q?=E9=AB=98=E4=BA=AE=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 提取文件列表排序公共函数 sortFileList
- 统一应用文件夹优先排序规则
- 移除生产环境 source map，减小打包体积
- 提升代码可维护性
---
 web/src/components/DeviceTest.vue             |  3 ++-
 .../components/FileSystem/index-simple.vue    |  2 ++
 web/src/components/FileSystem/index.vue       |  7 ++++--
 web/src/utils/fileUtils.js                    | 22 +++++++++++++++++++
 web/vite.config.js                            |  2 +-
 5 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/web/src/components/DeviceTest.vue b/web/src/components/DeviceTest.vue
index 593b615..9df4dfb 100644
--- a/web/src/components/DeviceTest.vue
+++ b/web/src/components/DeviceTest.vue
@@ -216,7 +216,7 @@ import {
 
 // 导入公共工具函数和常量
 import { STORAGE_KEYS, DEFAULTS } from '@/utils/constants'
-import { formatBytes } from '@/utils/fileUtils'
+import { formatBytes, sortFileList } from '@/utils/fileUtils'
 
 // 导入 composables
 import { useFileOperations } from '@/composables/useFileOperations'
@@ -350,6 +350,7 @@ const listDirectory = async () => {
   fileLoading.value = true
   try {
     fileList.value = await listDir(filePath.value)
+    fileList.value = sortFileList(fileList.value)
   } catch (error) {
     console.error('列出目录失败:', error)
     Message.error('列出目录失败: ' + (error.message || error))
diff --git a/web/src/components/FileSystem/index-simple.vue b/web/src/components/FileSystem/index-simple.vue
index 0afe3e7..059992b 100644
--- a/web/src/components/FileSystem/index-simple.vue
+++ b/web/src/components/FileSystem/index-simple.vue
@@ -24,6 +24,7 @@
 <script setup lang="ts">
 import { ref, computed, onMounted } from 'vue'
 import { Message } from '@arco-design/web-vue'
+import { sortFileList } from '@/utils/fileUtils'
 
 // 导入子组件
 import Toolbar from './components/Toolbar.vue'
@@ -138,6 +139,7 @@ const loadDirectory = async (path: string) => {
   fileLoading.value = true
   try {
     fileList.value = await listDirectory(path)
+    fileList.value = sortFileList(fileList.value)
     console.log('Files loaded:', fileList.value.length)
   } catch (error) {
     console.error('Load directory error:', error)
diff --git a/web/src/components/FileSystem/index.vue b/web/src/components/FileSystem/index.vue
index 8cae148..0538116 100644
--- a/web/src/components/FileSystem/index.vue
+++ b/web/src/components/FileSystem/index.vue
@@ -117,7 +117,7 @@ import { useFileEdit } from './composables/useFileEdit'
 import { useCommonPaths } from './composables/useCommonPaths'
 
 // 导入工具函数
-import { getFileName } from '@/utils/fileUtils'
+import { getFileName, sortFileList } from '@/utils/fileUtils'
 import { isImageFile, isVideoFile, isAudioFile, isPdfFile, isHtmlFile, isMarkdownFile } from '@/utils/fileTypeHelpers'
 import { STORAGE_KEYS, DEFAULTS, UI_TEXT, VALIDATION_RULES, FILE_EXTENSIONS } from '@/utils/constants'
 
@@ -980,6 +980,7 @@ const loadDirectory = async (path: string) => {
   fileLoading.value = true
   try {
     fileList.value = await fileOps.listDirectory(path)
+    fileList.value = sortFileList(fileList.value)
   } catch (error) {
     Message.error(`加载目录失败: ${error}`)
   } finally {
@@ -1009,7 +1010,7 @@ const loadZipDirectoryContents = async (zipPath: string, currentDir: string): Pr
       filtered = allFiles.filter((f: any) => !f.path.includes('/'))
     }
 
-    return filtered.map((f: any) => ({
+    const result = filtered.map((f: any) => ({
       name: f.name,
       path: f.path,
       is_dir: f.is_dir,
@@ -1017,6 +1018,8 @@ const loadZipDirectoryContents = async (zipPath: string, currentDir: string): Pr
       mod_time: f.mod_time || '',
       is_favorite: false
     }))
+
+    return sortFileList(result)
   } catch (error) {
     console.error('加载 ZIP 目录失败:', error)
     Message.error(`加载 ZIP 目录失败: ${error}`)
diff --git a/web/src/utils/fileUtils.js b/web/src/utils/fileUtils.js
index ff5bab1..f8b5379 100644
--- a/web/src/utils/fileUtils.js
+++ b/web/src/utils/fileUtils.js
@@ -320,3 +320,25 @@ export function sanitizeFileName(filename, replacement = '_') {
 
   return filename.replace(illegalChars, replacement)
 }
+
+/**
+ * 文件列表排序：文件夹优先，同类型按名称排序
+ * @param {Array} fileList - 文件列表
+ * @returns {Array} 排序后的文件列表
+ *
+ * @example
+ * sortFileList([{name: 'b.txt', is_dir: false}, {name: 'a', is_dir: true}])
+ * // [{name: 'a', is_dir: true}, {name: 'b.txt', is_dir: false}]
+ */
+export function sortFileList(fileList) {
+  if (!Array.isArray(fileList)) return fileList
+
+  return fileList.sort((a, b) => {
+    // 如果都是目录或都是文件，按名称排序
+    if (a.is_dir === b.is_dir) {
+      return a.name.localeCompare(b.name)
+    }
+    // 目录优先
+    return a.is_dir ? -1 : 1
+  })
+}
diff --git a/web/vite.config.js b/web/vite.config.js
index 185dcd8..1c5a46c 100644
--- a/web/vite.config.js
+++ b/web/vite.config.js
@@ -12,7 +12,7 @@ export default defineConfig({
   build: {
     outDir: 'dist',
     emptyOutDir: true,
-    sourcemap: true, // 启用 source map 用于调试
+    sourcemap: false, // 生产环境禁用 source map，减小打包体积
     rollupOptions: {
       output: {
         manualChunks: {