Skip to content
This repository has been archived by the owner on Mar 28, 2024. It is now read-only.

Commit

Permalink
Merge branch 'master' of https://github.com/mengshukeji/Luckysheet
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dushusir
Dushusir committed Jan 5, 2021
2 parents cc2e1a9 + 951c65e commit 325bc3b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
6 changes: 4 additions & 2 deletions src/controllers/menuButton.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3204,7 +3204,8 @@ const menuButton = {
fv[mc_r + "_" + mc_c] = $.extend(true, {}, cell);
}
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.m;
Expand Down Expand Up @@ -3265,7 +3266,8 @@ const menuButton = {
fv[mc_r + "_" + mc_c] = $.extend(true, {}, cell);
}
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.m;
Expand Down
3 changes: 2 additions & 1 deletion src/global/api.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3163,7 +3163,8 @@ export function cancelRangeMerge(options = {}) {
fv[mc_r + "_" + mc_c] = $.extend(true, {}, cell);
}
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.m;
Expand Down

0 comments on commit 325bc3b

Please sign in to comment.