diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index d58251ec1..d8b44f0d9 100644 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -8,6 +8,7 @@ import Vuex from 'vuex' import App from './App.vue' import routes from './routes' import VueRouter from 'vue-router' +import VueClipboard from 'vue-clipboard2' import ViewUI from 'view-design-hi'; import Language from './language/index' import store from './store/index' @@ -18,6 +19,7 @@ Vue.use(ViewUI, { checkEscClose: true } }); +Vue.use(VueClipboard); Vue.use(VueRouter); Vue.use(Language); diff --git a/resources/assets/js/pages/manage/calendar.vue b/resources/assets/js/pages/manage/calendar.vue index 98d127867..ecc0152ab 100644 --- a/resources/assets/js/pages/manage/calendar.vue +++ b/resources/assets/js/pages/manage/calendar.vue @@ -361,11 +361,11 @@ export default { onOk: () => { this.$store.dispatch("removeTask", {task_id: data.id}).then(({msg}) => { $A.messageSuccess(msg); - this.$Modal.remove(); }).catch(({msg}) => { $A.modalError(msg, 301); - this.$Modal.remove(); this.setRenderRange(); + }).finally(_ => { + this.$Modal.remove(); }); } }); diff --git a/resources/assets/js/pages/manage/components/DialogGroupInfo.vue b/resources/assets/js/pages/manage/components/DialogGroupInfo.vue index 2b787fd91..ee0fc0474 100644 --- a/resources/assets/js/pages/manage/components/DialogGroupInfo.vue +++ b/resources/assets/js/pages/manage/components/DialogGroupInfo.vue @@ -225,7 +225,6 @@ export default { userids, } }).then(({msg}) => { - this.$Modal.remove(); $A.messageSuccess(msg); if (userids.length > 0) { this.getDialogUser(); @@ -235,6 +234,7 @@ export default { } }).catch(({msg}) => { $A.modalError(msg, 301); + }).finally(_ => { this.$Modal.remove(); }); }, @@ -253,12 +253,12 @@ export default { dialog_id: this.dialogId, } }).then(({msg}) => { - this.$Modal.remove(); $A.messageSuccess(msg); this.$store.dispatch("forgetDialog", this.dialogId); this.goForward({name: 'manage-messenger'}); }).catch(({msg}) => { $A.modalError(msg, 301); + }).finally(_ => { this.$Modal.remove(); }); }, diff --git a/resources/assets/js/pages/manage/components/DialogView.vue b/resources/assets/js/pages/manage/components/DialogView.vue index 1c6fec061..a9c46d6a6 100644 --- a/resources/assets/js/pages/manage/components/DialogView.vue +++ b/resources/assets/js/pages/manage/components/DialogView.vue @@ -266,9 +266,9 @@ export default { }).then(() => { $A.messageSuccess("消息已撤回"); this.$store.dispatch("forgetDialogMsg", this.msgData.id); - this.$Modal.remove(); }).catch(({msg}) => { $A.messageError(msg, 301); + }).finally(_ => { this.$Modal.remove(); }); } diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue index 10066b968..6bd2e43d8 100644 --- a/resources/assets/js/pages/manage/components/ProjectList.vue +++ b/resources/assets/js/pages/manage/components/ProjectList.vue @@ -452,10 +452,6 @@