From 013fed6eccdc603f83eca462d19e681d3fe06eeb Mon Sep 17 00:00:00 2001 From: evanpeng Date: Fri, 25 Dec 2020 10:42:05 +0800 Subject: [PATCH] reset 1172 --- frontend/src/components/Search.vue | 2 +- frontend/src/components/files/Listing.vue | 6 +++--- frontend/src/components/files/ListingItem.vue | 2 +- frontend/src/components/prompts/Copy.vue | 2 +- frontend/src/components/prompts/Delete.vue | 4 ++-- frontend/src/components/prompts/Rename.vue | 2 +- frontend/src/store/modules/upload.js | 2 +- frontend/src/views/Files.vue | 6 ++---- 8 files changed, 12 insertions(+), 14 deletions(-) diff --git a/frontend/src/components/Search.vue b/frontend/src/components/Search.vue index 8b04e420..c723d6b1 100644 --- a/frontend/src/components/Search.vue +++ b/frontend/src/components/Search.vue @@ -95,7 +95,7 @@ export default { if (old === "search" && !this.active) { if (this.reload) { - this.setReload({ value: true,isReset: false }) + this.setReload(true) } document.body.style.overflow = "auto" diff --git a/frontend/src/components/files/Listing.vue b/frontend/src/components/files/Listing.vue index 6034d885..60a50c80 100644 --- a/frontend/src/components/files/Listing.vue +++ b/frontend/src/components/files/Listing.vue @@ -274,7 +274,7 @@ export default { let action = (overwrite, rename) => { api.copy(items, overwrite, rename).then(() => { - this.$store.commit('setReload', { value: true,isReset: false }) + this.$store.commit('setReload', true) }).catch(this.$showError) } @@ -282,7 +282,7 @@ export default { action = (overwrite, rename) => { api.move(items, overwrite, rename).then(() => { this.$store.commit('resetClipboard') - this.$store.commit('setReload', { value: true,isReset: false }) + this.$store.commit('setReload', true) }).catch(this.$showError) } } @@ -457,7 +457,7 @@ export default { this.$showError(e) } - this.$store.commit('setReload', { value: true,isReset: false }) + this.$store.commit('setReload', true) } } } diff --git a/frontend/src/components/files/ListingItem.vue b/frontend/src/components/files/ListingItem.vue index 1c4e3360..8dabb418 100644 --- a/frontend/src/components/files/ListingItem.vue +++ b/frontend/src/components/files/ListingItem.vue @@ -143,7 +143,7 @@ export default { let action = (overwrite, rename) => { api.move(items, overwrite, rename).then(() => { - this.$store.commit('setReload', { value: true,isReset: false }) + this.$store.commit('setReload', true) }).catch(this.$showError) } diff --git a/frontend/src/components/prompts/Copy.vue b/frontend/src/components/prompts/Copy.vue index 3f4396d0..c8618b4f 100644 --- a/frontend/src/components/prompts/Copy.vue +++ b/frontend/src/components/prompts/Copy.vue @@ -60,7 +60,7 @@ export default { buttons.success('copy') if (this.$route.path === this.dest) { - this.$store.commit('setReload', { value: true,isReset: false }) + this.$store.commit('setReload', true) return } diff --git a/frontend/src/components/prompts/Delete.vue b/frontend/src/components/prompts/Delete.vue index 2b4db442..67cbb33e 100644 --- a/frontend/src/components/prompts/Delete.vue +++ b/frontend/src/components/prompts/Delete.vue @@ -56,11 +56,11 @@ export default { await Promise.all(promises) buttons.success('delete') - this.$store.commit('setReload', { value: true,isReset: false }) + this.$store.commit('setReload', true) } catch (e) { buttons.done('delete') this.$showError(e) - if (this.isListing) this.$store.commit('setReload', { value: true,isReset: false }) + if (this.isListing) this.$store.commit('setReload', true) } } } diff --git a/frontend/src/components/prompts/Rename.vue b/frontend/src/components/prompts/Rename.vue index f8364d8a..1c130bc5 100644 --- a/frontend/src/components/prompts/Rename.vue +++ b/frontend/src/components/prompts/Rename.vue @@ -77,7 +77,7 @@ export default { return } - this.$store.commit('setReload', { value: true,isReset: false }) + this.$store.commit('setReload', true) } catch (e) { this.$showError(e) } diff --git a/frontend/src/store/modules/upload.js b/frontend/src/store/modules/upload.js index fabf465c..53307076 100644 --- a/frontend/src/store/modules/upload.js +++ b/frontend/src/store/modules/upload.js @@ -75,7 +75,7 @@ const actions = { window.removeEventListener('beforeunload', beforeUnload) buttons.success('upload') context.commit('reset') - context.commit('setReload', { value: true,isReset: false }, { root: true }) + context.commit('setReload', true, { root: true }) } if (canProcess) { diff --git a/frontend/src/views/Files.vue b/frontend/src/views/Files.vue index 7362d72f..42d5b4f3 100644 --- a/frontend/src/views/Files.vue +++ b/frontend/src/views/Files.vue @@ -112,10 +112,8 @@ export default { }, watch: { '$route': 'fetchData', - 'reload': function (newV) { - if (newV.isReset === false) { + 'reload': function () { this.fetchData() - } } }, mounted () { @@ -133,7 +131,7 @@ export default { ...mapMutations([ 'setLoading' ]), async fetchData () { // Reset view information. - this.$store.commit('setReload', { value: false,isReset: true }) + this.$store.commit('setReload', false) this.$store.commit('resetSelected') this.$store.commit('multiple', false) this.$store.commit('closeHovers')