From 0a5ca86ab808d2cb1da8cb14d93c5d787c50f540 Mon Sep 17 00:00:00 2001
From: renxxing <74659302+renxxing@users.noreply.github.com>
Date: Fri, 4 Dec 2020 09:47:18 +0800
Subject: [PATCH] fix(fix #209 fix #219): highlight follow checkout page

Collaborative highlighting changes with cell changes  Switching pages does not affect highlight
---
 src/controllers/select.js | 2 --
 src/controllers/server.js | 3 +--
 src/global/api.js         | 2 +-
 src/store/index.js        | 4 ++--
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/controllers/select.js b/src/controllers/select.js
index 01604a5..4cff768 100644
--- a/src/controllers/select.js
+++ b/src/controllers/select.js
@@ -387,8 +387,6 @@ function collaborativeEditBox() {
             }
             //合并单元格时执行
             if (Object.keys(range).length > 0 ) {
-                console.log(range);
-                
                 let flag_sure_merge = false
                 if(range.v.length > 1) {
                     flag_sure_merge = Object.keys(range.v[1][0]).length > 0
diff --git a/src/controllers/server.js b/src/controllers/server.js
index 7155598..0a8fcb5 100644
--- a/src/controllers/server.js
+++ b/src/controllers/server.js
@@ -967,7 +967,6 @@ const server = {
             if(params.length==0){
                 return;
             }
-            console.log(params);
 
             params = encodeURIComponent(JSON.stringify(params));
             let compressBeginLen = params.length;
@@ -978,7 +977,7 @@ const server = {
             // }
             _this.requestLock = true;
             //console.log(params);
-            console.log("request");
+            // console.log("request");
             if(_this.updateUrl != ""){
                 $.post(_this.updateUrl, { compress: iscommpress, gridKey: _this.gridKey, data: params }, function (data) {
                     let re = eval('('+ data +')')
diff --git a/src/global/api.js b/src/global/api.js
index d76dabb..8a955db 100644
--- a/src/global/api.js
+++ b/src/global/api.js
@@ -4750,7 +4750,7 @@ export function setSheetActive(order, options = {}) {
             success();
         }
     }, 1);
-
+    server.multipleRangeShow()
     return file;
 }
 
diff --git a/src/store/index.js b/src/store/index.js
index 31c802f..82e5f97 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -144,8 +144,8 @@ const Store = {
         },
         changeCollaborationSize:[], //改变行高或者列宽时，协同提示框需要跟随改变所需数据
         allDataColumnlen:[],//列宽发生过改变的列
-        checkoutData:[],//切换页所需的协同提示框数据
-        merge_range:[],//合并单元格所需数据
+        merge_range:{},//合并时单元格信息
+        checkoutData:[],//切换表格页时所需数据
     }
 
 }