Merge pull request #444 from jamebal/dev

perf: 优化用户空间和配额计算

src/components/ShowFile/ShowFile.vue

@@ -21,7 +21,7 @@
           </v-contextmenu-item>
           <v-contextmenu-submenu
             v-if="item.child"
-            :disabled="item.homeDisable && (!path || path.length < 2)"
+            :disabled="item.operation === 'create' && isNotUploadAllowed"
             :title="item.label"
           >
             <!-- 二级菜单 -->
@@ -91,7 +91,7 @@
             <el-popover
               popper-class="upload-file"
               v-if="showUploadButton"
-              v-show="!(isRootPath && homeHidden)"
+              v-show="!isNotUploadAllowed"
               v-model="isShowNewFolder"
               placement="bottom"
               trigger="hover"
@@ -839,6 +839,8 @@ import { formatSize, formatTime } from '@/utils/number'
 import EditElement from '@/views/markdown/EditElement'
 import Clipboard from 'clipboard'
 
+import { isNotDragUploadAllowed } from '@/components/SimpleUploader/dragUploadUtils'
+
 import _ from 'lodash'
 import path from 'path'
 import { mapGetters, mapState } from 'vuex'
@@ -878,10 +880,6 @@ export default {
       type: Number,
       default: 106,
     },
-    homeHidden: {
-      type: Boolean,
-      default: false,
-    },
     showUploadButton: {
       type: Boolean,
       default: true,
@@ -1162,15 +1160,15 @@ export default {
           return '名称'
       }
     },
+    isNotUploadAllowed() {
+      return isNotDragUploadAllowed(this.$route)
+    },
     searchOptionBtnClass() {
       return this.hasSearchFilterOption ? 'search-option-btn search-option-btn-active' : 'search-option-btn'
     },
     cmdKey() {
       return navigator.platform.startsWith('Mac') ? '⌘' : 'Ctrl'
     },
-    isRootPath() {
-      return !this.$route.query.path || this.$route.query.path.length < 2
-    },
     fileClipboard() {
       return store.getters.fileClipboard
     },

src/components/SimpleUploader/dragUploadUtils.js

@@ -0,0 +1,43 @@
+// utils/dragUploadUtils.js
+
+/**
+ * 拖拽上传相关工具函数
+ */
+
+// 特殊路由 - 完全禁止拖拽上传
+const SPECIAL_ROUTES = ['/recently', '/document', '/audio', '/image', '/video']
+
+// 禁用拖拽路由 - 需要特定条件才允许
+const NO_DRAG_ROUTES = ['/favorite', '/mount', '/trash', '/tag']
+
+/**
+ * 检查是否禁止拖拽上传
+ * @param {Object} route - 路由对象 { path, query }
+ * @returns {boolean}
+ */
+export function isNotDragUploadAllowed(route) {
+  if (!route) return false
+
+  const { path, query = {} } = route
+  const { keyword, searchOpenFolder } = query || {}
+
+  // 标准化路径
+  const normalizedPath = path ? path.replace(/\/$/, '') : ''
+
+  // 三种禁用拖拽的条件
+  const isSpecialRoute = SPECIAL_ROUTES.includes(normalizedPath)
+  const isNoDragRoute = NO_DRAG_ROUTES.includes(normalizedPath) && !query.path
+  const isSearchWithoutFolder = keyword && !searchOpenFolder
+
+  return isSpecialRoute || isNoDragRoute || isSearchWithoutFolder
+}
+
+/**
+ * 检查是否允许拖拽上传
+ * @param {Object} route - 路由对象 { path, query }
+ * @returns {boolean}
+ */
+export function isDragUploadAllowed(route) {
+  return !isNotDragUploadAllowed(route)
+}
+

src/components/SimpleUploader/globalUploader.vue

@@ -118,7 +118,8 @@ import SparkMD5 from 'spark-md5'
 import api from '@/api/file-api'
 import {formatNetSpeed} from '@/utils/number'
 import {mapState} from 'vuex'
