From 08704e7f60d2484544e2ce460a56d9cfc24bf2bb Mon Sep 17 00:00:00 2001 From: kuaifan Date: Fri, 14 Jan 2022 16:35:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/js/components/UserAvatar.vue | 2 +- resources/assets/js/pages/login.vue | 2 +- resources/assets/js/pages/manage.vue | 6 +- .../pages/manage/components/DialogWrapper.vue | 2 +- .../manage/components/ProjectArchived.vue | 2 +- .../pages/manage/components/ProjectList.vue | 12 +- .../js/pages/manage/components/TaskAdd.vue | 4 +- .../js/pages/manage/components/TaskDetail.vue | 76 +++++----- .../js/pages/manage/components/TaskMenu.vue | 10 +- .../js/pages/manage/components/TaskRow.vue | 4 +- .../manage/components/TeamManagement.vue | 15 +- resources/assets/js/pages/manage/project.vue | 4 +- .../js/pages/manage/setting/personal.vue | 2 +- resources/assets/js/pages/single/task.vue | 2 +- resources/assets/js/store/actions.js | 134 ++++++++---------- 15 files changed, 136 insertions(+), 141 deletions(-) diff --git a/resources/assets/js/components/UserAvatar.vue b/resources/assets/js/components/UserAvatar.vue index 8c9afb73..b6643173 100755 --- a/resources/assets/js/components/UserAvatar.vue +++ b/resources/assets/js/components/UserAvatar.vue @@ -196,7 +196,7 @@ openDialog() { this.goForward({path: '/manage/messenger'}); - this.$store.dispatch("openDialogUserid", this.userid); + this.$store.dispatch("openDialogUserid", this.userid).catch(() => {}) } } }; diff --git a/resources/assets/js/pages/login.vue b/resources/assets/js/pages/login.vue index 0b6ac54f..dac25be9 100644 --- a/resources/assets/js/pages/login.vue +++ b/resources/assets/js/pages/login.vue @@ -76,7 +76,7 @@ export default { this.getDemoAccount(); // if (this.$Electron) { - this.chackServerUrl(); + this.chackServerUrl().catch(() => {}); } else { this.clearServerUrl(); } diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue index f323825f..b53760a7 100644 --- a/resources/assets/js/pages/manage.vue +++ b/resources/assets/js/pages/manage.vue @@ -258,8 +258,8 @@ export default { $A.messageSuccess("清除成功"); } // - this.$store.dispatch("getUserInfo"); - this.$store.dispatch("getTaskPriority"); + this.$store.dispatch("getUserInfo").catch(() => {}) + this.$store.dispatch("getTaskPriority").catch(() => {}) // this.notificationInit(); this.onVisibilityChange(); @@ -613,7 +613,7 @@ export default { this.notificationClass.replaceTitle(data.name); this.notificationClass.userAgreed(); } - }) + }).catch(() => {}) } } }, diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index efff01e9..ddc17f13 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -401,7 +401,7 @@ export default { } } }); - }); + }).catch(() => {}) }, addDialogMsg() { diff --git a/resources/assets/js/pages/manage/components/ProjectArchived.vue b/resources/assets/js/pages/manage/components/ProjectArchived.vue index d46b8c1b..e96c3cf6 100644 --- a/resources/assets/js/pages/manage/components/ProjectArchived.vue +++ b/resources/assets/js/pages/manage/components/ProjectArchived.vue @@ -219,7 +219,7 @@ export default { }).then(() => { this.loadIng--; this.getLists(); - this.$store.dispatch("getProjectOne", row.id); + this.$store.dispatch("getProjectOne", row.id).catch(() => {}); }).catch(({msg}) => { $A.modalError(msg); this.loadIng--; diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue index 561f4d01..b2967082 100644 --- a/resources/assets/js/pages/manage/components/ProjectList.vue +++ b/resources/assets/js/pages/manage/components/ProjectList.vue @@ -785,7 +785,7 @@ export default { }).catch(({msg}) => { $A.modalError(msg); this.sortDisabled = false; - this.$store.dispatch("getTaskForProject", this.projectId) + this.$store.dispatch("getTaskForProject", this.projectId).catch(() => {}) }); }, @@ -881,7 +881,7 @@ export default { this.$store.dispatch("saveColumn", data); }).catch(({msg}) => { this.$set(this.columnLoad, column.id, false); - this.$store.dispatch("getColumns", this.projectId) + this.$store.dispatch("getColumns", this.projectId).catch(() => {}) $A.modalError(msg); }); }, @@ -945,8 +945,8 @@ export default { $A.messageSuccess(msg); this.userLoad--; this.userShow = false; - this.$store.dispatch("getProjectOne", this.projectId); - this.$store.dispatch("getTaskForProject", this.projectId) + this.$store.dispatch("getProjectOne", this.projectId).catch(() => {}); + this.$store.dispatch("getTaskForProject", this.projectId).catch(() => {}) }).catch(({msg}) => { $A.modalError(msg); this.userLoad--; @@ -965,8 +965,8 @@ export default { $A.messageSuccess(msg); this.transferLoad--; this.transferShow = false; - this.$store.dispatch("getProjectOne", this.projectId); - this.$store.dispatch("getTaskForProject", this.projectId) + this.$store.dispatch("getProjectOne", this.projectId).catch(() => {}); + this.$store.dispatch("getTaskForProject", this.projectId).catch(() => {}) }).catch(({msg}) => { $A.modalError(msg); this.transferLoad--; diff --git a/resources/assets/js/pages/manage/components/TaskAdd.vue b/resources/assets/js/pages/manage/components/TaskAdd.vue index 0c007677..eb7e7571 100644 --- a/resources/assets/js/pages/manage/components/TaskAdd.vue +++ b/resources/assets/js/pages/manage/components/TaskAdd.vue @@ -270,7 +270,7 @@ export default { }, methods: { initLanguage() { - + }, initCascaderData() { @@ -321,7 +321,7 @@ export default { this.addData.project_id = column.project_id; this.addData.column_id = column.id; } - }); + }).catch(() => {}); } } } diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue index 04bda7d5..dcffca84 100644 --- a/resources/assets/js/pages/manage/components/TaskDetail.vue +++ b/resources/assets/js/pages/manage/components/TaskDetail.vue @@ -376,13 +376,14 @@ class="dialog-input" v-model="msgText" type="textarea" + :disabled="sendLoad > 0" :rows="1" :autosize="{ minRows: 1, maxRows: 3 }" :maxlength="255" :placeholder="$L('输入消息...')" @on-keydown="msgKeydown"/>
- +
@@ -458,7 +459,7 @@ export default { navActive: 'dialog', logLoadIng: false, - sendLoad: false, + sendLoad: 0, taskPlugins: [ 'advlist autolink lists link image charmap print preview hr anchor pagebreak', @@ -828,7 +829,7 @@ export default { this.ownerLoad--; this.ownerShow = false; this.receiveShow = false; - this.$store.dispatch("getTaskOne", this.taskDetail.id); + this.$store.dispatch("getTaskOne", this.taskDetail.id).catch(() => {}) }).catch(({msg}) => { $A.modalError(msg); this.ownerLoad--; @@ -859,7 +860,7 @@ export default { $A.messageSuccess(msg); this.assistLoad--; this.assistShow = false; - this.$store.dispatch("getTaskOne", this.taskDetail.id); + this.$store.dispatch("getTaskOne", this.taskDetail.id).catch(() => {}) }).catch(({msg}) => { $A.modalError(msg); this.assistLoad--; @@ -1007,6 +1008,11 @@ export default { if (!this.msgText) { return; } + if (this.sendLoad > 0) { + return; + } + this.sendLoad++; + // this.$store.dispatch("call", { url: 'project/task/dialog', data: { @@ -1014,56 +1020,60 @@ export default { }, }).then(({data}) => { this.$store.dispatch("saveTask", data); - this.$store.dispatch("getDialogOne", data.dialog_id); - if ($A.isSubElectron) { - this.resizeDialog(); - return; - } - this.$nextTick(() => { - if (this.$store.state.windowMax768) { - this.goForward({path: '/manage/messenger', query: {sendmsg: this.msgText}}); - $A.setStorage("messenger::dialogId", data.dialog_id) - this.$store.state.dialogOpenId = data.dialog_id; - this.$store.dispatch('openTask', 0); - this.msgText = ""; + this.$store.dispatch("getDialogOne", data.dialog_id).then(() => { + this.sendLoad--; + if ($A.isSubElectron) { + this.resizeDialog(); } else { this.$nextTick(() => { - this.$refs.dialog.sendMsg(this.msgText); + if (this.$store.state.windowMax768) { + this.goForward({path: '/manage/messenger', query: {sendmsg: this.msgText}}); + $A.setStorage("messenger::dialogId", data.dialog_id) + this.$store.state.dialogOpenId = data.dialog_id; + this.$store.dispatch('openTask', 0); + } else { + this.$refs.dialog.sendMsg(this.msgText); + } this.msgText = ""; - }) + }); } + }).catch(({msg}) => { + this.sendLoad--; + $A.modalError(msg); }); }).catch(({msg}) => { + this.sendLoad--; $A.modalError(msg); }); }, openSend() { - if (this.sendLoad) { + if (this.sendLoad > 0) { return; } - this.sendLoad = true; + this.sendLoad++; + // this.$store.dispatch("call", { url: 'project/task/dialog', data: { task_id: this.taskDetail.id, }, }).then(({data}) => { - this.sendLoad = false; + this.sendLoad--; this.$store.dispatch("saveTask", data); - this.$store.dispatch("getDialogOne", data.dialog_id); + this.$store.dispatch("getDialogOne", data.dialog_id).catch(() => {}) if ($A.isSubElectron) { this.resizeDialog(); - return; + } else { + this.$nextTick(() => { + this.goForward({path: '/manage/messenger', query: {sendmsg: this.msgText}}); + $A.setStorage("messenger::dialogId", data.dialog_id) + this.$store.state.dialogOpenId = data.dialog_id; + this.$store.dispatch('openTask', 0); + }); } - this.$nextTick(() => { - this.goForward({path: '/manage/messenger', query: {sendmsg: this.msgText}}); - $A.setStorage("messenger::dialogId", data.dialog_id) - this.$store.state.dialogOpenId = data.dialog_id; - this.$store.dispatch('openTask', 0); - }); }).catch(({msg}) => { - this.sendLoad = false; + this.sendLoad--; $A.modalError(msg); }); }, @@ -1128,10 +1138,8 @@ export default { if (this.$refs.dialog || num > 20) { clearInterval(interval); if (this.$refs.dialog) { - this.$nextTick(() => { - this.$refs.dialog.sendMsg(this.msgText); - this.msgText = ""; - }) + this.$refs.dialog.sendMsg(this.msgText); + this.msgText = ""; } } }, 100); diff --git a/resources/assets/js/pages/manage/components/TaskMenu.vue b/resources/assets/js/pages/manage/components/TaskMenu.vue index ff269447..93ecdc15 100644 --- a/resources/assets/js/pages/manage/components/TaskMenu.vue +++ b/resources/assets/js/pages/manage/components/TaskMenu.vue @@ -57,7 +57,7 @@