Browse Source
Merge pull request #434 from flowerField/master
解决合并单元格后取消合并操作创建cell的地址引用问题
master
文顶顶
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
6 additions and
3 deletions
-
src/controllers/menuButton.js
-
src/global/api.js
|
|
@ -3204,7 +3204,8 @@ const menuButton = { |
|
|
fv[mc_r + "_" + mc_c] = $.extend(true, {}, cell); |
|
|
fv[mc_r + "_" + mc_c] = $.extend(true, {}, cell); |
|
|
} |
|
|
} |
|
|
else{ |
|
|
else{ |
|
|
let cell_clone = fv[mc_r + "_" + mc_c]; |
|
|
// let cell_clone = fv[mc_r + "_" + mc_c];
|
|
|
|
|
|
let cell_clone = JSON.parse(JSON.stringify(fv[mc_r + "_" + mc_c])); |
|
|
|
|
|
|
|
|
delete cell_clone.v; |
|
|
delete cell_clone.v; |
|
|
delete cell_clone.m; |
|
|
delete cell_clone.m; |
|
|
@ -3265,7 +3266,8 @@ const menuButton = { |
|
|
fv[mc_r + "_" + mc_c] = $.extend(true, {}, cell); |
|
|
fv[mc_r + "_" + mc_c] = $.extend(true, {}, cell); |
|
|
} |
|
|
} |
|
|
else{ |
|
|
else{ |
|
|
let cell_clone = fv[mc_r + "_" + mc_c]; |
|
|
let cell_clone = fv[mc_r + "_" + mc_c]; |
|
|
|
|
|
let cell_clone = JSON.parse(JSON.stringify(fv[mc_r + "_" + mc_c])); |
|
|
|
|
|
|
|
|
delete cell_clone.v; |
|
|
delete cell_clone.v; |
|
|
delete cell_clone.m; |
|
|
delete cell_clone.m; |
|
|
|
|
|
@ -3163,7 +3163,8 @@ export function cancelRangeMerge(options = {}) { |
|
|
fv[mc_r + "_" + mc_c] = $.extend(true, {}, cell); |
|
|
fv[mc_r + "_" + mc_c] = $.extend(true, {}, cell); |
|
|
} |
|
|
} |
|
|
else{ |
|
|
else{ |
|
|
let cell_clone = fv[mc_r + "_" + mc_c]; |
|
|
// let cell_clone = fv[mc_r + "_" + mc_c];
|
|
|
|
|
|
let cell_clone = JSON.parse(JSON.stringify(fv[mc_r + "_" + mc_c])); |
|
|
|
|
|
|
|
|
delete cell_clone.v; |
|
|
delete cell_clone.v; |
|
|
delete cell_clone.m; |
|
|
delete cell_clone.m; |
|
|
|
