Merge pull request #250 from renxxing/dev

fix(fix #212): cancel highlight

src/controllers/server.js

@@ -12,6 +12,7 @@ import { getSheetIndex } from '../methods/get';
 import Store from '../store';
 import locale from '../locale/locale';
 import dayjs from "dayjs";
+import imageCtrl from './imageCtrl';
 
 const server = {
     gridKey: null,
@@ -163,16 +164,21 @@ const server = {
 
 	        //客户端接收服务端数据时触发
 	        _this.websocket.onmessage = function(result){
-	            let data = eval('(' + result.data + ')');
-	            console.info(data);
-	            let type = data.type;
-
+				Store.result = result
+				let data = eval('(' + result.data + ')');
+				console.info(data);		
+				let type = data.type;
+				let {message,id} = data;
+				// 用户退出时，关闭协同编辑时其提示框
+				if(message === '用户退出') {
+					$("#luckysheet-multipleRange-show-" + id).hide();
+				}
 	            if(type == 1){ //send 成功或失败
 
 	            }
 	            else if(type == 2){ //更新数据
 	                let item = JSON.parse(data.data);
-	                _this.wsUpdateMsg(item);
+					_this.wsUpdateMsg(item);
 	            }
 	            else if(type == 3){ //多人操作不同选区("t": "mv")（用不同颜色显示其他人所操作的选区）
 	                let id = data.id;

src/controllers/sheetBar.js

@@ -206,6 +206,8 @@ export function initialSheetBar(){
         
         let $t = $(this), $cur = $(e.target);
         luckysheetsheetrightclick($t, $cur, e);
+        let result = Store.result
+        server.websocket.onmessage(result)
     });
 
     let luckysheetsheetnameeditor = function ($t) {