Merge branch 'master' of http://gitlab.oytour.com/viitto/madara

# Conflicts:
#	src/renderer/components/tools/contenteditor.vue

src/renderer/components/index.vue

@@ -175,6 +175,7 @@ export default {
         that.usercardInfo.searchName = ""
         that.atInfo.atName = ''
       }
+      that.MsgBus.$emit("close-copy")
     });
   },
   methods: {

src/renderer/components/msssage/chat.vue

@@ -38,7 +38,7 @@
             </span>
             <div class="nick-name">添加</div>
           </li>
-          <li @click="addMembers('delete')">
+          <li @click="addMembers('delete')" v-if="membersInDisplay[0].account == ImAccount">
             <span class="opera">
               <i class="el-icon-minus"></i>
             </span>
@@ -241,7 +241,8 @@ export default {
       lstShowData:null,
       showAt:false,
       findTimer:null,
-      requestCount:0
+      requestCount:0,
+      ImAccount: '',
     };
   },
   updated() {
@@ -272,6 +273,8 @@ export default {
     }
   },
   mounted() {
+    let user = this.$electron.remote.getGlobal("LOGINUSER");
+    this.ImAccount = this.user.ImAccount
     //获取记录的操作区域高度
     if (localStorage.consoleh && localStorage.consoleh != "") {
       this.consoleinfo.currenth = parseInt(localStorage.consoleh);

src/renderer/components/tools/contenteditor.vue

@@ -17,7 +17,7 @@
     ></div>
     <div class="tool-copy" :style="{'top': toolTop+'px','left': toolLeft+'px'}" v-if="toolShow">
       <!-- <li>复制</li> -->
-      <li @paste="toolPaste">粘贴</li>
+      <li @click="toolPaste">粘贴</li>
     </div>
   </at>
 </template>
@@ -82,11 +82,14 @@ export default {
     }
   },
   mounted() {
+    let that = this;
     this.MsgBus.$on("send-at-name", function(name) {
       document.querySelector('#msgEditorBox').innerText = document.querySelector('#msgEditorBox').innerText + `@${name} `
     })
+    this.MsgBus.$on("close-copy", function() {
+      that.toolShow = false;
+    })
     this.initClip();
-    let that = this;
     if(this.members && this.members.length>1){
       this.showMember=this.members.filter(x=>{
         if(x.alias=='我'){
@@ -205,8 +208,10 @@ export default {
   }, 
   methods: {
     toolPaste: function (e) {
-      let clipboardData = 1
-      console.log('111111111',e)
+      let clipboardData = 1;
+      document.getElementById('msgEditorBox').focus();
+      document.execCommand("paste");
+      this.toolShow = false;
     },
     copyBox: function (e) {
       this.toolTop = e.offsetY