' +
+ '
' +
+ '
' +
+ '
' +
+ '
' +
+ '
' +
+ '
';
$("#luckysheet-selection-copy").append(copyDomHtml);
}
}
@@ -369,11 +472,11 @@ function selectionCopyShow(range) {
//选区行列数显示
function luckysheet_count_show(left, top, width, height, rowseleted, columnseleted) {
- let rowl = rowseleted[1] - rowseleted[0] + 1,
+ let rowl = rowseleted[1] - rowseleted[0] + 1,
coll = columnseleted[1] - columnseleted[0] + 1;
- let drawWidth = Store.luckysheetTableContentHW[0],
+ let drawWidth = Store.luckysheetTableContentHW[0],
drawHeight = Store.luckysheetTableContentHW[1];
- let scrollWidth = $("#luckysheet-cell-main").scrollLeft(),
+ let scrollWidth = $("#luckysheet-cell-main").scrollLeft(),
scrollHeight = $("#luckysheet-cell-main").scrollTop();
const _locale = locale();
@@ -394,7 +497,7 @@ function luckysheet_count_show(left, top, width, height, rowseleted, columnselet
topv = scrollHeight + drawHeight / 2;
}
- $("#luckysheet-row-count-show").css({ "left": leftv, "top": topv, "display": "block","width":"11px" }).html("
" + rowl.toString().split("").join("
") + "
"+locale_info.row+"
");
+ $("#luckysheet-row-count-show").css({ "left": leftv, "top": topv, "display": "block", "width": "11px" }).html("
" + rowl.toString().split("").join("
") + "
" + locale_info.row + "
");
}
else {
$("#luckysheet-row-count-show").hide();
@@ -422,19 +525,19 @@ function luckysheet_count_show(left, top, width, height, rowseleted, columnselet
}
}
-function selectHelpboxFill(){
+function selectHelpboxFill() {
let range = Store.luckysheet_select_save[Store.luckysheet_select_save.length - 1];
let rf = range["row_focus"], cf = range["column_focus"];
- if(Store.config["merge"] != null && (rf + "_" + cf) in Store.config["merge"]){
+ if (Store.config["merge"] != null && (rf + "_" + cf) in Store.config["merge"]) {
$("#luckysheet-helpbox-cell").text(getRangetxt(Store.currentSheetIndex, {
- column:[cf, cf],
- row:[rf, rf],
+ column: [cf, cf],
+ row: [rf, rf],
}));
}
- else{
+ else {
$("#luckysheet-helpbox-cell").text(getRangetxt(Store.currentSheetIndex, range));
}
-
+
}
export {
@@ -442,6 +545,7 @@ export {
selectHightlightShow,
selectIsOverlap,
selectionCopyShow,
+ collaborativeEditBox,
luckysheet_count_show,
selectHelpboxFill
}
\ No newline at end of file
diff --git a/src/controllers/server.js b/src/controllers/server.js
index 2c67a3b..7155598 100644
--- a/src/controllers/server.js
+++ b/src/controllers/server.js
@@ -10,10 +10,11 @@ import luckysheetPostil from './postil';
import { getObjType, replaceHtml, getByteLen } from '../utils/util';
import { getSheetIndex } from '../methods/get';
import Store from '../store';
+import { collaborativeEditBox } from './select'
import locale from '../locale/locale';
import dayjs from "dayjs";
import imageCtrl from './imageCtrl';
-import method from '../global/method';
+import json from '../global/json';
const server = {
gridKey: null,
@@ -77,7 +78,6 @@ const server = {
}
},
saveParam: function (type, index, value, params) {
-
let _this = this;
if(!_this.allowUpdate){
@@ -98,7 +98,6 @@ const server = {
return;
}
-
if (type == "rv") { //单元格批量更新
d.range = params.range;
}
@@ -155,10 +154,10 @@ const server = {
//连接建立时触发
_this.websocket.onopen = function() {
- console.info('WebSocket连接成功');
+ console.info('WebSocket连接成功');
hideloading();
- _this.wxErrorCount = 0;
-
+ _this.wxErrorCount = 0;
+
//防止websocket长时间不发送消息导致断连
setInterval(function(){
_this.websocket.send("rub");
@@ -168,13 +167,19 @@ const server = {
//客户端接收服务端数据时触发
_this.websocket.onmessage = function(result){
Store.result = result
- let data = new Function("return " + result.data )();
- console.info(data);
+ let data = eval('(' + result.data + ')');
+ console.info(data);
let type = data.type;
let {message,id} = data;
// 用户退出时，关闭协同编辑时其提示框
if(message === '用户退出') {
$("#luckysheet-multipleRange-show-" + id).hide();
+ Store.cooperativeEdit.changeCollaborationSize = Store.cooperativeEdit.changeCollaborationSize.filter(value => {
+ return value.id != id
+ })
+ Store.cooperativeEdit.checkoutData = Store.cooperativeEdit.checkoutData.filter(value => {
+ return value.id != id
+ })
}
if(type == 1){ //send 成功或失败
@@ -187,33 +192,98 @@ const server = {
let id = data.id;
let username = data.username;
let item = JSON.parse(data.data);
-
let type = item.t,
index = item.i,
value = item.v;
-
+ if(Store.cooperativeEdit.changeCollaborationSize.length === 0) {
+ Store.cooperativeEdit.changeCollaborationSize.push({id:id,v:item.v[0],i:index})
+ }
+ let flag = Store.cooperativeEdit.changeCollaborationSize.some(value1 => {
+ return value1.id == id
+ })
+ if(flag) {
+ Store.cooperativeEdit.changeCollaborationSize.forEach(val => {
+ if(val.id == id) {
+ val.v = item.v[0]
+ val.i = index
+ }
+ })
+ } else {
+ Store.cooperativeEdit.changeCollaborationSize.push({id:id,v:item.v[0],i:index})
+ }
if(getObjType(value) != "array" && getObjType(value) !== "object"){
value = JSON.parse(value);
- }
-
+ }
+ let r = 0
+ let c = 0
if(index == Store.currentSheetIndex){//发送消息者在当前页面
if(getObjType(value) === "object" && value.op === 'enterEdit'){
-
- let r = value.range[value.range.length - 1].row[0];
- let c = value.range[value.range.length - 1].column[0];
-
+ r = value.range[value.range.length - 1].row[0];
+ c = value.range[value.range.length - 1].column[0];
_this.multipleRangeShow(id, username, r, c, value.op);
- }else{
+ }else {
- let r = value[value.length - 1].row[0];
- let c = value[value.length - 1].column[0];
+ r = value[value.length - 1].row[0];
+ c = value[value.length - 1].column[0];
_this.multipleRangeShow(id, username, r, c);
}
- }
+
+ } else {
+ if(getObjType(value) === "object" && value.op === 'enterEdit'){
+ r = value.range[value.range.length - 1].row[0];
+ c = value.range[value.range.length - 1].column[0];
+ }else {
+ r = value[value.length - 1].row[0];
+ c = value[value.length - 1].column[0];
+ }
+ }
+
+ if(Store.cooperativeEdit.checkoutData.length === 0) {
+ if(value.op) {
+ Store.cooperativeEdit.checkoutData.push({id,username,r,c,op:value.op,index})
+ } else {
+ Store.cooperativeEdit.checkoutData.push({id,username,r,c,index})
+ }
+ }
+ let checkoutFlag = Store.cooperativeEdit.checkoutData.some(item => {
+ return item.id == id
+ })
+ if(checkoutFlag) {
+ Store.cooperativeEdit.checkoutData.forEach(item => {
+ if(item.id == id) {
+ item.username = username
+ item.r = r
+ item.c = c
+ item.index = index
+ if (value.op === 'enterEdit') {
+ item.op = value.op
+ }
+ }
+ })
+ } else {
+ if(value.op === 'enterEdit') {
+ Store.cooperativeEdit.checkoutData.push({id,username,r,c,op:value.op,index})
+ } else {
+ Store.cooperativeEdit.checkoutData.push({id,username,r,c,index})
+ }
+ }
+
+ //其他客户端切换页面时
+ Store.cooperativeEdit.checkoutData.forEach(item => {
+ if(item.index != Store.currentSheetIndex) {
+ $("#luckysheet-multipleRange-show-" + item.id).hide();
+ item.op == ''
+ }
+ })
+
+ if($("#luckysheet-multipleRange-show-" + id)[0]) {
+ let change_bottom = $("#luckysheet-multipleRange-show-" + id)[0].offsetHeight - 1
+ $("#luckysheet-multipleRange-show-" + id + ">.username").css({"bottom":change_bottom + 'px'})
+ }
}
else if(type == 4){ //批量指令更新
let items = JSON.parse(data.data);
@@ -282,7 +352,12 @@ const server = {
}, 1);
}
}
- else if(type == "rv"){ //范围单元格数据更新
+ else if(type == "rv"){ //范围单元格数据更新
+ if(Object.keys(item.range).length > 0) {
+ Store.cooperativeEdit.merge_range = item.range
+ Store.cooperativeEdit.merge_range.v = item.v
+ collaborativeEditBox();
+ }
if(file.data == null || file.data.length == 0){
return;
}
@@ -298,7 +373,7 @@ const server = {
if(index == Store.currentSheetIndex){//更新数据为当前表格数据
Store.flowdata = file.data;
-
+
//如果更新的单元格有批注
for(let r = r1; r <= r2; r++){
for(let c = c1; c <= c2; c++){
@@ -314,13 +389,13 @@ const server = {
setTimeout(function () {
luckysheetrefreshgrid();
}, 1);
- }
+ }
}
else if(type == "cg"){ //config更新（rowhidden，rowlen，columnlen，merge，borderInfo）
let k = item.k;
if(k == "borderInfo"){
- file["config"]["borderInfo"] = value;
+ file["config"]["borderInfo"] = value;
}
else{
if(!(k in file["config"])){
@@ -433,7 +508,7 @@ const server = {
let op = item.op, pos = item.pos;
if(getObjType(value) != "object"){
- value = new Function("return "+ value)();
+ value = eval('('+ value +')');
}
let r = value.r, c = value.c;
@@ -546,7 +621,7 @@ const server = {
arr.push(JSON.stringify(addData[i]));
}
- new Function("return " + 'data.splice(' + st_i + ', 0, ' + arr.join(",") + ')')();
+ eval('data.splice(' + st_i + ', 0, ' + arr.join(",") + ')');
}
else{
file["column"] += len;
@@ -906,7 +981,7 @@ const server = {
console.log("request");
if(_this.updateUrl != ""){
$.post(_this.updateUrl, { compress: iscommpress, gridKey: _this.gridKey, data: params }, function (data) {
- let re = new Function("return " + data)();
+ let re = eval('('+ data +')')
if(re.status){
$("#luckysheet_info_detail_update").html("最近存档时间:"+ dayjs().format("M-D H:m:s"));
$("#luckysheet_info_detail_save").html("同步成功");
@@ -966,7 +1041,7 @@ const server = {
if(_this.updateImageUrl != ""){
// $.post(_this.updateImageUrl, { compress: true, gridKey: _this.gridKey, data:data1 }, function (data) {
$.post(_this.updateImageUrl, { compress: false, gridKey: _this.gridKey, data:data1 }, function (data) {
- let re = new Function("return " + data)();
+ let re = eval('('+ data +')')
if(re.status){
imageRequestLast = dayjs();
}
@@ -1179,6 +1254,17 @@ const server = {
// });
});
});
+ },
+ keepHighLightBox: function() {
+ Store.cooperativeEdit.checkoutData.forEach(value => {
+ if(value.index == Store.currentSheetIndex) {
+ if(value.op === 'enterEdit') {
+ server.multipleRangeShow(value.id, value.username, value.r, value.c, value.op);
+ } else {
+ server.multipleRangeShow(value.id, value.username, value.r, value.c);
+ }
+ }
+ })
}
}
diff --git a/src/controllers/sheetBar.js b/src/controllers/sheetBar.js
index e49bc0b..231b1e9 100644
--- a/src/controllers/sheetBar.js
+++ b/src/controllers/sheetBar.js
@@ -71,7 +71,7 @@ function showsheetconfigmenu() {
redo["oldcolor"] = oldcolor;
redo["color"] = color;
- Store.jfundo.length = 0;
+ Store.jfundo = [];
Store.jfredo.push(redo);
}
}
@@ -96,7 +96,7 @@ function showsheetconfigmenu() {
redo["oldcolor"] = oldcolor;
redo["color"] = null;
- Store.jfundo.length = 0;
+ Store.jfundo = [];
Store.jfredo.push(redo);
}
});
@@ -199,6 +199,7 @@ export function initialSheetBar(){
}, 200);
}
}).on("click", "div.luckysheet-sheets-item", function (e) {
+
if(isEditMode()){
// alert("非编辑模式下不允许该操作！");
return;
@@ -206,8 +207,7 @@ export function initialSheetBar(){
let $t = $(this), $cur = $(e.target);
luckysheetsheetrightclick($t, $cur, e);
- // let result = Store.result
- // server.websocket.onmessage(result)
+ server.keepHighLightBox()
});
let luckysheetsheetnameeditor = function ($t) {
@@ -266,7 +266,7 @@ export function initialSheetBar(){
redo["oldtxt"] = oldtxt;
redo["txt"] = txt;
- Store.jfundo.length = 0;
+ Store.jfundo = [];
Store.jfredo.push(redo);
}
});
@@ -443,6 +443,7 @@ export function initialSheetBar(){
sheetmanage.setSheetShow(index);
sheetmanage.locationSheet();
}
+ server.keepHighLightBox()
});
initialOpenSheet = false;
diff --git a/src/global/refresh.js b/src/global/refresh.js
index ba56925..5cfb754 100644
--- a/src/global/refresh.js
+++ b/src/global/refresh.js
@@ -15,7 +15,7 @@ import sheetmanage from '../controllers/sheetmanage';
import luckysheetPostil from '../controllers/postil';
import dataVerificationCtrl from '../controllers/dataVerificationCtrl';
import hyperlinkCtrl from '../controllers/hyperlinkCtrl';
-import { selectHightlightShow, selectionCopyShow } from '../controllers/select';
+import { selectHightlightShow, selectionCopyShow, collaborativeEditBox } from '../controllers/select';
import { createFilterOptions } from '../controllers/filter';
import { getSheetIndex } from '../methods/get';
import Store from '../store';
@@ -378,7 +378,7 @@ function jfrefreshrange(data, range, cdformat) {
//删除、增加行列 刷新表格
function jfrefreshgrid_adRC(data, cfg, ctrlType, ctrlValue, calc, filterObj, cf, af, freezen, dataVerification, hyperlink){
let file = Store.luckysheetfile[getSheetIndex(Store.currentSheetIndex)];
-
+ collaborativeEditBox();
//merge改变对应的单元格值改变
let mcData = [];
for(let m in cfg["merge"]){
@@ -606,6 +606,7 @@ function jfrefreshgrid_adRC(data, cfg, ctrlType, ctrlValue, calc, filterObj, cf,
function jfrefreshgrid_deleteCell(data, cfg, ctrl, calc, filterObj, cf, dataVerification, hyperlink){
let file = Store.luckysheetfile[getSheetIndex(Store.currentSheetIndex)];
clearTimeout(refreshCanvasTimeOut);
+ collaborativeEditBox();
//merge改变对应的单元格值改变
let mcData = [];
if(JSON.stringify(cfg["merge"]) == "{}"){
@@ -985,13 +986,13 @@ function jfrefreshgrid_rhcw(rowheight, colwidth, isRefreshCanvas=true){
Store.luckysheetfile[getSheetIndex(Store.currentSheetIndex)].data = Store.flowdata;
}
-
+
//批注框同步
luckysheetPostil.positionSync();
-
//选区同步
selectHightlightShow();
-
+ // 协同提示框同步
+ collaborativeEditBox();
//改变单元格行高，复制虚线框同步
if($(".luckysheet-selection-copy").is(":visible")){
selectionCopyShow();
diff --git a/src/global/tooltip.js b/src/global/tooltip.js
index 74c563d..9270957 100644
--- a/src/global/tooltip.js
+++ b/src/global/tooltip.js
@@ -2,6 +2,7 @@ import { modelHTML, luckysheetchartpointconfigHTML, luckysheetToolHTML } from '.
import browser from './browser';
import { replaceHtml } from '../utils/util';
import locale from '../locale/locale';
+import server from '../controllers/server';
const tooltip = {
info: function (title, content) {
@@ -58,6 +59,7 @@ const tooltip = {
if (typeof func1 == 'function') {
func1();
}
+ server.keepHighLightBox();
$("#luckysheet-confirm").hide();
$("#luckysheet-modal-dialog-mask").hide();
});
diff --git a/src/index.html b/src/index.html
index cc51b09..b529de3 100644
--- a/src/index.html
+++ b/src/index.html
@@ -67,7 +67,7 @@
lang: lang,
allowUpdate:true,
updateImageUrl: location.origin + "/luckysheet/api/updateImg",
- updateUrl: "ws://"+ location.host +"/luckysheet/websocket/qksheet",
+ updateUrl: "ws://"+ location.host +"/luckysheet/websocket/luckysheet",
gridKey: gridKey,
loadUrl: location.origin + "/luckysheet/api/load",
loadSheetUrl: location.origin + "/luckysheet/api/loadsheet"
diff --git a/src/store/index.js b/src/store/index.js
index 820c9b7..31c802f 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -141,7 +141,11 @@ const Store = {
cooperativeEdit:{
usernameTimeout:{
- }
+ },
+ changeCollaborationSize:[], //改变行高或者列宽时，协同提示框需要跟随改变所需数据
+ allDataColumnlen:[],//列宽发生过改变的列
+ checkoutData:[],//切换页所需的协同提示框数据
+ merge_range:[],//合并单元格所需数据
}
}