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,47 +292,55 @@ export default {
       };
       a.readAsDataURL(blob);
     },
+    NextClip(event){
+      console.log(123)
+      let that = this;
+      var clipboardData = event.clipboardData;
+      var items, item, types;
+      if (clipboardData) {
+        items = clipboardData.items;
+        if (!items || items.length == 0) {
+          that.$electron.ipcRenderer.send("read-clip");
+          return false;
+        } else {
+          // 保存在剪贴板中的数据类型
+          types = clipboardData.types || [];
+          for (var i = 0; i < types.length; i++) {
+            if (types[i] === "Files") {
+              item = items[i];
+              break;
+            }
+          }
+          if (
+            item &&
+            item.kind === "file" &&
+            item.type.match(/^image\//i)
+          ) {
+
+            // 读取该图片
+            var file = item.getAsFile(),
+              reader = new FileReader(),
+              name = "";
+            if (item.type.match(/^image\//i))
+              name = `截图_${Date.parse(new Date())}.png`;
+            reader.onload = function(e) {
+              that.createImage(e.target.result)
+            };
+            reader.readAsDataURL(file);
+          }
+        }
+      }
+    },
     initClip() {
       let that = this;
       document
         .querySelector("#msgEditorBox")
-        .addEventListener("paste", function(event) {
-          var clipboardData = event.clipboardData;
-          var items, item, types;
-          if (clipboardData) {
-            items = clipboardData.items;
-            if (!items || items.length == 0) {
-              that.$electron.ipcRenderer.send("read-clip");
-              return false;
-            } else {
-              // 保存在剪贴板中的数据类型
-              types = clipboardData.types || [];
-              for (var i = 0; i < types.length; i++) {
-                if (types[i] === "Files") {
-                  item = items[i];
-                  break;
-                }
-              }
-              if (
-                item &&
-                item.kind === "file" &&
-                item.type.match(/^image\//i)
-              ) {
-
-                // 读取该图片
-                var file = item.getAsFile(),
-                  reader = new FileReader(),
-                  name = "";
-                if (item.type.match(/^image\//i))
-                  name = `截图_${Date.parse(new Date())}.png`;
-                reader.onload = function(e) {
-                  that.createImage(e.target.result)
-                };
-                reader.readAsDataURL(file);
-              }
-            }
-          }
-        });
+        .removeEventListener("paste", that.NextClip, true);
+      setTimeout(()=>{
+        document
+        .querySelector("#msgEditorBox")
+        .addEventListener("paste", that.NextClip);
+      }, 20)
     },
     createImage(dataurl){
       var strLen = dataurl.length;