From 644f415d46b06d51b0d2cbf7da989363ee683109 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Wed, 29 Jun 2022 13:30:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A1=AE=E8=AE=A4=E5=BC=B9?= =?UTF-8?q?=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/js/pages/manage/calendar.vue | 16 ++--- .../manage/components/DialogGroupInfo.vue | 66 +++++++++---------- .../pages/manage/components/DialogWrapper.vue | 26 ++++---- .../pages/manage/components/FileContent.vue | 30 ++++----- .../js/pages/manage/components/ProjectLog.vue | 28 ++++---- .../pages/manage/components/ProjectPanel.vue | 60 ++++++++--------- .../manage/components/ProjectWorkflow.vue | 49 +++++++------- .../js/pages/manage/components/ReportEdit.vue | 7 +- .../pages/manage/components/TaskOperation.vue | 17 +++-- resources/assets/js/pages/manage/file.vue | 58 ++++++++-------- resources/assets/js/store/actions.js | 4 +- 11 files changed, 178 insertions(+), 183 deletions(-) diff --git a/resources/assets/js/pages/manage/calendar.vue b/resources/assets/js/pages/manage/calendar.vue index 43afba82d..469a74355 100644 --- a/resources/assets/js/pages/manage/calendar.vue +++ b/resources/assets/js/pages/manage/calendar.vue @@ -367,14 +367,14 @@ export default { content: '你确定要删除任务【' + data.name + '】吗？', loading: true, onOk: () => { - this.$store.dispatch("removeTask", {task_id: data.id}).then(({msg}) => { - $A.messageSuccess(msg); - }).catch(({msg}) => { - $A.modalError(msg, 301); - this.setRenderRange(); - }).finally(_ => { - this.$Modal.remove(); - }); + return new Promise((resolve, reject) => { + this.$store.dispatch("removeTask", {task_id: data.id}).then(({msg}) => { + resolve(msg); + }).catch(({msg}) => { + reject(msg); + this.setRenderRange(); + }); + }) } }); break; diff --git a/resources/assets/js/pages/manage/components/DialogGroupInfo.vue b/resources/assets/js/pages/manage/components/DialogGroupInfo.vue index 45c40457d..effae34b6 100644 --- a/resources/assets/js/pages/manage/components/DialogGroupInfo.vue +++ b/resources/assets/js/pages/manage/components/DialogGroupInfo.vue @@ -213,25 +213,25 @@ export default { content, loading: true, onOk: () => { - this.$store.dispatch("call", { - url: 'dialog/group/deluser', - data: { - dialog_id: this.dialogId, - userids, - } - }).then(({msg}) => { - $A.messageSuccess(msg); - if (userids.length > 0) { - this.getDialogUser(); - } else { - this.$store.dispatch("forgetDialog", this.dialogId); - this.goForward({name: 'manage-messenger'}); - } - }).catch(({msg}) => { - $A.modalError(msg, 301); - }).finally(_ => { - this.$Modal.remove(); - }); + return new Promise((resolve, reject) => { + this.$store.dispatch("call", { + url: 'dialog/group/deluser', + data: { + dialog_id: this.dialogId, + userids, + } + }).then(({msg}) => { + resolve(msg); + if (userids.length > 0) { + this.getDialogUser(); + } else { + this.$store.dispatch("forgetDialog", this.dialogId); + this.goForward({name: 'manage-messenger'}); + } + }).catch(({msg}) => { + reject(msg); + }); + }) }, }); }, @@ -242,20 +242,20 @@ export default { loading: true, okText: '解散', onOk: () => { - this.$store.dispatch("call", { - url: 'dialog/group/disband', - data: { - dialog_id: this.dialogId, - } - }).then(({msg}) => { - $A.messageSuccess(msg); - this.$store.dispatch("forgetDialog", this.dialogId); - this.goForward({name: 'manage-messenger'}); - }).catch(({msg}) => { - $A.modalError(msg, 301); - }).finally(_ => { - this.$Modal.remove(); - }); + return new Promise((resolve, reject) => { + this.$store.dispatch("call", { + url: 'dialog/group/disband', + data: { + dialog_id: this.dialogId, + } + }).then(({msg}) => { + resolve(msg); + this.$store.dispatch("forgetDialog", this.dialogId); + this.goForward({name: 'manage-messenger'}); + }).catch(({msg}) => { + reject(msg); + }); + }) }, }); }, diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index 1c867bb1f..8d5345eff 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -1225,19 +1225,19 @@ export default { okText: '撤回', loading: true, onOk: () => { - this.$store.dispatch("call", { - url: 'dialog/msg/withdraw', - data: { - msg_id: this.operateItem.id - }, - }).then(() => { - $A.messageSuccess("消息已撤回"); - this.$store.dispatch("forgetDialogMsg", this.operateItem.id); - }).catch(({msg}) => { - $A.messageError(msg, 301); - }).finally(_ => { - this.$Modal.remove(); - }); + return new Promise((resolve, reject) => { + this.$store.dispatch("call", { + url: 'dialog/msg/withdraw', + data: { + msg_id: this.operateItem.id + }, + }).then(() => { + resolve("消息已撤回"); + this.$store.dispatch("forgetDialogMsg", this.operateItem.id); + }).catch(({msg}) => { + reject(msg); + }); + }) } }); }, diff --git a/resources/assets/js/pages/manage/components/FileContent.vue b/resources/assets/js/pages/manage/components/FileContent.vue index d3188a0a9..d6a6fb717 100644 --- a/resources/assets/js/pages/manage/components/FileContent.vue +++ b/resources/assets/js/pages/manage/components/FileContent.vue @@ -423,21 +423,21 @@ export default { okText: '确定', loading: true, onOk: () => { - this.$store.dispatch("call", { - url: 'file/content/restore', - data: { - id: this.fileId, - history_id: item.id, - } - }).then(({msg}) => { - $A.messageSuccess(msg); - this.contentDetail = null; - this.getContent(); - }).catch(({msg}) => { - $A.modalError(msg, 301); - }).finally(_ => { - this.$Modal.remove(); - }); + return new Promise((resolve, reject) => { + this.$store.dispatch("call", { + url: 'file/content/restore', + data: { + id: this.fileId, + history_id: item.id, + } + }).then(({msg}) => { + resolve(msg); + this.contentDetail = null; + this.getContent(); + }).catch(({msg}) => { + reject(msg); + }); + }) } }); }, diff --git a/resources/assets/js/pages/manage/components/ProjectLog.vue b/resources/assets/js/pages/manage/components/ProjectLog.vue index d64d2fb82..a4f83e704 100644 --- a/resources/assets/js/pages/manage/components/ProjectLog.vue +++ b/resources/assets/js/pages/manage/components/ProjectLog.vue @@ -244,20 +244,20 @@ export default { content: item.content, loading: true, onOk: () => { - this.$store.dispatch("call", { - url: 'project/task/resetfromlog', - data: { - id: item.id - } - }).then(({data, msg}) => { - $A.messageSuccess(msg); - this.$store.dispatch("saveTask", data); - this.getLists(true); - }).catch(({msg}) => { - $A.modalError(msg, 301); - }).finally(_ => { - this.$Modal.remove(); - }); + return new Promise((resolve, reject) => { + this.$store.dispatch("call", { + url: 'project/task/resetfromlog', + data: { + id: item.id + } + }).then(({data, msg}) => { + resolve(msg); + this.$store.dispatch("saveTask", data); + this.getLists(true); + }).catch(({msg}) => { + reject(msg); + }); + }) } }); }, diff --git a/resources/assets/js/pages/manage/components/ProjectPanel.vue b/resources/assets/js/pages/manage/components/ProjectPanel.vue index bfb2a5c7b..541223dd1 100644 --- a/resources/assets/js/pages/manage/components/ProjectPanel.vue +++ b/resources/assets/js/pages/manage/components/ProjectPanel.vue @@ -1047,15 +1047,15 @@ export default { } this.$set(this.columnLoad, column.id, true); // - this.$store.dispatch("removeColumn", column.id).then(({data, msg}) => { - $A.messageSuccess(msg); - this.$set(this.columnLoad, column.id, false); - }).catch(({msg}) => { - $A.modalError(msg, 301); - this.$set(this.columnLoad, column.id, false); - }).finally(_ => { - this.$Modal.remove(); - }); + return new Promise((resolve, reject) => { + this.$store.dispatch("removeColumn", column.id).then(({msg}) => { + resolve(msg); + }).catch(({msg}) => { + reject(msg); + }).finally(_ => { + this.$set(this.columnLoad, column.id, false); + }); + }) } }); }, @@ -1129,13 +1129,13 @@ export default { content: '你确定要归档项目【' + this.projectData.name + '】吗？', loading: true, onOk: () => { - this.$store.dispatch("archivedProject", this.projectId).then(({msg}) => { - $A.messageSuccess(msg); - }).catch(({msg}) => { - $A.modalError(msg, 301); - }).finally(_ => { - this.$Modal.remove(); - }); + return new Promise((resolve, reject) => { + this.$store.dispatch("archivedProject", this.projectId).then(({msg}) => { + resolve(msg); + }).catch(({msg}) => { + reject(msg); + }); + }) } }); }, @@ -1146,13 +1146,13 @@ export default { content: '你确定要删除项目【' + this.projectData.name + '】吗？', loading: true, onOk: () => { - this.$store.dispatch("removeProject", this.projectId).then(({msg}) => { - $A.messageSuccess(msg); - }).catch(({msg}) => { - $A.modalError(msg, 301); - }).finally(_ => { - this.$Modal.remove(); - }); + return new Promise((resolve, reject) => { + this.$store.dispatch("removeProject", this.projectId).then(({msg}) => { + resolve(msg); + }).catch(({msg}) => { + reject(msg); + }); + }) } }); }, @@ -1163,13 +1163,13 @@ export default { content: '你确定要退出项目【' + this.projectData.name + '】吗？', loading: true, onOk: () => { - this.$store.dispatch("exitProject", this.projectId).then(({msg}) => { - $A.messageSuccess(msg); - }).catch(({msg}) => { - $A.modalError(msg, 301); - }).finally(_ => { - this.$Modal.remove(); - }); + return new Promise((resolve, reject) => { + this.$store.dispatch("exitProject", this.projectId).then(({msg}) => { + resolve(msg); + }).catch(({msg}) => { + reject(msg); + }); + }) } }); }, diff --git a/resources/assets/js/pages/manage/components/ProjectWorkflow.vue b/resources/assets/js/pages/manage/components/ProjectWorkflow.vue index 982e0ab2c..25b5d17ac 100644 --- a/resources/assets/js/pages/manage/components/ProjectWorkflow.vue +++ b/resources/assets/js/pages/manage/components/ProjectWorkflow.vue @@ -336,31 +336,30 @@ export default { loading: true, onOk: () => { if (data.id > 0) { - this.loadIng++; - this.$store.dispatch("call", { - url: 'project/flow/delete', - data: { - project_id: this.projectId, - }, - }).then(({msg}) => { - $.messageSuccess(msg); - // - let index = this.list.findIndex(({id}) => id == data.id) - if (index > -1) { - this.list.splice(index, 1) - } - }).catch(({msg}) => { - $A.modalError(msg, 301); - }).finally(_ => { - this.$Modal.remove(); - this.loadIng--; - }); - } else { - let index = this.list.findIndex(({id}) => id == data.id) - if (index > -1) { - this.list.splice(index, 1) - } - this.$Modal.remove(); + return new Promise((resolve, reject) => { + this.loadIng++; + this.$store.dispatch("call", { + url: 'project/flow/delete', + data: { + project_id: this.projectId, + }, + }).then(({msg}) => { + resolve(msg); + // + let index = this.list.findIndex(({id}) => id == data.id) + if (index > -1) { + this.list.splice(index, 1) + } + }).catch(({msg}) => { + reject(msg); + }).finally(_ => { + this.loadIng--; + }); + }) + } + const index = this.list.findIndex(({id}) => id == data.id) + if (index > -1) { + this.list.splice(index, 1) } } }); diff --git a/resources/assets/js/pages/manage/components/ReportEdit.vue b/resources/assets/js/pages/manage/components/ReportEdit.vue index 2ad22f6b7..28ade9e44 100644 --- a/resources/assets/js/pages/manage/components/ReportEdit.vue +++ b/resources/assets/js/pages/manage/components/ReportEdit.vue @@ -106,9 +106,8 @@ export default { $A.modalConfirm({ title: '覆盖提交', content: '你已提交过此日期的报告，是否覆盖提交？', - loading: true, onOk: () => { - this.doSubmit(true); + this.doSubmit(); } }); } else { @@ -116,13 +115,12 @@ export default { } }, - doSubmit(isModal = false) { + doSubmit() { this.$store.dispatch("call", { url: 'report/store', data: this.reportData, method: 'post', }).then(({data, msg}) => { - isModal && this.$Modal.remove(); // data 结果数据 this.reportData.offset = 0; this.reportData.type = "weekly"; @@ -132,7 +130,6 @@ export default { !this.$isSubElectron && $A.messageSuccess(msg); this.$emit("saveSuccess", {data, msg}); }).catch(({msg}) => { - isModal && this.$Modal.remove(); // msg 错误原因 $A.messageError(msg); }); diff --git a/resources/assets/js/pages/manage/components/TaskOperation.vue b/resources/assets/js/pages/manage/components/TaskOperation.vue index d7e474384..680a94c44 100644 --- a/resources/assets/js/pages/manage/components/TaskOperation.vue +++ b/resources/assets/js/pages/manage/components/TaskOperation.vue @@ -303,17 +303,16 @@ export default { loading: true, onOk: () => { if (this.loadIng) { - this.$Modal.remove(); return; } - this.$store.dispatch(typeDispatch, typeData).then(({msg}) => { - $A.messageSuccess(msg); - this.$store.dispatch("saveTaskBrowse", typeData.task_id); - }).catch(({msg}) => { - $A.modalError(msg, 301); - }).finally(_ => { - this.$Modal.remove(); - }); + return new Promise((resolve, reject) => { + this.$store.dispatch(typeDispatch, typeData).then(({msg}) => { + resolve(msg); + this.$store.dispatch("saveTaskBrowse", typeData.task_id); + }).catch(({msg}) => { + reject(msg); + }); + }) } }); }, diff --git a/resources/assets/js/pages/manage/file.vue b/resources/assets/js/pages/manage/file.vue index 77cd2659a..4060dc27d 100644 --- a/resources/assets/js/pages/manage/file.vue +++ b/resources/assets/js/pages/manage/file.vue @@ -1160,19 +1160,19 @@ export default { content: '你确定要退出【' + item.name + '】共享成员吗？', loading: true, onOk: () => { - this.$store.dispatch("call", { - url: 'file/share/out', - data: { - id: item.id, - }, - }).then(({msg}) => { - $A.messageSuccess(msg); - this.$store.dispatch("forgetFile", item.id); - }).catch(({msg}) => { - $A.modalError(msg, 301); - }).finally(_ => { - this.$Modal.remove(); - }); + return new Promise((resolve, reject) => { + this.$store.dispatch("call", { + url: 'file/share/out', + data: { + id: item.id, + }, + }).then(({msg}) => { + resolve(msg); + this.$store.dispatch("forgetFile", item.id); + }).catch(({msg}) => { + reject(msg); + }); + }) } }); break; @@ -1288,20 +1288,20 @@ export default { content: '你确定要删除' + fileName + '吗？', loading: true, onOk: () => { - this.$store.dispatch("call", { - url: 'file/remove', - data: { - ids, - }, - }).then(({msg}) => { - $A.messageSuccess(msg); - this.$store.dispatch("forgetFile", ids); - this.selectIds = this.selectIds.filter(id => !ids.includes(id)) - }).catch(({msg}) => { - $A.modalError(msg, 301); - }).finally(_ => { - this.$Modal.remove(); - }); + return new Promise((resolve, reject) => { + this.$store.dispatch("call", { + url: 'file/remove', + data: { + ids, + }, + }).then(({msg}) => { + resolve(msg); + this.$store.dispatch("forgetFile", ids); + this.selectIds = this.selectIds.filter(id => !ids.includes(id)) + }).catch(({msg}) => { + reject(msg); + }); + }) } }); }, @@ -1466,7 +1466,7 @@ export default { } }) } else { - $A.modalError(msg, force === true ? 301 : 0) + $A.modalError(msg) } }).finally(_ => { this.shareLoad--; @@ -1512,7 +1512,7 @@ export default { }) } else { item.permission = item._permission; - $A.modalError(msg, force === true ? 301 : 0) + $A.modalError(msg) } }) }, diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js index a16d8fdb0..a3339441e 100644 --- a/resources/assets/js/store/actions.js +++ b/resources/assets/js/store/actions.js @@ -452,7 +452,7 @@ export default { }); }) }, - onCancel: _ => setTimeout(nameReject, 301) + onCancel: _ => nameReject }); }, 100) }); @@ -1629,7 +1629,7 @@ export default { }).catch(e => { console.warn(e); dispatch("getTaskOne", post.task_id).catch(() => {}) - setTimeout(() => { reject(e) }, confirm === true ? 301 : 0) + reject(e) }).finally(_ => { dispatch("cancelLoad", `task-${post.task_id}`) });