Skip to content

S
sdkjs
Commit 6a33732a authored by GoshaZotov's avatar GoshaZotov
Browse files
Options

fix bug

parent d91d3ac3
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
cell/view/WorksheetView.js
View file @ 6a33732a
...@@ -9182,7 +9182,7 @@ ...@@ -9182,7 +9182,7 @@
var offsetRow = currentObj.rowSpan - 1; var offsetRow = currentObj.rowSpan - 1;
pastedRangeProps.offsetLast = {offsetCol: offsetCol, offsetRow: offsetRow}; pastedRangeProps.offsetLast = {offsetCol: offsetCol, offsetRow: offsetRow};
mergeArr.push({r1: range.first.row, r2: range.last.row + offsetRow, c1: range.first.col, c2: range.last.col + offsetCol}); mergeArr.push(new Asc.Range(range.bbox.c1, range.bbox.r1, range.bbox.c2 + offsetCol, range.bbox.r2 + offsetRow));
if (contentCurrentObj[0] == undefined) { if (contentCurrentObj[0] == undefined) {
pastedRangeProps.val = ''; pastedRangeProps.val = '';
} }
...@@ -9407,12 +9407,12 @@ ...@@ -9407,12 +9407,12 @@
} }
pastedRangeProps.offsetLast = {offsetCol: offsetCol, offsetRow: offsetRow}; pastedRangeProps.offsetLast = {offsetCol: offsetCol, offsetRow: offsetRow};
mergeArr.push({ mergeArr.push(new Asc.Range(
r1: curMerge.r1 + arn.r1 - activeCellsPasteFragment.r1 + rowDiff, curMerge.c1 + arn.c1 - activeCellsPasteFragment.c1 + colDiff,
r2: curMerge.r2 + arn.r1 - activeCellsPasteFragment.r1 + rowDiff, curMerge.r1 + arn.r1 - activeCellsPasteFragment.r1 + rowDiff,
c1: curMerge.c1 + arn.c1 - activeCellsPasteFragment.c1 + colDiff, curMerge.c2 + arn.c1 - activeCellsPasteFragment.c1 + colDiff,
c2: curMerge.c2 + arn.c1 - activeCellsPasteFragment.c1 + colDiff curMerge.r2 + arn.r1 - activeCellsPasteFragment.r1 + rowDiff
}); ));
} }
} }
else { else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7