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

src/renderer/components/msssage/index.vue

@@ -475,9 +475,6 @@ export default {
     }
   },
   mounted() {
-    this.MsgBus.$on('change-historic', function (){
-      console.log("asdasd 哈哈哈哈")
-    })
     this.audio_base=this.$electron.remote.getGlobal("AUDIO_PATH")+'audio/'
     if (window.localStorage.top) {
       this.TOPSESSION = JSON.parse(window.localStorage.top);

src/renderer/components/tools/contenteditor.vue

@@ -244,6 +244,8 @@ export default {
     offMsgBusListener(){
       this.MsgBus.$off("send-at-name");
       this.MsgBus.$off("new-screen-hot");
+      this.$electron.ipcRenderer.removeAllListeners(['new-send-file'])
+      let _this = this;
     },
     toolPaste: function (e) {
       let clipboardData = 1;
@@ -278,7 +280,6 @@ export default {
           innerHTML: sessionText
         })
       }
-      this.MsgBus.$emit('change-historic')
       window.localStorage.historicList = JSON.stringify(historicList)
     },
     updateClipboard() {
@@ -291,11 +292,9 @@ export default {
       };
       a.readAsDataURL(blob);
     },
-    initClip() {
+    NextClip(event){
+      console.log(123)
       let that = this;
-      document
-        .querySelector("#msgEditorBox")
-        .addEventListener("paste", function(event) {
       var clipboardData = event.clipboardData;
       var items, item, types;
       if (clipboardData) {
@@ -331,7 +330,17 @@ export default {
           }
         }
       }
-        });
+    },
+    initClip() {
+      let that = this;
+      document
+        .querySelector("#msgEditorBox")
+        .removeEventListener("paste", that.NextClip, true);
+      setTimeout(()=>{
+        document
+        .querySelector("#msgEditorBox")
+        .addEventListener("paste", that.NextClip);
+      }, 20)
     },
     createImage(dataurl){
       var strLen = dataurl.length;