Skip to content

修复 before-upload 和 before-remove 使用 async 返回 false 仍往下执行的问题 #1124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hobeas wants to merge 3 commits into
base: master
Choose a base branch
from
Open

修复 before-upload 和 before-remove 使用 async 返回 false 仍往下执行的问题 #1124

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc60616
修复 before-upload 使用 async 返回 false 仍执行上传的问题
hobeas Sep 17, 2021
7475a95
更改使空格缩进一致
hobeas Sep 17, 2021
9834f3b
修复 before-remove 使用 async 返回 false 仍执行删除的问题
hobeas Sep 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions uview-ui/components/u-upload/u-upload.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,12 +394,9 @@ export default {
let beforeResponse = this.beforeUpload.bind(this.$u.$parent.call(this))(index, this.lists);
// 判断是否返回了promise
if (!!beforeResponse && typeof beforeResponse.then === 'function') {
await beforeResponse.then(res => {
// promise返回成功，不进行动作，继续上传
}).catch(err => {
// 进入catch回调的话，继续下一张
return this.uploadFile(index + 1);
})
// promise 或 async 返回 false，或进入 catch 回调，继续下一张；否则不进行动作，继续上传
const result = await beforeResponse.catch(() => false);
if (result === false) return this.uploadFile(index + 1);
} else if(beforeResponse === false) {
// 如果返回false，继续下一张图片的上传
return this.uploadFile(index + 1);
Expand Down Expand Up @@ -473,13 +470,10 @@ export default {
let beforeResponse = this.beforeRemove.bind(this.$u.$parent.call(this))(index, this.lists);
// 判断是否返回了promise
if (!!beforeResponse && typeof beforeResponse.then === 'function') {
await beforeResponse.then(res => {
// promise返回成功，不进行动作，继续上传
this.handlerDeleteItem(index);
}).catch(err => {
// 如果进入promise的reject，终止删除操作
this.showToast('已终止移除');
})
// promise 或 async 返回 false，或进入 catch 回调，终止删除操作；否则执行删除
const result = await beforeResponse.catch(() => false);
if (result === false) return this.showToast('已终止移除');
this.handlerDeleteItem(index);
} else if(beforeResponse === false) {
// 返回false，终止删除
this.showToast('已终止移除');
Expand Down