elink-star
/
luckysheet
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of https://github.com/mengshukeji/Luckysheet

master
dushusir 5 years ago
parent
cc2e1a90b1 951c65edbd
commit
325bc3b2b0
2 changed files with 6 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/controllers/menuButton.js
  2. 3
      src/global/api.js

6
src/controllers/menuButton.js
View File

@ -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;

3
src/global/api.js
View File

@ -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;

Write Preview
Loading…
Cancel
Save