Skip to content

Commit 532ae69

Browse files
committed
fix: delete confirm
1 parent 9b54f71 commit 532ae69

File tree

5 files changed

+16
-4
lines changed

5 files changed

+16
-4
lines changed

src/components/waterfall/PicWaterfall.vue

+8-3
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ export default {
9494
computed: {
9595
...mapState({
9696
reload_timeout: state => state.common.reload_timeout,
97+
delete_confirm: state => state.common.delete_confirm,
9798
node_title: state => state[self.storeName].title,
9899
node_key: state => state[self.storeName].node_key,
99100
node_dir: state => state[self.storeName].node_dir,
@@ -280,10 +281,14 @@ export default {
280281
})
281282
},
282283
async btnClickDelDirs() {
283-
if (window.confirm(`确定要删除 ${this.node_title} 吗?`)) {
284-
await this.tryDelDirs(this.node_key, this.node_dir)
284+
if (this.delete_confirm) {
285+
if (window.confirm(`确定要删除 ${this.node_title} 吗?`)) {
286+
await this.tryDelDirs(this.node_key, this.node_dir)
287+
} else {
288+
this.$log.debug('cancel delete')
289+
}
285290
} else {
286-
this.$log.debug('cancel delete')
291+
await this.tryDelDirs(this.node_key, this.node_dir)
287292
}
288293
},
289294
btn_click_goto_top() {

src/store/modules/common/actions.js

+4
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,7 @@ export const reload_timeout = ({commit}, payload) => {
3131
persistent.commonSet('reload_timeout', payload)
3232
commit('reload_timeout', payload)
3333
}
34+
export const delete_confirm = ({commit}, payload) => {
35+
persistent.commonSet('delete_confirm', payload)
36+
commit('delete_confirm', payload)
37+
}

src/store/modules/common/getters.js

+1
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ export const background = state => state.background
55
export const tool_group_force_right = state => state.tool_group_force_right
66
export const image_shortcut = state => state.image_shortcut
77
export const reload_timeout = state => state.reload_timeout
8+
export const delete_confirm = state => state.delete_confirm

src/store/modules/common/mutations.js

+1
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ export const background = (state, payload) => state.background = payload
55
export const tool_group_force_right = (state, payload) => state.tool_group_force_right = payload
66
export const image_shortcut = (state, payload) => state.image_shortcut = payload
77
export const reload_timeout = (state, payload) => state.reload_timeout = payload
8+
export const delete_confirm = (state, payload) => state.delete_confirm = payload

src/store/modules/common/state.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ export default function () {
2020
background: persistent.commonGet('background') || './images/1.webp',
2121
tool_group_force_right: persistent.commonGet('tool_group_force_right') === 'true',
2222
image_shortcut: persistent.commonGet('image_shortcut') !== 'false',
23-
reload_timeout: parseInt(persistent.commonGet('reload_timeout')) || 500,
23+
reload_timeout: parseInt(persistent.commonGet('reload_timeout')) || 300,
24+
delete_confirm: persistent.commonGet('delete_confirm') !== 'false',
2425
}
2526
}

0 commit comments

Comments
 (0)