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

fix(bug): bug 

bug
master
wpxp123456 5 years ago
parent
4066964ed5
commit
061ea2003d
1 changed files with 3 additions and 13 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. 16
      src/global/extend.js

16
src/global/extend.js
View File

@ -105,8 +105,6 @@ function luckysheetextendtable(type, index, value, direction, order) {
d[calc_r][calc_c].f = functionStr; d[calc_r][calc_c].f = functionStr;
} }
// calc.func[2] = functionStr;
if(direction == "lefttop"){ if(direction == "lefttop"){
if(calc_r >= index){ if(calc_r >= index){
calc.r += value; calc.r += value;
@ -127,8 +125,6 @@ function luckysheetextendtable(type, index, value, direction, order) {
d[calc_r][calc_c].f = functionStr; d[calc_r][calc_c].f = functionStr;
} }
// calc.func[2] = functionStr;
if(direction == "lefttop"){ if(direction == "lefttop"){
if(calc_c >= index){ if(calc_c >= index){
calc.c += value; calc.c += value;
@ -900,8 +896,6 @@ function luckysheetdeletetable(type, st, ed, order) {
d[calc_r][calc_c].f = functionStr; d[calc_r][calc_c].f = functionStr;
} }
// calc.func[2] = functionStr;
if(calc_r > ed){ if(calc_r > ed){
calc.r = calc_r - slen; calc.r = calc_r - slen;
} }
@ -917,8 +911,6 @@ function luckysheetdeletetable(type, st, ed, order) {
d[calc_r][calc_c].f = functionStr; d[calc_r][calc_c].f = functionStr;
} }
// calc.func[2] = functionStr;
if(calc_c > ed){ if(calc_c > ed){
calc.c = calc_c - slen; calc.c = calc_c - slen;
} }
@ -1545,20 +1537,20 @@ function luckysheetDeleteCell(type, str, edr, stc, edc, order) {
let calc = $.extend(true, {}, calcChain[i]); let calc = $.extend(true, {}, calcChain[i]);
let calc_r = calc.r, calc_c = calc.c, calc_i = calc.index, calc_funcStr = getcellFormula(calc_r, calc_c, calc_i); let calc_r = calc.r, calc_c = calc.c, calc_i = calc.index, calc_funcStr = getcellFormula(calc_r, calc_c, calc_i);
if((calc_r < str || calc_r > edr) && (calc_c < stc || calc_c > edc)){ if(calc_r < str || calc_r > edr || calc_c < stc || calc_c > edc){
let functionStr; let functionStr;
if(type == 'moveLeft'){ if(type == 'moveLeft'){
functionStr = "=" + formula.functionStrChange(calc_funcStr, "del", "col", null, stc, clen); functionStr = "=" + formula.functionStrChange(calc_funcStr, "del", "col", null, stc, clen);
if(calc_c > edc){ if(calc_c > edc && calc_r >= str && calc_r <= edr){
calc.c = calc_c - clen; calc.c = calc_c - clen;
} }
} }
else if(type == 'moveUp'){ else if(type == 'moveUp'){
functionStr = "=" + formula.functionStrChange(calc_funcStr, "del", "row", null, str, rlen); functionStr = "=" + formula.functionStrChange(calc_funcStr, "del", "row", null, str, rlen);
if(calc_r > edr){ if(calc_r > edr && calc_c >= stc && calc_c <= edc){
calc.r = calc_r - rlen; calc.r = calc_r - rlen;
} }
} }
@ -1567,8 +1559,6 @@ function luckysheetDeleteCell(type, str, edr, stc, edc, order) {
d[calc_r][calc_c].f = functionStr; d[calc_r][calc_c].f = functionStr;
} }
// calc.func[2] = functionStr;
newCalcChain.push(calc); newCalcChain.push(calc);
} }
} }

Write Preview
Loading…
Cancel
Save