diff --git a/src/components/ShowFile/ShowFile.vue b/src/components/ShowFile/ShowFile.vue
index 6aa1f3b..3b40f50 100644
--- a/src/components/ShowFile/ShowFile.vue
+++ b/src/components/ShowFile/ShowFile.vue
@@ -222,6 +222,23 @@
大小
+
+
+
+ 上传时间
+
+
- 日期
+ 修改时间
@@ -489,7 +506,7 @@
'名称:' +
item.name +
'\r\n' +
- '创建时间:' +
+ '上传时间:' +
item.uploadDate +
'\r\n' +
'修改时间:' +
@@ -1150,7 +1167,9 @@ export default {
case 'size':
return '大小'
case 'updateDate':
- return '日期'
+ return '修改时间'
+ case 'uploadDate':
+ return '上传时间'
default:
return '名称'
}
@@ -3056,9 +3075,10 @@ export default {
}
})
// 重新加上排序高亮
- let order =
- this.sortable.order === 'ascending' ? 'descending' : 'ascending'
- this.addClass(tableHeader.children[headerIndex], order)
+ let order = this.sortable.order === 'ascending' ? 'descending' : 'ascending'
+ if (headerIndex > -1) {
+ this.addClass(tableHeader.children[headerIndex], order)
+ }
this.orderCustom = true
this.sortChange({ prop: prop, order: order })
},
@@ -3528,13 +3548,16 @@ export default {
this.getFileListEnter()
break
case 'orderName':
- this.sortChangeOfMenu('name', 2)
+ this.sortChangeOfMenu('name', 1)
break
case 'orderSize':
- this.sortChangeOfMenu('size', 5)
+ this.sortChangeOfMenu('size', 2)
break
case 'orderUpdateDate':
- this.sortChangeOfMenu('updateDate', 6)
+ this.sortChangeOfMenu('updateDate', 3)
+ break
+ case 'orderUploadDate':
+ this.sortChangeOfMenu('uploadDate', -1)
break
case 'refresh':
this.getFileListEnter()
diff --git a/src/components/SimpleUploader/globalUploader.vue b/src/components/SimpleUploader/globalUploader.vue
index 0432741..68646b6 100755
--- a/src/components/SimpleUploader/globalUploader.vue
+++ b/src/components/SimpleUploader/globalUploader.vue
@@ -392,6 +392,7 @@ export default {
Object.assign(this.uploader.opts, {
query: {
isFolder: false,
+ lastModified: file.file.lastModified,
...this.params
}
})
@@ -458,7 +459,8 @@ export default {
username: this.params.username,
userId: this.params.userId,
totalSize: file.size,
- isFolder: file.isFolder
+ isFolder: file.isFolder,
+ lastModified: file.file.lastModified
}).then(() => {
// console.log('文件合并成功', res)
// 文件合并成功
diff --git a/src/components/preview/FileDetails.vue b/src/components/preview/FileDetails.vue
index 8d0c4a3..bfebd19 100644
--- a/src/components/preview/FileDetails.vue
+++ b/src/components/preview/FileDetails.vue
@@ -82,7 +82,7 @@
{{ file.path }}
-
+
{{ file.uploadDate }}
diff --git a/src/utils/file-operations.js b/src/utils/file-operations.js
index 3ccc90e..2613d17 100644
--- a/src/utils/file-operations.js
+++ b/src/utils/file-operations.js
@@ -7,3 +7,10 @@ export const fileOperations = {
rename: { iconClass: 'menu-rename', label: '重命名', operation: 'rename', shortcut: ['F2'] },
copyOnly: { iconClass: 'menu-copy', label: '复制', operation: 'copyOnly', shortcut: [navigator.platform.startsWith('Mac') ? '⌘' : 'Ctrl', 'C'] },
}
+
+export const fileArrangements = [
+ { label: '名称', operation: 'orderName', orderProp: 'name'},
+ { label: '大小', operation: 'orderSize', orderProp: 'size'},
+ { label: '上传日期', operation: 'orderUploadDate', orderProp: 'uploadDate'},
+ { label: '修改日期', operation: 'orderUpdateDate', orderProp: 'updateDate'},
+]
diff --git a/src/views/favorite/index.vue b/src/views/favorite/index.vue
index f0284d1..f978eab 100644
--- a/src/views/favorite/index.vue
+++ b/src/views/favorite/index.vue
@@ -17,6 +17,7 @@