Commit 025ce72a authored by GoshaZotov's avatar GoshaZotov

for merge(paste)

parent 92240396
...@@ -91,6 +91,8 @@ ...@@ -91,6 +91,8 @@
this.fill = true; this.fill = true;
this.angle = true; this.angle = true;
this.format = true;
this.images = true; this.images = true;
} }
...@@ -114,6 +116,8 @@ ...@@ -114,6 +116,8 @@
this.fill = true; this.fill = true;
this.angle = true; this.angle = true;
this.format = true;
this.images = true; this.images = true;
}, },
revert: function() revert: function()
...@@ -132,6 +136,8 @@ ...@@ -132,6 +136,8 @@
this.fill = null; this.fill = null;
this.angle = null; this.angle = null;
this.format = null;
this.images = null; this.images = null;
}, },
asc_setProps: function(props) asc_setProps: function(props)
......
...@@ -9160,7 +9160,10 @@ ...@@ -9160,7 +9160,10 @@
} }
//если не возникает конфликт, делаем unmerge //если не возникает конфликт, делаем unmerge
rangeUnMerge.unmerge(); if(specialPasteProps.format)
{
rangeUnMerge.unmerge();
}
if (!isOneMerge) { if (!isOneMerge) {
arn.r2 = (rMax2 - 1 > 0) ? (rMax2 - 1) : 0; arn.r2 = (rMax2 - 1 > 0) ? (rMax2 - 1) : 0;
...@@ -9169,7 +9172,11 @@ ...@@ -9169,7 +9172,11 @@
if (isMultiple)//случай автозаполнения сложных форм if (isMultiple)//случай автозаполнения сложных форм
{ {
t.model.getRange3(lastSelection.r1, lastSelection.c1, lastSelection.r2, lastSelection.c2).unmerge(); if(specialPasteProps.format)
{
t.model.getRange3(lastSelection.r1, lastSelection.c1, lastSelection.r2, lastSelection.c2).unmerge();
}
var maxARow = heightArea / heightPasteFr; var maxARow = heightArea / heightPasteFr;
var maxACol = widthArea / widthPasteFr; var maxACol = widthArea / widthPasteFr;
var plRow = (rMax2 - arn.r1); var plRow = (rMax2 - arn.r1);
...@@ -9389,7 +9396,10 @@ ...@@ -9389,7 +9396,10 @@
return newArr; return newArr;
} }
//если не возникает конфликт, делаем unmerge //если не возникает конфликт, делаем unmerge
rangeUnMerge.unmerge(); if(specialPasteProps.format)
{
rangeUnMerge.unmerge();
}
if (!isOneMerge) { if (!isOneMerge) {
arn.r2 = rMax2 - 1; arn.r2 = rMax2 - 1;
arn.c2 = cMax2 - 1; arn.c2 = cMax2 - 1;
...@@ -9398,7 +9408,10 @@ ...@@ -9398,7 +9408,10 @@
if (isMultiple)//случай автозаполнения сложных форм if (isMultiple)//случай автозаполнения сложных форм
{ {
t.model.getRange3(arn.r1, arn.c1, arn.r2, arn.c2).unmerge(); if(specialPasteProps.format)
{
t.model.getRange3(trueActiveRange.r1, trueActiveRange.c1, trueActiveRange.r2, trueActiveRange.c2).unmerge();
}
var maxARow = heightArea / heightPasteFr; var maxARow = heightArea / heightPasteFr;
var maxACol = widthArea / widthPasteFr; var maxACol = widthArea / widthPasteFr;
var plRow = (rMax2 - arn.r1); var plRow = (rMax2 - arn.r1);
...@@ -9673,6 +9686,13 @@ ...@@ -9673,6 +9686,13 @@
} }
}; };
//offsetLast
if(rangeStyle.offsetLast && specialPasteProps.merge)
{
range.setOffsetLast(rangeStyle.offsetLast);
range.merge(rangeStyle.merge);
}
//for formula //for formula
if(formulaProps) if(formulaProps)
...@@ -9737,13 +9757,6 @@ ...@@ -9737,13 +9757,6 @@
{ {
range.setFontsize(rangeStyle.fontSize); range.setFontsize(rangeStyle.fontSize);
} }
//offsetLast
if(rangeStyle.offsetLast && specialPasteProps.merge)
{
range.setOffsetLast(rangeStyle.offsetLast);
range.merge(rangeStyle.merge);
}
//borders //borders
if(rangeStyle.borders && specialPasteProps.borders) if(rangeStyle.borders && specialPasteProps.borders)
{ {
......
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