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

bug fixed 1172

Browse Source
This commit is contained in:
evanpeng 2020-12-25 10:54:12 +08:00
parent 7a5298a755
commit 403569f79b
8 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/Search.vue
View File

@ -95,7 +95,7 @@ export default {
if (old === "search" && !this.active) { if (old === "search" && !this.active) {
if (this.reload) { if (this.reload) {
this.setReload(true) this.setReload({ value: true,isReset: false })
} }
document.body.style.overflow = "auto" document.body.style.overflow = "auto"

6
frontend/src/components/files/Listing.vue
View File

@ -274,7 +274,7 @@ export default {
let action = (overwrite, rename) => { let action = (overwrite, rename) => {
api.copy(items, overwrite, rename).then(() => { api.copy(items, overwrite, rename).then(() => {
this.$store.commit('setReload', true) this.$store.commit('setReload', { value: true,isReset: false })
}).catch(this.$showError) }).catch(this.$showError)
} }
@ -282,7 +282,7 @@ export default {
action = (overwrite, rename) => { action = (overwrite, rename) => {
api.move(items, overwrite, rename).then(() => { api.move(items, overwrite, rename).then(() => {
this.$store.commit('resetClipboard') this.$store.commit('resetClipboard')
this.$store.commit('setReload', true) this.$store.commit('setReload', { value: true,isReset: false })
}).catch(this.$showError) }).catch(this.$showError)
} }
} }
@ -457,7 +457,7 @@ export default {
this.$showError(e) this.$showError(e)
} }
this.$store.commit('setReload', true) this.$store.commit('setReload', { value: true,isReset: false })
} }
} }
} }

2
frontend/src/components/files/ListingItem.vue
View File

@ -143,7 +143,7 @@ export default {
let action = (overwrite, rename) => { let action = (overwrite, rename) => {
api.move(items, overwrite, rename).then(() => { api.move(items, overwrite, rename).then(() => {
this.$store.commit('setReload', true) this.$store.commit('setReload', { value: true,isReset: false })
}).catch(this.$showError) }).catch(this.$showError)
} }

2
frontend/src/components/prompts/Copy.vue
View File

@ -60,7 +60,7 @@ export default {
buttons.success('copy') buttons.success('copy')
if (this.$route.path === this.dest) { if (this.$route.path === this.dest) {
this.$store.commit('setReload', true) this.$store.commit('setReload', { value: true,isReset: false })
return return
} }

4
frontend/src/components/prompts/Delete.vue
View File

@ -56,11 +56,11 @@ export default {
await Promise.all(promises) await Promise.all(promises)
buttons.success('delete') buttons.success('delete')
this.$store.commit('setReload', true) this.$store.commit('setReload', { value: true,isReset: false })
} catch (e) { } catch (e) {
buttons.done('delete') buttons.done('delete')
this.$showError(e) this.$showError(e)
if (this.isListing) this.$store.commit('setReload', true) if (this.isListing) this.$store.commit('setReload', { value: true,isReset: false })
} }
} }
} }

2
frontend/src/components/prompts/Rename.vue
View File

@ -77,7 +77,7 @@ export default {
return return
} }
this.$store.commit('setReload', true) this.$store.commit('setReload', { value: true,isReset: false })
} catch (e) { } catch (e) {
this.$showError(e) this.$showError(e)
} }

2
frontend/src/store/modules/upload.js
View File

@ -76,7 +76,7 @@ const actions = {
window.removeEventListener('beforeunload', beforeUnload) window.removeEventListener('beforeunload', beforeUnload)
buttons.success('upload') buttons.success('upload')
context.commit('reset') context.commit('reset')
context.commit('setReload', true, { root: true }) context.commit('setReload', { value: true,isReset: false }, { root: true })
} }
if (canProcess) { if (canProcess) {

8
frontend/src/views/Files.vue
View File

@ -112,8 +112,10 @@ export default {
}, },
watch: { watch: {
'$route': 'fetchData', '$route': 'fetchData',
'reload': function () { 'reload': function (newV) {
this.fetchData() if (newV.isReset === false) {
this.fetchData()
}
} }
}, },
mounted () { mounted () {
@ -131,7 +133,7 @@ export default {
...mapMutations([ 'setLoading' ]), ...mapMutations([ 'setLoading' ]),
async fetchData () { async fetchData () {
// Reset view information. // Reset view information.
this.$store.commit('setReload', false) this.$store.commit('setReload', { value: false,isReset: true })
this.$store.commit('resetSelected') this.$store.commit('resetSelected')
this.$store.commit('multiple', false) this.$store.commit('multiple', false)
this.$store.commit('closeHovers') this.$store.commit('closeHovers')