-import {encodeIfNeeded} from "@/utils/path";
+import {encodeIfNeeded} from "@/utils/path"
+import { isDragUploadAllowed } from './dragUploadUtils'
 
 export default {
   components: {},
@@ -189,7 +190,7 @@ export default {
       fileListScrollTop: 0,
       dragoverLoop: null,
       successMsg: null,
-      enableDragUpload: false,// 是否启用拖拽上传
+      enableDragUpload: true,// 是否启用拖拽上传
       uploader: null,
     }
   },
@@ -198,8 +199,7 @@ export default {
   },
   watch: {
     $route(route) {
-      // 只有首页才启用拖拽上传
+      this.checkDrag(route)
-      this.enableDragUpload = route.path === '/'
     },
     message(msg) {
       switch (msg.event) {
@@ -233,7 +233,7 @@ export default {
     }
   },
   mounted() {
-    this.enableDragUpload = this.$route.path === '/'
+    this.checkDrag(this.$route)
     let that = this
     let dropbox = document.body
 
@@ -280,6 +280,9 @@ export default {
   destroyed() {
   },
   methods: {
+    checkDrag(route) {
+      this.enableDragUpload = isDragUploadAllowed(route)
+    },
     onStorageTypeChange(chunkSize) {
       localStorage.setItem('uploader_chunk_size', chunkSize)
       if (this.options.chunkSize !== chunkSize && !this.panelShow) {

src/layout/components/Sidebar/index.vue

@@ -406,15 +406,15 @@ export default {
       if (this.takeUpSpace === 0) {
         this.takeUpSpace = this.userInfo.takeUpSpace
       }
-      const quota = this.userInfo.quota
+      const spaceBytes = this.takeUpSpace
-      const space = this.takeUpSpace/1024/1024/1024
+      const quotaBytes = this.userInfo.quota * 1024 * 1024 * 1024
-      if(space && quota > 0){
+      if(spaceBytes && quotaBytes > 0){
-        const percentage = Number((space/quota * 100).toFixed(5))
+        const percentage = Number((spaceBytes/quotaBytes * 100).toFixed(5))
         this.percentage = percentage > 100 ? 100 : percentage
         if(this.isCollapse){
           return `${formatSize(this.takeUpSpace)}`
         } else {
-          return `${formatSize(this.takeUpSpace)}/${quota}GB`
+          return `${formatSize(this.takeUpSpace)}/${formatSize(quotaBytes)}`
         }
       }
     }

src/utils/number.js

@@ -127,17 +127,18 @@ export function formatTime(agoTime) {
  * @param {*} size
  */
 export function formatSize(size) {
-  if (size === 0) {
+  if (size === 0 || !size) return '0B';
-    return ''
+
-  } else if (size < 1024) {
+  const units = ['B', 'K', 'M', 'G', 'T'];
-    return size + 'B'
+  let index = 0;
-  } else if (size < 1024 * 1024) {
+  let result = size;
-    return (size/1024).toFixed(1) + 'k'
+
-  } else if (size < 1024 * 1024 * 1024) {
+  while (result >= 1024 && index < units.length - 1) {
-    return (size/(1024 * 1024)).toFixed(1) + 'M'
+    result /= 1024;
-  } else {
+    index++;
-    return (size/(1024 * 1024 * 1024)).toFixed(1) + 'G'
   }
+
+  return result.toFixed(1) + units[index];
 }
 
 /**

src/views/favorite/index.vue

@@ -9,7 +9,6 @@
       :defaultSort="sortable"
       :queryCondition="queryCondition"
       :contextMenus="contextMenus"
-      homeHidden
     >
     </show-file>
   </div>
@@ -39,7 +38,7 @@
           },
           { label: '刷新', operation: 'refresh'},
           { divider: true, operation: 'divider' },
-          { label: '新建', operation: 'create' , homeDisable: true, child: createFiles
+          { label: '新建', operation: 'create' , child: createFiles
           },
           { divider: true, operation: 'divider' },
           { label: '写文章', operation: 'createMarkdownFile'},

src/views/fileType/audio.vue

@@ -39,7 +39,7 @@ export default {
         },
         { label: '刷新', operation: 'refresh'},
         { divider: true, operation: 'divider' },
-        { label: '新建', operation: 'create' , homeDisable: true, child: createFiles
+        { label: '新建', operation: 'create' , child: createFiles
         },
         { divider: true, operation: 'divider' },
         { label: '写文章', operation: 'createMarkdownFile'},

src/views/fileType/document.vue

@@ -39,7 +39,7 @@ export default {
         },
         { label: '刷新', operation: 'refresh'},
         { divider: true, operation: 'divider' },
-        { label: '新建', operation: 'create' , homeDisable: true, child: createFiles
+        { label: '新建', operation: 'create' , child: createFiles
         },
         { divider: true, operation: 'divider' },
         { label: '写文章', operation: 'createMarkdownFile'},

src/views/fileType/image.vue

@@ -38,7 +38,7 @@ export default {
         },
         { label: '刷新', operation: 'refresh'},
         { divider: true, operation: 'divider' },
-        { label: '新建', operation: 'create' , homeDisable: true, child: createFiles
+        { label: '新建', operation: 'create' , child: createFiles
         },
         { divider: true, operation: 'divider' },
         { label: '写文章', operation: 'createMarkdownFile'},

src/views/fileType/video.vue

@@ -39,7 +39,7 @@ export default {
         },
         { label: '刷新', operation: 'refresh'},
         { divider: true, operation: 'divider' },
-        { label: '新建', operation: 'create' , homeDisable: true, child: createFiles
+        { label: '新建', operation: 'create' , child: createFiles
         },
         { divider: true, operation: 'divider' },
         { label: '写文章', operation: 'createMarkdownFile'},

src/views/mount/index.vue

@@ -9,7 +9,6 @@
       :defaultSort="sortable"
       :queryCondition="queryCondition"
       :contextMenus="contextMenus"
-      homeHidden
     >
     </show-file>
   </div>
@@ -39,7 +38,7 @@
           },
           { label: '刷新', operation: 'refresh'},
           { divider: true, operation: 'divider' },
-          { label: '新建', operation: 'create' , homeDisable: true, child: createFiles
+          { label: '新建', operation: 'create' , child: createFiles
           },
           { divider: true, operation: 'divider' },
           { label: '写文章', operation: 'createMarkdownFile'},

src/views/recently/index.vue

@@ -37,7 +37,7 @@
           },
           { label: '刷新', operation: 'refresh'},
           { divider: true, operation: 'divider' },
-          { label: '新建', operation: 'create' , homeDisable: true, child: createFiles},
+          { label: '新建', operation: 'create' , child: createFiles},
           { divider: true, operation: 'divider' },
           { label: '写文章', operation: 'createMarkdownFile'},
         ]

src/views/setting/sys/cusomerInfo.vue

@@ -241,12 +241,13 @@
         }
       },
       progressFormat() {
-        const space = this.userInfo.takeUpSpace/1024/1024/1024
+        const spaceBytes = this.userInfo.takeUpSpace;
-        const quota = this.userInfo.quota
+        const quotaBytes = this.userInfo.quota * 1024 * 1024 * 1024;
-        if(space && quota > 0){
+
-          const percentage = Number((space/quota * 100).toFixed(1))
+        if (spaceBytes && quotaBytes > 0) {
-          this.percentage = percentage > 100 ? 100 : percentage
+          const percentage = Number((spaceBytes / quotaBytes * 100).toFixed(1));
-          return `${this.percentage}% (${formatSize(this.userInfo.takeUpSpace)}/${quota}GB)`;
+          this.percentage = percentage > 100 ? 100 : percentage;
+          return `${this.percentage}% (${formatSize(spaceBytes)}/${formatSize(quotaBytes)})`;
         }
       },
       // 设置formData

src/views/tag/index.vue

@@ -8,7 +8,6 @@
       :defaultSort="sortable"
       :queryCondition="queryCondition"
       :contextMenus="contextMenus"
-      homeHidden
     >
     </show-file>
   </div>
@@ -38,7 +37,7 @@ export default {
         },
         { label: '刷新', operation: 'refresh'},
         { divider: true, operation: 'divider' },
-        { label: '新建', operation: 'create' , homeDisable: true, child: createFiles
+        { label: '新建', operation: 'create' , child: createFiles
         },
         { divider: true, operation: 'divider' },
         { label: '写文章', operation: 'createMarkdownFile'},