Browse Source

fix(fix #209 fix #219): highlight follow checkout page

Collaborative highlighting changes with cell changes  Switching pages does not affect highlight
master
renxxing 5 years ago
parent
commit
0a5ca86ab8
  1. 2
      src/controllers/select.js
  2. 3
      src/controllers/server.js
  3. 2
      src/global/api.js
  4. 4
      src/store/index.js

2
src/controllers/select.js

@ -387,8 +387,6 @@ function collaborativeEditBox() {
} }
//合并单元格时执行 //合并单元格时执行
if (Object.keys(range).length > 0 ) { if (Object.keys(range).length > 0 ) {
console.log(range);
let flag_sure_merge = false let flag_sure_merge = false
if(range.v.length > 1) { if(range.v.length > 1) {
flag_sure_merge = Object.keys(range.v[1][0]).length > 0 flag_sure_merge = Object.keys(range.v[1][0]).length > 0

3
src/controllers/server.js

@ -967,7 +967,6 @@ const server = {
if(params.length==0){ if(params.length==0){
return; return;
} }
console.log(params);
params = encodeURIComponent(JSON.stringify(params)); params = encodeURIComponent(JSON.stringify(params));
let compressBeginLen = params.length; let compressBeginLen = params.length;
@ -978,7 +977,7 @@ const server = {
// } // }
_this.requestLock = true; _this.requestLock = true;
//console.log(params); //console.log(params);
console.log("request"); // console.log("request");
if(_this.updateUrl != ""){ if(_this.updateUrl != ""){
$.post(_this.updateUrl, { compress: iscommpress, gridKey: _this.gridKey, data: params }, function (data) { $.post(_this.updateUrl, { compress: iscommpress, gridKey: _this.gridKey, data: params }, function (data) {
let re = eval('('+ data +')') let re = eval('('+ data +')')

2
src/global/api.js

@ -4750,7 +4750,7 @@ export function setSheetActive(order, options = {}) {
success(); success();
} }
}, 1); }, 1);
server.multipleRangeShow()
return file; return file;
} }

4
src/store/index.js

@ -144,8 +144,8 @@ const Store = {
}, },
changeCollaborationSize:[], //改变行高或者列宽时,协同提示框需要跟随改变所需数据 changeCollaborationSize:[], //改变行高或者列宽时,协同提示框需要跟随改变所需数据
allDataColumnlen:[],//列宽发生过改变的列 allDataColumnlen:[],//列宽发生过改变的列
checkoutData:[],//切换页所需的协同提示框数据 merge_range:{},//合并时单元格信息
merge_range:[],//合并单元格所需数据 checkoutData:[],//切换表格页时所需数据
} }
} }

Loading…
Cancel
Save