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

.gitignore

@@ -17,3 +17,4 @@ dist/
 package/
 build/
 node_modules.rar
+node_modules.zip

src/store/actions/index.js

@@ -4,28 +4,28 @@ import cookie from '../../utils/cookie'
 import pageUtil from '../../utils/page'
 
 /* 导出actions方法 */
-import {showLoading, hideLoading, showFullscreenImg, hideFullscreenImg} from './widgetUi'
-import {initNimSDK} from './initNimSDK'
-import {initChatroomSDK, resetChatroomSDK} from './initChatroomSDK'
-import {updateBlack} from './blacks'
-import {updateFriend, addFriend, deleteFriend} from './friends'
-import {resetSearchResult, searchUsers, searchTeam} from './search'
-import {deleteSession, setCurrSession, resetCurrSession} from './session'
-import {sendMsg, sendTip,markInMutelist, sendFileMsg,sendDataUrlMsg,sendDataUrlMsgCall, sendMsgReceipt, sendRobotMsg, revocateMsg, updateLocalMsg, getHistoryMsgs, resetNoMoreHistoryMsgs, continueRobotMsg} from './msgs'
-import {markSysMsgRead, resetSysMsgs, deleteSysMsgs, markCustomSysMsgRead} from './sysMsgs'
-import {sendChatroomMsg, sendChatroomRobotMsg, sendChatroomFileMsg, getChatroomHistoryMsgs} from './chatroomMsgs'
-import {initChatroomInfos, getChatroomInfo, getChatroomMembers, clearChatroomMembers} from './chatroomInfos'
-import { delegateTeamFunction, getNotifyForNewTeamMsg,onTeamNotificationMsg, enterSettingPage, getTeamMembers, checkTeamMsgReceipt, getTeamMsgReads} from './team'
+import { showLoading, hideLoading, showFullscreenImg, hideFullscreenImg } from './widgetUi'
+import { initNimSDK } from './initNimSDK'
+import { initChatroomSDK, resetChatroomSDK } from './initChatroomSDK'
+import { updateBlack } from './blacks'
+import { updateFriend, addFriend, deleteFriend } from './friends'
+import { resetSearchResult, searchUsers, searchTeam } from './search'
+import { deleteSession, setCurrSession, resetCurrSession } from './session'
+import { sendMsg, sendTip, forwardMsg, markInMutelist, sendFileMsg, sendDataUrlMsg, sendDataUrlMsgCall, sendMsgReceipt, sendRobotMsg, revocateMsg, updateLocalMsg, getHistoryMsgs, resetNoMoreHistoryMsgs, continueRobotMsg } from './msgs'
+import { markSysMsgRead, resetSysMsgs, deleteSysMsgs, markCustomSysMsgRead } from './sysMsgs'
+import { sendChatroomMsg, sendChatroomRobotMsg, sendChatroomFileMsg, getChatroomHistoryMsgs } from './chatroomMsgs'
+import { initChatroomInfos, getChatroomInfo, getChatroomMembers, clearChatroomMembers } from './chatroomInfos'
+import { delegateTeamFunction, getNotifyForNewTeamMsg, onTeamNotificationMsg, enterSettingPage, getTeamMembers, checkTeamMsgReceipt, getTeamMsgReads } from './team'
 
-function connectNim ({state, commit, dispatch}, obj) {
-  let {force} = Object.assign({}, obj)
+function connectNim({ state, commit, dispatch }, obj) {
+    let { force } = Object.assign({}, obj)
         // 操作为内容页刷新页面，此时无nim实例
         // 
     if (!state.nim || force) {
-    let loginuser= require('electron').remote.getGlobal("LOGINUSER");
+        let loginuser = require('electron').remote.getGlobal("LOGINUSER");
         let loginInfo = {
             uid: loginuser.ImAccount,
-      sdktoken:loginuser.ImToken,
+            sdktoken: loginuser.ImToken,
         }
         if (!loginInfo.uid) {
             // 无cookie，直接跳转登录页
@@ -37,14 +37,14 @@ function connectNim ({state, commit, dispatch}, obj) {
     }
 }
 
-function connectChatroom ({state, commit, dispatch}, obj) {
-  let {chatroomId} = Object.assign({}, obj)
+function connectChatroom({ state, commit, dispatch }, obj) {
+    let { chatroomId } = Object.assign({}, obj)
     const nim = state.nim
     if (nim) {
         dispatch('showLoading')
         nim.getChatroomAddress({
             chatroomId,
-      done: function getChatroomAddressDone (error, obj) {
+            done: function getChatroomAddressDone(error, obj) {
                 if (error) {
                     //alert(error.message)
                     //location.href = '#/room'
@@ -57,7 +57,7 @@ function connectChatroom ({state, commit, dispatch}, obj) {
 }
 
 export default {
-  updateRefreshState ({commit}) {
+    updateRefreshState({ commit }) {
         commit('updateRefreshState')
     },
 
@@ -69,8 +69,8 @@ export default {
     continueRobotMsg,
 
     // 连接sdk请求，false表示强制重连
-  connect (store, obj) {
-    let {type} = Object.assign({}, obj)
+    connect(store, obj) {
+        let { type } = Object.assign({}, obj)
             // type 可为 nim chatroom
         type = type || 'nim'
         switch (type) {
@@ -84,7 +84,7 @@ export default {
     },
 
     // 用户触发的登出逻辑
-  logout ({ state, commit }) {
+    logout({ state, commit }) {
         cookie.delCookie('uid')
         cookie.delCookie('sdktoken')
         if (state.nim) {
@@ -113,6 +113,7 @@ export default {
     resetCurrSession,
     // 发送消息
     sendMsg,
+    forwardMsg,
     sendTip,
     sendFileMsg,
     sendDataUrlMsg,