From 152aa0f92bdfe2da479287fd353ace4a0485daed Mon Sep 17 00:00:00 2001 From: kuaifan Date: Fri, 4 Mar 2022 19:43:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B8=85=E7=A9=BA=E5=AD=90=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=9A=84=E6=97=B6=E9=97=B4=E6=8A=A5=E9=94=99=E9=97=AA?= =?UTF-8?q?=E7=8E=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/js/store/actions.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js index 89f807b70..8db152dd4 100644 --- a/resources/assets/js/store/actions.js +++ b/resources/assets/js/store/actions.js @@ -1484,7 +1484,7 @@ export default { */ taskUpdate({state, dispatch}, data) { return new Promise(function (resolve, reject) { - dispatch("taskBeforeUpdate", data).then(post => { + dispatch("taskBeforeUpdate", data).then(({confirm, post}) => { dispatch("taskLoadStart", post.task_id) dispatch("call", { url: 'project/task/update', @@ -1498,7 +1498,7 @@ export default { console.warn(e); dispatch("taskLoadEnd", post.task_id) dispatch("getTaskOne", post.task_id).catch(() => {}) - reject(e) + setTimeout(() => { reject(e) }, confirm === true ? 301 : 0) }); }).catch(reject) }); @@ -1585,14 +1585,20 @@ export default { } // if (content === null) { - resolve(post); + resolve({ + confirm: false, + post + }); return } $A.modalConfirm({ title, content, onOk: () => { - resolve(post); + resolve({ + confirm: true, + post + }); }, onCancel: () => { reject({msg: false})