diff --git a/resources/assets/js/components/ImgUpload.vue b/resources/assets/js/components/ImgUpload.vue index 96aab8f40..88736f471 100755 --- a/resources/assets/js/components/ImgUpload.vue +++ b/resources/assets/js/components/ImgUpload.vue @@ -305,16 +305,16 @@ url: 'system/imgview', data: {path: path ? path : ''}, }).then(({data}) => { - this.isLoading = false; let dirs = data['dirs']; for (let i = 0; i < dirs.length; i++) { this.browseList.push(dirs[i]); } this.browsePictureFor(data['files']); }).catch(({msg}) => { - this.isLoading = false; this.browseVisible = false; $A.noticeWarning(msg); + }).finally(_ => { + this.isLoading = false; }); }, diff --git a/resources/assets/js/components/UserInput.vue b/resources/assets/js/components/UserInput.vue index 06148e0b7..a1249372d 100755 --- a/resources/assets/js/components/UserInput.vue +++ b/resources/assets/js/components/UserInput.vue @@ -165,7 +165,6 @@ take: 30 }, }).then(({data}) => { - if (!history) this.loadIng--; this.list = data; // const index = this.searchHistory.findIndex(item => item.key == key); @@ -180,9 +179,10 @@ this.searchHistory.push(tmpData) } }).catch(({msg}) => { - if (!history) this.loadIng--; this.list = []; $A.messageWarning(msg); + }).finally(_ => { + if (!history) this.loadIng--; }); }, this.searchHistory.length > 0 ? 300 : 0) }, diff --git a/resources/assets/js/pages/login.vue b/resources/assets/js/pages/login.vue index 252af8303..6158ba1e6 100644 --- a/resources/assets/js/pages/login.vue +++ b/resources/assets/js/pages/login.vue @@ -309,12 +309,12 @@ export default { email: this.email, }, }).then(() => { - this.loadIng--; this.reCode(); this.codeNeed = true; }).catch(_ => { - this.loadIng--; this.codeNeed = false; + }).finally(_ => { + this.loadIng--; }); }, @@ -351,7 +351,6 @@ export default { invite: this.invite, }, }).then(({data}) => { - this.loadIng--; this.codeNeed = false; $A.setStorage("cacheLoginEmail", this.email) this.$store.dispatch("handleClearCache", data).then(() => { @@ -360,7 +359,6 @@ export default { this.goNext1(); }); }).catch(({data, msg}) => { - this.loadIng--; if (data.code === 'email') { $A.modalWarning(msg); } else { @@ -370,6 +368,8 @@ export default { this.reCode(); this.codeNeed = true; } + }).finally(_ => { + this.loadIng--; }); }) }, diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue index b32a66eff..3ef9254e9 100644 --- a/resources/assets/js/pages/manage.vue +++ b/resources/assets/js/pages/manage.vue @@ -822,13 +822,13 @@ export default { data: this.addData, }).then(({data, msg}) => { $A.messageSuccess(msg); - this.loadIng--; this.addShow = false; this.$refs.addProject.resetFields(); this.$store.dispatch("saveProject", data); this.toggleRoute('project', {projectId: data.id}) }).catch(({msg}) => { $A.modalError(msg); + }).finally(_ => { this.loadIng--; }); } @@ -998,14 +998,14 @@ export default { url: 'project/task/export', data: this.exportData, }).then(({data}) => { - this.exportLoadIng--; this.exportTaskShow = false; this.$store.dispatch('downUrl', { url: data.url }); }).catch(({msg}) => { - this.exportLoadIng--; $A.modalError(msg); + }).finally(_ => { + this.exportLoadIng--; }); }, diff --git a/resources/assets/js/pages/manage/components/FileContent.vue b/resources/assets/js/pages/manage/components/FileContent.vue index 5c4fde5f6..9db48211c 100644 --- a/resources/assets/js/pages/manage/components/FileContent.vue +++ b/resources/assets/js/pages/manage/components/FileContent.vue @@ -259,12 +259,11 @@ export default { id: this.fileId, }, }).then(({data}) => { - this.loadIng--; - this.loadContent--; this.contentDetail = data.content; this.updateBak(); }).catch(({msg}) => { $A.modalError(msg); + }).finally(_ => { this.loadIng--; this.loadContent--; }) @@ -299,15 +298,15 @@ export default { }, }).then(({data, msg}) => { $A.messageSuccess(msg); - this.loadIng--; this.$store.dispatch("saveFile", { id: this.fileId, size: data.size, }); }).catch(({msg}) => { $A.modalError(msg); - this.loadIng--; this.getContent(); + }).finally(_ => { + this.loadIng--; }) break; } diff --git a/resources/assets/js/pages/manage/components/FilePreview.vue b/resources/assets/js/pages/manage/components/FilePreview.vue index 1a4c92c99..4237fb9f2 100644 --- a/resources/assets/js/pages/manage/components/FilePreview.vue +++ b/resources/assets/js/pages/manage/components/FilePreview.vue @@ -136,10 +136,10 @@ export default { id: this.code || this.file.id, }, }).then(({data}) => { - this.loadContent--; this.contentDetail = data.content; }).catch(({msg}) => { $A.modalError(msg); + }).finally(_ => { this.loadContent--; }) }, diff --git a/resources/assets/js/pages/manage/components/ProjectArchived.vue b/resources/assets/js/pages/manage/components/ProjectArchived.vue index 4f9685e48..17e8f9c86 100644 --- a/resources/assets/js/pages/manage/components/ProjectArchived.vue +++ b/resources/assets/js/pages/manage/components/ProjectArchived.vue @@ -221,14 +221,14 @@ export default { pagesize: Math.max($A.runNum(this.pageSize), 10), }, }).then(({data}) => { - this.loadIng--; this.page = data.current_page; this.total = data.total; this.list = data.data; this.noText = '没有相关的数据'; }).catch(() => { - this.loadIng--; this.noText = '数据加载失败'; + }).finally(_ => { + this.loadIng--; }) }, @@ -253,13 +253,13 @@ export default { type: 'recovery' }, }).then(() => { - this.loadIng--; this.getLists(); this.$store.dispatch("getProjectOne", row.id).catch(() => {}); }).catch(({msg}) => { $A.modalError(msg); - this.loadIng--; this.getLists(); + }).finally(_ => { + this.loadIng--; }) }, @@ -268,12 +268,12 @@ export default { this.loadIng++; this.$store.dispatch("removeProject", row.id).then(({msg}) => { $A.messageSuccess(msg); - this.loadIng--; this.getLists(); }).catch(({msg}) => { $A.modalError(msg); - this.loadIng--; this.getLists(); + }).finally(_ => { + this.loadIng--; }); } } diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue index 906513652..10066b968 100644 --- a/resources/assets/js/pages/manage/components/ProjectList.vue +++ b/resources/assets/js/pages/manage/components/ProjectList.vue @@ -1077,11 +1077,11 @@ export default { }), }).then(({data, msg}) => { $A.messageSuccess(msg); - this.settingLoad--; this.settingShow = false; this.$store.dispatch("saveProject", data) }).catch(({msg}) => { $A.modalError(msg); + }).finally(_ => { this.settingLoad--; }); }, @@ -1096,12 +1096,12 @@ export default { }, }).then(({msg}) => { $A.messageSuccess(msg); - this.userLoad--; this.userShow = false; this.$store.dispatch("getProjectOne", this.projectId).catch(() => {}); this.$store.dispatch("getTaskForProject", this.projectId).catch(() => {}) }).catch(({msg}) => { $A.modalError(msg); + }).finally(_ => { this.userLoad--; }); }, @@ -1116,12 +1116,12 @@ export default { }, }).then(({msg}) => { $A.messageSuccess(msg); - this.transferLoad--; this.transferShow = false; this.$store.dispatch("getProjectOne", this.projectId).catch(() => {}); this.$store.dispatch("getTaskForProject", this.projectId).catch(() => {}) }).catch(({msg}) => { $A.modalError(msg); + }).finally(_ => { this.transferLoad--; }); }, @@ -1292,11 +1292,11 @@ export default { refresh: refresh === true ? 'yes' : 'no' }, }).then(({data}) => { - this.inviteLoad--; this.inviteData = data; this.inviteCopy(); }).catch(({msg}) => { $A.modalError(msg); + }).finally(_ => { this.inviteLoad--; }); }, diff --git a/resources/assets/js/pages/manage/components/ProjectLog.vue b/resources/assets/js/pages/manage/components/ProjectLog.vue index 5d573290b..7f066e0e4 100644 --- a/resources/assets/js/pages/manage/components/ProjectLog.vue +++ b/resources/assets/js/pages/manage/components/ProjectLog.vue @@ -111,7 +111,6 @@ export default { pagesize: Math.max($A.runNum(this.listPageSize), 10), } }).then(({data}) => { - this.loadIng--; if (resetLoad === true) { this.lists = []; } @@ -143,10 +142,11 @@ export default { this.hasMorePages = data.current_page < data.last_page; this.totalNum = data.total; }).catch(() => { - this.loadIng--; this.lists = []; this.hasMorePages = false; this.totalNum = 0; + }).finally(_ => { + this.loadIng--; }); }, diff --git a/resources/assets/js/pages/manage/components/ProjectManagement.vue b/resources/assets/js/pages/manage/components/ProjectManagement.vue index 0a09e108b..adee9b7b1 100644 --- a/resources/assets/js/pages/manage/components/ProjectManagement.vue +++ b/resources/assets/js/pages/manage/components/ProjectManagement.vue @@ -213,14 +213,14 @@ export default { pagesize: Math.max($A.runNum(this.pageSize), 10), }, }).then(({data}) => { - this.loadIng--; this.page = data.current_page; this.total = data.total; this.list = data.data; this.noText = '没有相关的数据'; }).catch(() => { - this.loadIng--; this.noText = '数据加载失败'; + }).finally(_ => { + this.loadIng--; }) }, diff --git a/resources/assets/js/pages/manage/components/ProjectWorkflow.vue b/resources/assets/js/pages/manage/components/ProjectWorkflow.vue index dfa1381a8..de7eff3b5 100644 --- a/resources/assets/js/pages/manage/components/ProjectWorkflow.vue +++ b/resources/assets/js/pages/manage/components/ProjectWorkflow.vue @@ -231,7 +231,6 @@ export default { project_id: this.projectId, }, }).then(({data}) => { - this.loadIng--; this.list = data.map(item => { item.project_flow_bak = JSON.stringify(item.project_flow_item) return item; @@ -239,8 +238,9 @@ export default { this.openIndex = this.list.length === 1 ? ("index_" + this.list[0].id) : "" this.$nextTick(this.syncScroller); }).catch(({msg}) => { - this.loadIng--; $A.modalError(msg); + }).finally(_ => { + this.loadIng--; }); }, @@ -347,7 +347,6 @@ export default { project_id: this.projectId, }, }).then(({msg}) => { - this.loadIng--; $.messageSuccess(msg); this.$Modal.remove(); // @@ -356,9 +355,10 @@ export default { this.list.splice(index, 1) } }).catch(({msg}) => { - this.loadIng--; $A.modalError(msg, 301); this.$Modal.remove(); + }).finally(_ => { + this.loadIng--; }); } else { let index = this.list.findIndex(({id}) => id == data.id) @@ -475,7 +475,6 @@ export default { }, method: 'post', }).then(({data, msg}) => { - this.loadIng--; $.messageSuccess(msg) // data.project_flow_bak = JSON.stringify(data.project_flow_item) @@ -488,8 +487,9 @@ export default { this.openIndex = "index_" + data.id; this.$nextTick(this.syncScroller); }).catch(({msg}) => { - this.loadIng--; $A.modalError(msg); + }).finally(_ => { + this.loadIng--; }); }, diff --git a/resources/assets/js/pages/manage/components/TaskArchived.vue b/resources/assets/js/pages/manage/components/TaskArchived.vue index dfa60fcd4..d59f62171 100644 --- a/resources/assets/js/pages/manage/components/TaskArchived.vue +++ b/resources/assets/js/pages/manage/components/TaskArchived.vue @@ -266,14 +266,14 @@ export default { pagesize: Math.max($A.runNum(this.pageSize), 10), }, }).then(({data}) => { - this.loadIng--; this.page = data.current_page; this.total = data.total; this.list = data.data; this.noText = '没有相关的数据'; }).catch(() => { - this.loadIng--; this.noText = '数据加载失败'; + }).finally(_ => { + this.loadIng--; }) }, diff --git a/resources/assets/js/pages/manage/components/TaskDeleted.vue b/resources/assets/js/pages/manage/components/TaskDeleted.vue index d3f9210cc..e54d963c0 100644 --- a/resources/assets/js/pages/manage/components/TaskDeleted.vue +++ b/resources/assets/js/pages/manage/components/TaskDeleted.vue @@ -214,14 +214,14 @@ export default { pagesize: Math.max($A.runNum(this.pageSize), 10), }, }).then(({data}) => { - this.loadIng--; this.page = data.current_page; this.total = data.total; this.list = data.data; this.noText = '没有相关的数据'; }).catch(() => { - this.loadIng--; this.noText = '数据加载失败'; + }).finally(_ => { + this.loadIng--; }) }, diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue index 2d83cee29..1c11116e7 100644 --- a/resources/assets/js/pages/manage/components/TaskDetail.vue +++ b/resources/assets/js/pages/manage/components/TaskDetail.vue @@ -1083,7 +1083,6 @@ export default { }).then(({data}) => { this.$store.dispatch("saveTask", data); this.$store.dispatch("getDialogOne", data.dialog_id).then(() => { - this.sendLoad--; if ($A.isSubElectron) { this.resizeDialog().then(() => { this.sendDialogMsg(); @@ -1106,8 +1105,9 @@ export default { }); } }).catch(({msg}) => { - this.sendLoad--; $A.modalError(msg); + }).finally(_ => { + this.sendLoad--; }); }).catch(({msg}) => { this.sendLoad--; diff --git a/resources/assets/js/pages/manage/components/TeamManagement.vue b/resources/assets/js/pages/manage/components/TeamManagement.vue index 2953578f3..b40545654 100644 --- a/resources/assets/js/pages/manage/components/TeamManagement.vue +++ b/resources/assets/js/pages/manage/components/TeamManagement.vue @@ -380,14 +380,14 @@ export default { pagesize: Math.max($A.runNum(this.pageSize), 10), }, }).then(({data}) => { - this.loadIng--; this.page = data.current_page; this.total = data.total; this.list = data.data; this.noText = '没有相关的数据'; }).catch(() => { - this.loadIng--; this.noText = '数据加载失败'; + }).finally(_ => { + this.loadIng--; }) }, diff --git a/resources/assets/js/pages/manage/file.vue b/resources/assets/js/pages/manage/file.vue index d6528ed93..56fa88240 100644 --- a/resources/assets/js/pages/manage/file.vue +++ b/resources/assets/js/pages/manage/file.vue @@ -1145,15 +1145,15 @@ export default { refresh: refresh === true ? 'yes' : 'no' }, }).then(({data}) => { - this.linkLoad--; this.linkData = Object.assign(data, { id: this.linkData.id }); this.linkCopy(); }).catch(({msg}) => { - this.linkLoad--; this.linkShow = false $A.modalError(msg); + }).finally(_ => { + this.linkLoad--; }); }, @@ -1348,7 +1348,6 @@ export default { id: this.shareInfo.id }, }).then(({data}) => { - this.shareLoad--; if (data.id == this.shareInfo.id) { this.shareList = data.list.map(item => { item._permission = item.permission; @@ -1356,9 +1355,10 @@ export default { }); } }).catch(({msg}) => { - this.shareLoad--; this.shareShow = false; $A.modalError(msg) + }).finally(_ => { + this.shareLoad--; }) }, @@ -1374,13 +1374,11 @@ export default { force: force === true ? 1 : 0 }), }).then(({data, msg}) => { - this.shareLoad--; $A.messageSuccess(msg) this.$store.dispatch("saveFile", data); this.$set(this.shareInfo, 'userids', []); this.getShare(); }).catch(({ret, msg}) => { - this.shareLoad--; if (ret === -3001) { $A.modalConfirm({ content: '此文件夹内已有共享文件夹,子文件的共享状态将被取消,是否继续?', @@ -1391,6 +1389,8 @@ export default { } else { $A.modalError(msg, force === true ? 301 : 0) } + }).finally(_ => { + this.shareLoad--; }) }, diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue index c68470907..7de4a5679 100644 --- a/resources/assets/js/pages/manage/messenger.vue +++ b/resources/assets/js/pages/manage/messenger.vue @@ -376,7 +376,6 @@ export default { pagesize: 50 }, }).then(({data}) => { - this.contactsLoad--; data.data.some((user) => { if (user.userid === this.userId) { return false; @@ -395,8 +394,9 @@ export default { this.contactsCurrentPage = data.current_page; this.contactsHasMorePages = data.current_page < data.last_page; }).catch(() => { - this.contactsLoad--; this.contactsHasMorePages = false; + }).finally(_ => { + this.contactsLoad--; }); }, diff --git a/resources/assets/js/pages/manage/projectInvite.vue b/resources/assets/js/pages/manage/projectInvite.vue index 9efc69cab..9fabcd3a9 100644 --- a/resources/assets/js/pages/manage/projectInvite.vue +++ b/resources/assets/js/pages/manage/projectInvite.vue @@ -74,12 +74,12 @@ export default { code: this.code, }, }).then(({data}) => { - this.loadIng--; this.already = data.already; this.project = data.project; }).catch(() => { - this.loadIng--; this.project = {} + }).finally(_ => { + this.loadIng--; }); }, @@ -91,13 +91,13 @@ export default { code: this.code, }, }).then(({data}) => { - this.joinLoad--; this.already = data.already; this.project = data.project; this.goProject(); }).catch(({msg}) => { - this.joinLoad--; $A.modalError(msg); + }).finally(_ => { + this.joinLoad--; }); }, diff --git a/resources/assets/js/pages/manage/setting/components/SystemColumnTemplate.vue b/resources/assets/js/pages/manage/setting/components/SystemColumnTemplate.vue index 8ba032085..a6d88ffe3 100644 --- a/resources/assets/js/pages/manage/setting/components/SystemColumnTemplate.vue +++ b/resources/assets/js/pages/manage/setting/components/SystemColumnTemplate.vue @@ -101,7 +101,6 @@ export default { if (save) { $A.messageSuccess('修改成功'); } - this.loadIng--; this.$store.state.columnTemplate = $A.cloneJSON(data).map(item => { if ($A.isArray(item.columns)) { item.columns = item.columns.join(",") @@ -112,6 +111,7 @@ export default { if (save) { $A.modalError(msg); } + }).finally(_ => { this.loadIng--; }); } diff --git a/resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue b/resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue index 6bcec37d7..a121ec094 100644 --- a/resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue +++ b/resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue @@ -104,13 +104,13 @@ export default { if (save) { $A.messageSuccess('修改成功'); } - this.loadIng--; this.formData = data; this.formDatum_bak = $A.cloneJSON(this.formData); }).catch(({msg}) => { if (save) { $A.modalError(msg); } + }).finally(_ => { this.loadIng--; }); }, diff --git a/resources/assets/js/pages/manage/setting/components/SystemSetting.vue b/resources/assets/js/pages/manage/setting/components/SystemSetting.vue index b5f653e6c..542866e39 100644 --- a/resources/assets/js/pages/manage/setting/components/SystemSetting.vue +++ b/resources/assets/js/pages/manage/setting/components/SystemSetting.vue @@ -126,13 +126,13 @@ export default { if (save) { $A.messageSuccess('修改成功'); } - this.loadIng--; this.formDatum = data; this.formDatum_bak = $A.cloneJSON(this.formDatum); }).catch(({msg}) => { if (save) { $A.modalError(msg); } + }).finally(_ => { this.loadIng--; }); } diff --git a/resources/assets/js/pages/manage/setting/components/SystemTaskPriority.vue b/resources/assets/js/pages/manage/setting/components/SystemTaskPriority.vue index 52acf5ec0..ee7e52157 100644 --- a/resources/assets/js/pages/manage/setting/components/SystemTaskPriority.vue +++ b/resources/assets/js/pages/manage/setting/components/SystemTaskPriority.vue @@ -119,12 +119,12 @@ export default { if (save) { $A.messageSuccess('修改成功'); } - this.loadIng--; this.$store.state.taskPriority = $A.cloneJSON(data); }).catch(({msg}) => { if (save) { $A.modalError(msg); } + }).finally(_ => { this.loadIng--; }); } diff --git a/resources/assets/js/pages/manage/setting/password.vue b/resources/assets/js/pages/manage/setting/password.vue index 024d39645..9ac135518 100644 --- a/resources/assets/js/pages/manage/setting/password.vue +++ b/resources/assets/js/pages/manage/setting/password.vue @@ -90,11 +90,11 @@ export default { data: this.formDatum, }).then(({data}) => { $A.messageSuccess('修改成功'); - this.loadIng--; this.$store.dispatch("saveUserInfo", data); this.$refs.formDatum.resetFields(); }).catch(({msg}) => { $A.modalError(msg); + }).finally(_ => { this.loadIng--; }); } diff --git a/resources/assets/js/pages/manage/setting/personal.vue b/resources/assets/js/pages/manage/setting/personal.vue index e8f40fe11..f88fefcc9 100644 --- a/resources/assets/js/pages/manage/setting/personal.vue +++ b/resources/assets/js/pages/manage/setting/personal.vue @@ -81,10 +81,10 @@ export default { data, }).then(() => { $A.messageSuccess('修改成功'); - this.loadIng--; this.$store.dispatch('getUserInfo').catch(() => {}); }).catch(({msg}) => { $A.modalError(msg); + }).finally(_ => { this.loadIng--; }); } diff --git a/resources/assets/js/pages/single/file.vue b/resources/assets/js/pages/single/file.vue index c9cd10bd1..dabca8d26 100644 --- a/resources/assets/js/pages/single/file.vue +++ b/resources/assets/js/pages/single/file.vue @@ -62,16 +62,16 @@ export default { url: 'file/one', data, }).then(({data}) => { - this.loadIng--; this.fileInfo = data; }).catch(({msg}) => { - this.loadIng--; $A.modalError({ content: msg, onOk: () => { window.close(); } }); + }).finally(_ => { + this.loadIng--; }); } } diff --git a/resources/assets/js/pages/single/fileMsg.vue b/resources/assets/js/pages/single/fileMsg.vue index 801f9d639..b5a7b8eb1 100644 --- a/resources/assets/js/pages/single/fileMsg.vue +++ b/resources/assets/js/pages/single/fileMsg.vue @@ -136,10 +136,8 @@ export default { msg_id: this.msgId, }, }).then(({data}) => { - this.loadIng--; this.msgDetail = data; }).catch(({msg}) => { - this.loadIng--; $A.modalError({ content: msg, onOk: () => { @@ -148,6 +146,8 @@ export default { } } }); + }).finally(_ => { + this.loadIng--; }); }, documentKey() { diff --git a/resources/assets/js/pages/single/fileTask.vue b/resources/assets/js/pages/single/fileTask.vue index f3659bf16..7317f111c 100644 --- a/resources/assets/js/pages/single/fileTask.vue +++ b/resources/assets/js/pages/single/fileTask.vue @@ -136,10 +136,8 @@ export default { file_id: this.fileId, }, }).then(({data}) => { - this.loadIng--; this.fileDetail = data; }).catch(({msg}) => { - this.loadIng--; $A.modalError({ content: msg, onOk: () => { @@ -148,6 +146,8 @@ export default { } } }); + }).finally(_ => { + this.loadIng--; }); }, documentKey() {