diff --git a/resources/assets/js/components/UserAvatar.vue b/resources/assets/js/components/UserAvatar.vue index f1077f6c5..c2f496cc3 100755 --- a/resources/assets/js/components/UserAvatar.vue +++ b/resources/assets/js/components/UserAvatar.vue @@ -295,17 +295,16 @@ onClickOpen() { if (this.clickOpenDialog) { this.openDialog() + } else { + this.$emit('open-dialog', this.userid) } }, openDialog() { - this.$store.dispatch("showSpinner", 600) this.$store.dispatch("openDialogUserid", this.userid).then(_ => { this.goForward({name: 'manage-messenger'}) }).catch(({msg}) => { $A.modalError(msg) - }).finally(_ => { - this.$store.dispatch("hiddenSpinner") }); }, diff --git a/resources/assets/js/pages/manage/components/ChatInput/index.vue b/resources/assets/js/pages/manage/components/ChatInput/index.vue index 6b0ab4cfb..abc974024 100755 --- a/resources/assets/js/pages/manage/components/ChatInput/index.vue +++ b/resources/assets/js/pages/manage/components/ChatInput/index.vue @@ -1022,6 +1022,13 @@ export default { } }, + addMention(data) { + if (!this.quill) { + return; + } + this.quill.getModule("mention").insertItem(data, true); + }, + getProjectId() { let object = null; if (this.dialogId > 0) { diff --git a/resources/assets/js/pages/manage/components/DialogItem.vue b/resources/assets/js/pages/manage/components/DialogItem.vue index 1a825fe25..58fa558fa 100644 --- a/resources/assets/js/pages/manage/components/DialogItem.vue +++ b/resources/assets/js/pages/manage/components/DialogItem.vue @@ -22,7 +22,12 @@