nicoeri/filebrowser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

naming fix and single file download fix

Browse Source
This commit is contained in:
Weidi Deng 2020-12-11 11:31:18 +08:00
parent 72ca1f4b48
commit 4eceee4269
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
frontend/src/views/Share.vue
View File

@ -13,7 +13,7 @@
<div class="share"> <div class="share">
<div class="share__box share__box__info"> <div class="share__box share__box__info">
<div class="share__box__header"> <div class="share__box__header">
{{ file.isDir ? multiple ? $t('download.downloadSelected') : $t('download.downloadFolder') : $t('download.downloadFile') }} {{ file.isDir ? hasSelected ? $t('download.downloadSelected') : $t('download.downloadFolder') : $t('download.downloadFile') }}
</div> </div>
<div class="share__box__element share__box__center share__box__icon"> <div class="share__box__element share__box__center share__box__icon">
<i class="material-icons">{{ file.isDir ? 'folder' : 'insert_drive_file'}}</i> <i class="material-icons">{{ file.isDir ? 'folder' : 'insert_drive_file'}}</i>
@ -89,7 +89,7 @@ export default {
this.fetchData() this.fetchData()
}, },
computed: { computed: {
multiple: function () { hasSelected: function () {
return this.selected.length > 0 return this.selected.length > 0
}, },
hash: function () { hash: function () {
@ -100,7 +100,8 @@ export default {
return this.$route.params.pathMatch.split('/')[0] + '/' return this.$route.params.pathMatch.split('/')[0] + '/'
}, },
link: function () { link: function () {
if (!this.multiple) return `${baseURL}/api/public/dl/${this.hash}${encodeURI(this.file.name)}` if (!this.hasSelected) return `${baseURL}/api/public/dl/${this.hash}${encodeURI(this.file.name)}`
if (this.selected.length === 1) return `${baseURL}/api/public/raw/${this.hash}${encodeURI(this.selected[0])}`
let files = [] let files = []
for (let s of this.selected) { for (let s of this.selected) {
files.push('/' + encodeURI(s) + '/') files.push('/' + encodeURI(s) + '/')
@ -178,7 +179,7 @@ export default {
let i = this.selected.indexOf(name) let i = this.selected.indexOf(name)
if (i === -1) return if (i === -1) return
this.selected.splice(i, 1) this.selected.splice(i, 1)
if (i === 0 && this.multiple) { if (i === 0 && this.hasSelected) {
this.firstSelected = this.file.items.indexOf(this.file.items.filter(item => item.name === this.selected[0])[0]) this.firstSelected = this.file.items.indexOf(this.file.items.filter(item => item.name === this.selected[0])[0])
} }
}, },
@ -187,14 +188,14 @@ export default {
this.firstSelected = -1 this.firstSelected = -1
}, },
click: function (name) { click: function (name) {
if (this.multiple) event.preventDefault() if (this.hasSelected) event.preventDefault()
if (this.selected.indexOf(name) !== -1) { if (this.selected.indexOf(name) !== -1) {
this.removeSelected(name) this.removeSelected(name)
return return
} }
let index = this.file.items.indexOf(this.file.items.filter(item => item.name === name)[0]) let index = this.file.items.indexOf(this.file.items.filter(item => item.name === name)[0])
if (event.shiftKey && this.multiple) { if (event.shiftKey && this.hasSelected) {
let fi = 0 let fi = 0
let la = 0 let la = 0
@ -215,7 +216,7 @@ export default {
return return
} }
if (!event.ctrlKey && !this.multiple) this.resetSelected() if (!event.ctrlKey && !this.hasSelected) this.resetSelected()
if (this.firstSelected === -1) this.firstSelected = index if (this.firstSelected === -1) this.firstSelected = index
this.addSelected(name) this.addSelected(name)
}, },