diff --git a/package.json b/package.json index 0de0eb9d..ff487e3f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jmal-cloud-view", - "version": "2.10.1", + "version": "2.11.0", "description": "jmalcloud", "author": "Jmal ", "license": "MIT", diff --git a/src/components/ShowFile/ShowFile.vue b/src/components/ShowFile/ShowFile.vue index 2f74db31..cdef358c 100644 --- a/src/components/ShowFile/ShowFile.vue +++ b/src/components/ShowFile/ShowFile.vue @@ -4070,11 +4070,7 @@ export default { fileIds.push(this.rowContextData.id) } if (fileIds.length > 1 || this.rowContextData.isFolder) { - fileConfig.packageDownload( - fileIds, - this.$store.state.user.token, - this.$store.state.user.name - ) + fileConfig.packageDownload(fileIds) return } fileConfig.download( diff --git a/src/utils/file-config.js b/src/utils/file-config.js index e60a4b82..811a3680 100644 --- a/src/utils/file-config.js +++ b/src/utils/file-config.js @@ -66,14 +66,14 @@ export default { }, // 下载文件 download: function(username, file, token) { - fileApi.isAllowDownload().then(() => { + fileApi.isAllowDownload({fileIds: [file.id]}).then(() => { let url = this.previewUrl(username, file, token) + '&o=download' window.open(url, '_self') }) }, // 打包下载文件 - packageDownload: function(fileIds, token, username) { - fileApi.isAllowDownload().then(() => { + packageDownload: function(fileIds) { + fileApi.isAllowDownload({fileIds: fileIds}).then(() => { fileIds = fileIds.join(',') window.open(`${this.baseUrl}/packageDownload?fileIds=${fileIds}`, '_self') }) diff --git a/src/views/home/mobile/index.vue b/src/views/home/mobile/index.vue index 304f2d48..4c600a3f 100644 --- a/src/views/home/mobile/index.vue +++ b/src/views/home/mobile/index.vue @@ -614,7 +614,7 @@ export default { fileIds.push(this.rowContextData.id) } if (fileIds.length > 1 || this.rowContextData.isFolder) { - fileConfig.packageDownload(fileIds, this.$store.state.user.token, this.$store.state.user.name) + fileConfig.packageDownload(fileIds) return } fileConfig.download(this.$store.state.user.name, this.rowContextData, this.$store.state.user.token)