修复BUG

src/renderer/components/index.vue

@@ -164,6 +164,8 @@ export default {
         this.MsgBus.$emit("delete-members",obj.teamMembers)
       }else if(obj.action=='create'){
         this.MsgBus.$emit("create-group",obj.teamMembers)
+      }else if(obj.action=='forward'){
+        this.MsgBus.$emit("goForward",obj.sessions)
       }
       //
     })

src/renderer/components/msssage/chatitem.vue

@@ -35,6 +35,7 @@
           v-if="msg.type=='image' || msg.type=='video' || msg.type=='audio'"
           @click="downloadFile(msg,1)"
         >另存为...</v-contextmenu-item>
+        <v-contextmenu-item @click="forwardMsg(msg)">转发</v-contextmenu-item>
         <v-contextmenu-item divider v-if="msg.flow==='out'"></v-contextmenu-item>
         <v-contextmenu-item @click="revocateMsg" v-if="msg.flow==='out'">撤回消息</v-contextmenu-item>
       </v-contextmenu>
@@ -770,6 +771,9 @@ export default {
       // 在会话聊天页
       this.$store.dispatch("revocateMsg", this.msg);
     },
+    forwardMsg(msg){
+      this.MsgBus.$emit("forward",msg);
+    },
     sendRobotBlockMsg(msg, originMsg) {
       if (this.isHistory) {
         // 在历史消息中，不进行机器人交互

src/renderer/components/msssage/index.vue

@@ -225,7 +225,8 @@ export default {
       noticeLastTime:0,
       isNetError:true,
       audio_base:'',
-      atIds:null
+      atIds:null,
+      forwardMsgInfo:{}
     };
   },
   updated() {
@@ -455,6 +456,20 @@ export default {
     this.MsgBus.$on("create-group", function(members) {
       that.createGroup(members);
     });
+    this.MsgBus.$on("forward",function(msg){
+      that.forwardMsgInfo=msg
+      console.log(that.forwardMsgInfo)
+      that.$electron.ipcRenderer.send("open-forward-msg",that.sessionlist);
+    })
+    this.MsgBus.$on("goForward",function(sessions){
+      sessions.forEach(x=>{
+        that.$store.dispatch("forwardMsg", {
+          scene: x.scene,
+          to: x.to,
+          msg: that.forwardMsgInfo
+        });
+      })
+    })
     this.MsgBus.$on("dispose-session", function() {
       that.$store.dispatch("resetCurrSession");
       that.currentSession = {

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 @click="toolPaste">粘贴</li>
+      <li @paste="toolPaste">粘贴</li>
     </div>
   </at>
 </template>
@@ -206,7 +206,7 @@ export default {
   methods: {
     toolPaste: function (e) {
       let clipboardData = 1
-      console.log(e)
+      console.log('111111111',e)
     },
     copyBox: function (e) {
       this.toolTop = e.offsetY

src/renderer/router/index.js

@@ -3,56 +3,60 @@ import Router from 'vue-router'
 
 Vue.use(Router)
 export default new Router({
-  routes: [
-    {
-      path: '/',
-      name: 'landing-page',
-      component: require('@/components/login')
-    },
-    {
-      path: '/home',
-      name: 'home',
-      component: require('@/components/index')
-    },
-    {
-      path: '/previewfile',
-      name: 'previewfile',
-      component: require('@/components/tools/previewerfile')
-    },
-    {
-      path: '/previewerimg',
-      name: 'previewerimg',
-      component: require('@/components/tools/previewerimg')
-    },
-    {
-      path: '/previewervideo',
-      name: 'previewervideo',
-      component: require('@/components/tools/previewervideo')
-    },
-    {
-      path: '/newmsg',
-      name: 'newmsg',
-      component: require('@/components/msssage/newMsgPop')
-    },
-    {
-      path: '/scrollerhot',
-      name: 'scrollerhot',
-      component: require('@/components/tools/scrollerhot')
-    },
-    {
-      path: '/dialog',
-      name: 'dialog',
-      component: require('@/components/tools/dialog')
-    },
-    {
-      path: '/addnewuser',
-      name: 'addnewuser',
-      component: require('@/components/team/addNewUser')
-    },
-    {
-      path: '/notice',
-      name: 'notice',
-      component: require('@/components/tools/notice')
-    }
-  ]
-})
+    routes: [{
+            path: '/',
+            name: 'landing-page',
+            component: require('@/components/login')
+        },
+        {
+            path: '/home',
+            name: 'home',
+            component: require('@/components/index')
+        },
+        {
+            path: '/previewfile',
+            name: 'previewfile',
+            component: require('@/components/tools/previewerfile')
+        },
+        {
+            path: '/previewerimg',
+            name: 'previewerimg',
+            component: require('@/components/tools/previewerimg')
+        },
+        {
+            path: '/previewervideo',
+            name: 'previewervideo',
+            component: require('@/components/tools/previewervideo')
+        },
+        {
+            path: '/newmsg',
+            name: 'newmsg',
+            component: require('@/components/msssage/newMsgPop')
+        },
+        {
+            path: '/scrollerhot',
+            name: 'scrollerhot',
+            component: require('@/components/tools/scrollerhot')
+        },
+        {
+            path: '/dialog',
+            name: 'dialog',
+            component: require('@/components/tools/dialog')
+        },
+        {
+            path: '/addnewuser',
+            name: 'addnewuser',
+            component: require('@/components/team/addNewUser')
+        },
+        {
+            path: '/notice',
+            name: 'notice',
+            component: require('@/components/tools/notice')
+        },
+        {
+            path: '/forwardMsg',
+            name: 'forwardMsg',
+            component: require('@/components/team/forwardMsg')
+        }
+    ]
+})
\ No newline at end of file

src/store/actions/msgs.js

@@ -92,7 +92,7 @@ export function forwardMsg({ state, commit }, obj) {
     nim.forwardMsg({
         scene: obj.scene,
         to: obj.to,
-        msg: obj.tip,
+        msg: obj.msg,
         done: function(err, msg) {
             onMsg(msg)
         }