' +
+ '
' +
+ '
' +
+ '
' +
+ '
' +
+ '
' +
+ '
';
$("#luckysheet-selection-copy").append(copyDomHtml);
}
}
@@ -359,11 +420,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();
@@ -384,7 +445,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();
@@ -412,19 +473,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 {
@@ -432,6 +493,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 6075c489f..cbd7708c4 100644
--- a/src/controllers/server.js
+++ b/src/controllers/server.js
@@ -10,9 +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 json from '../global/json';
const server = {
gridKey: null,
@@ -152,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");
@@ -166,12 +168,15 @@ const server = {
_this.websocket.onmessage = function(result){
Store.result = result
let data = eval('(' + result.data + ')');
- console.info(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
+ })
}
if(type == 1){ //send 成功或失败
@@ -179,6 +184,12 @@ const server = {
else if(type == 2){ //更新数据
let item = JSON.parse(data.data);
_this.wsUpdateMsg(item);
+ let chang_data = JSON.parse(data.data)
+ if(chang_data.k == 'columnlen') {
+ collaborativeEditBox(chang_data.v,null)
+ } else if(chang_data.k == 'rowlen') {
+ collaborativeEditBox(null,chang_data.v)
+ }
}
else if(type == 3){ //多人操作不同选区("t": "mv")（用不同颜色显示其他人所操作的选区）
let id = data.id;
@@ -188,7 +199,22 @@ const server = {
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);
}
diff --git a/src/controllers/sheetBar.js b/src/controllers/sheetBar.js
index f48ae47c6..bafd920fe 100644
--- a/src/controllers/sheetBar.js
+++ b/src/controllers/sheetBar.js
@@ -206,8 +206,6 @@ 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) {
diff --git a/src/global/refresh.js b/src/global/refresh.js
index 2399035e5..938c3bc83 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"]){
@@ -583,6 +583,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"]) == "{}"){
@@ -945,13 +946,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/index.html b/src/index.html
index f013574b4..3cf911ec3 100644
--- a/src/index.html
+++ b/src/index.html
@@ -56,7 +56,14 @@
luckysheet.create({
container: 'luckysheet',
lang: lang,
- forceCalculation:false,
+ forceCalculation:false,
+ allowUpdate:true,
+ updateImageUrl:"http://luckysheet.lashuju.com/luckysheet/api/updateImg",
+ //updateUrl: "ws://127.0.0.1:85/dataqk/websocket/qksheet",
+ updateUrl: "ws://luckysheet.lashuju.com/luckysheet/websocket/qksheet",
+ "gridKey": "1079500#-8803#7c45f52b7d01486d88bc53cb17dcd2c3",
+ loadUrl: "http://luckysheet.lashuju.com/luckysheet/api/load",
+ loadSheetUrl:"http://luckysheet.lashuju.com/luckysheet/api/loadsheet",
plugins: ['chart'],
fontList:[
{
diff --git a/src/store/index.js b/src/store/index.js
index 6134f8776..ee033e59c 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -141,7 +141,9 @@ const Store = {
cooperativeEdit:{
usernameTimeout:{
- }
+ },
+ changeCollaborationSize:[], //改变行高或者列宽时，协同提示框需要跟随改变所需数据
+ allDataColumnlen:[],//列宽发生过改变的列
}
}