|
@ -2605,6 +2605,30 @@ export function setRangeShow(range, options = {}) { |
|
|
}]; |
|
|
}]; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if(getObjType(range) == 'array'){ |
|
|
|
|
|
for(let i = 0; i < range.length; i++){ |
|
|
|
|
|
if(getObjType(range[i]) === 'string'){ |
|
|
|
|
|
if(!formula.iscelldata(range[i])){ |
|
|
|
|
|
return tooltip.info("The range parameter is invalid.", ""); |
|
|
|
|
|
} |
|
|
|
|
|
let cellrange = formula.getcellrange(range[i]); |
|
|
|
|
|
range[i] = { |
|
|
|
|
|
"row": cellrange.row, |
|
|
|
|
|
"column": cellrange.column |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
else if(getObjType(range) == 'object'){ |
|
|
|
|
|
if(range.row == null || range.column == null){ |
|
|
|
|
|
return tooltip.info("The range parameter is invalid.", ""); |
|
|
|
|
|
} |
|
|
|
|
|
range = { |
|
|
|
|
|
"row": range.row, |
|
|
|
|
|
"column": range.column |
|
|
|
|
|
}; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
if(getObjType(range) != 'array'){ |
|
|
if(getObjType(range) != 'array'){ |
|
|
return tooltip.info("The range parameter is invalid.", ""); |
|
|
return tooltip.info("The range parameter is invalid.", ""); |
|
|
} |
|
|
} |
|
@ -2623,11 +2647,13 @@ export function setRangeShow(range, options = {}) { |
|
|
|
|
|
|
|
|
for(let i = 0; i < range.length; i++){ |
|
|
for(let i = 0; i < range.length; i++){ |
|
|
let changeparam = menuButton.mergeMoveMain(range[i].column, range[i].row, range[i]); |
|
|
let changeparam = menuButton.mergeMoveMain(range[i].column, range[i].row, range[i]); |
|
|
|
|
|
if(changeparam) { |
|
|
range[i] = { |
|
|
range[i] = { |
|
|
"row": changeparam[1], |
|
|
"row": changeparam[1], |
|
|
"column": changeparam[0] |
|
|
"column": changeparam[0] |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
file.luckysheet_select_save = range; |
|
|
file.luckysheet_select_save = range; |
|
|
|
|
|
|
|
|