From 4428a0300cf12a545009f3a2d2a4d3217f504c03 Mon Sep 17 00:00:00 2001
From: break-wave <654896146@qq.com>
Date: Thu, 15 Apr 2021 20:38:57 +0800
Subject: [PATCH] =?UTF-8?q?fix(bug):=20=E5=88=9D=E6=AC=A1=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=20setRangeMerge=20error?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/global/api.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/global/api.js b/src/global/api.js
index 3d586b6..4c84258 100644
--- a/src/global/api.js
+++ b/src/global/api.js
@@ -3025,6 +3025,8 @@ export function setRangeMerge(type, options = {}) {
         if(has_PartMC){
             return tooltip.info('Cannot perform this operation on partially merged cells', '');
         }
+    }else {
+        cfg.merge = {}
     }
 
     //选区是否含有 合并的单元格
@@ -6652,7 +6654,7 @@ export function refreshFormula (success) {
  * @param {Array} data 工作簿配置，可以包含多个表
  * @param {Object} options 可选参数
  * @param {Function} options.success 操作结束的回调函数
- * 
+ *
  */
 export function updataSheet (options = {}) {
     let {data, success} = options
@@ -6728,7 +6730,7 @@ export function refreshMenuButtonFocus(data ,r,c , success){
 export function checkTheStatusOfTheSelectedCells(type,status){
 
     /* 获取选区内所有的单元格-扁平后的处理 */
-    let cells = getRangeWithFlatten();  
+    let cells = getRangeWithFlatten();
 
     let flag = cells.every(({r,c})=>{
         let cell = Store.flowdata[r][c];