Browse Source

fix(fix #219): checkout

checkout keep highlight box
master
renxxing 5 years ago
parent
commit
15dca04084
  1. 10
      src/controllers/server.js
  2. 3
      src/controllers/sheetBar.js

10
src/controllers/server.js

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

3
src/controllers/sheetBar.js

@ -206,6 +206,8 @@ export function initialSheetBar(){
let $t = $(this), $cur = $(e.target); let $t = $(this), $cur = $(e.target);
luckysheetsheetrightclick($t, $cur, e); luckysheetsheetrightclick($t, $cur, e);
let result = Store.result
server.websocket.onmessage(result)
}); });
let luckysheetsheetnameeditor = function ($t) { let luckysheetsheetnameeditor = function ($t) {
@ -221,6 +223,7 @@ export function initialSheetBar(){
$("#luckysheet-sheet-area").on("dblclick", "span.luckysheet-sheets-item-name", function (e) { $("#luckysheet-sheet-area").on("dblclick", "span.luckysheet-sheets-item-name", function (e) {
luckysheetsheetnameeditor($(this)); luckysheetsheetnameeditor($(this));
console.log(123);
}); });
$("#luckysheet-sheet-area").on("blur", "span.luckysheet-sheets-item-name", function (e) { $("#luckysheet-sheet-area").on("blur", "span.luckysheet-sheets-item-name", function (e) {

Loading…
Cancel
Save