1

src/renderer/components/msssage/chatitem.vue

@@ -40,7 +40,7 @@
       </v-contextmenu>
       <!-- v-touch:hold="revocateMsg" -->
       <a class="msg-head" v-if="msg.avatar" @click="headAtBoxShow" @contextmenu="AtHim">
-        <img class="icon u-circle" :data-id="msg.from" :data-name="msg.fromNick" :data-scene="msg.scene" :src="msg.avatar">
+        <img class="icon u-circle" :data-id="msg.from" :data-name="msg.fromNick" :data-flow="msg.flow" :data-scene="msg.scene" :src="msg.avatar">
       </a>
       <div class="msg-info">
         <div class="u-member-name" v-if="msg.flow=='in' && msg.scene==='team'">{{msg.fromNick}}</div>
@@ -292,11 +292,19 @@ export default {
   },
   methods: {
     AtHim(e){
-      this.MsgBus.$emit('open-atBox', e.target.dataset.name, e.clientY, e.clientX, e.target.dataset.id, e.target.dataset.scene)
+      console.log(e.target.dataset.flow, e.target.dataset.scene)
+      if (e.target.dataset.flow == "out" && e.target.dataset.scene !== 'team') {
+        return
+      } else {
+        this.MsgBus.$emit('open-atBox', e.target.dataset.name, e.clientY, e.clientX, e.target.dataset.id, e.target.dataset.scene)
+      }
     },
     headAtBoxShow(e){
-      console.log(e)
-      this.MsgBus.$emit('open-card', e.target.dataset.name, e.clientY-30, e.clientX+30, e.target.dataset.id, true)
+      if (e.target.dataset.flow == "out" && e.target.dataset.scene !== 'team') {
+        return false
+      } else {
+        this.MsgBus.$emit('open-card', e.target.dataset.name, e.clientY-30, e.clientX+30, e.target.dataset.id, true)
+      }
     },
     showMenu() {
       let dom = document.querySelector("#chat-list");

src/renderer/components/tools/contenteditor.vue

@@ -75,7 +75,7 @@ export default {
   },
   mounted() {
     this.MsgBus.$on("send-at-name", function(name) {
-      document.querySelector('#msgEditorBox').innerText = `@${name}`
+      document.querySelector('#msgEditorBox').innerText = document.querySelector('#msgEditorBox').innerText + `@${name} `
     })
     this.initClip();
     let that = this;