Skip to content

S
sdkjs
Commit 47bc0f24 authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander.Trofimov
Browse files
Options

проблема при move формул на соседние ячейки. RangeDataManager и CellArea - ... 

проблема при  move формул на соседние ячейки. RangeDataManager и CellArea -  обьединение кода shift и move.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57560 954022d7-b5bf-4e40-9824-e11837661b57
parent 9216fa74
Show whitespace changes
Inline Side-by-side
Showing with 200 additions and 285 deletions
Excel/model/Workbook.js
View file @ 47bc0f24
...@@ -3344,11 +3344,13 @@ Woorksheet.prototype._moveRange=function(oBBoxFrom, oBBoxTo, copyRange){ ...@@ -3344,11 +3344,13 @@ Woorksheet.prototype._moveRange=function(oBBoxFrom, oBBoxTo, copyRange){
} }
//удаляем to через историю, для undo //удаляем to через историю, для undo
var aRangesToCheck = this._prepareMoveRangeGetCleanRanges(oBBoxFrom, oBBoxTo); var aRangesToCheck = this._prepareMoveRangeGetCleanRanges(oBBoxFrom, oBBoxTo);
for(var i = 0, length = aRangesToCheck.length; i < length; i++) for (var i = 0, length = aRangesToCheck.length; i < length; i++) {
aRangesToCheck[i].cleanAll(); var range = aRangesToCheck[i];
range.cleanAll();
//выставляем для slave refError //выставляем для slave refError
if(!copyRange) if (!copyRange)
this.workbook.dependencyFormulas.deleteNodes(this.getId(), oBBoxTo); this.workbook.dependencyFormulas.deleteNodes(this.getId(), range.getBBox0());
}
//перемещаем без истории //перемещаем без истории
History.TurnOff(); History.TurnOff();
//удаляем from без истории, потому что эти данные не терются а перемещаются //удаляем from без истории, потому что эти данные не терются а перемещаются
...@@ -3360,6 +3362,7 @@ Woorksheet.prototype._moveRange=function(oBBoxFrom, oBBoxTo, copyRange){ ...@@ -3360,6 +3362,7 @@ Woorksheet.prototype._moveRange=function(oBBoxFrom, oBBoxTo, copyRange){
delete row.c[nCol0]; delete row.c[nCol0];
}); });
} }
History.TurnOn();
if(!copyRange){ if(!copyRange){
this.workbook.dependencyFormulas.helper(oBBoxFrom, oBBoxTo,this.Id); this.workbook.dependencyFormulas.helper(oBBoxFrom, oBBoxTo,this.Id);
} }
...@@ -3388,7 +3391,6 @@ Woorksheet.prototype._moveRange=function(oBBoxFrom, oBBoxTo, copyRange){ ...@@ -3388,7 +3391,6 @@ Woorksheet.prototype._moveRange=function(oBBoxFrom, oBBoxTo, copyRange){
} }
} }
History.TurnOn();
if(false == this.workbook.bUndoChanges && (false == this.workbook.bRedoChanges || true == this.workbook.bCollaborativeChanges)) if(false == this.workbook.bUndoChanges && (false == this.workbook.bRedoChanges || true == this.workbook.bCollaborativeChanges))
{ {
History.LocalChange = true; History.LocalChange = true;
......
Excel/model/WorkbookElems.js
View file @ 47bc0f24
...@@ -53,7 +53,7 @@ function shiftGetBBox(bbox, bHor) ...@@ -53,7 +53,7 @@ function shiftGetBBox(bbox, bHor)
bboxGet = Asc.Range(bbox.c1, bbox.r1, bbox.c2, gc_nMaxRow0); bboxGet = Asc.Range(bbox.c1, bbox.r1, bbox.c2, gc_nMaxRow0);
return bboxGet; return bboxGet;
} }
function shiftSort(a, b, bAsc, bRow) function shiftSort(a, b, offset)
{ {
var nRes = 0; var nRes = 0;
if(null == a.to || null == b.to) if(null == a.to || null == b.to)
...@@ -67,19 +67,17 @@ function shiftSort(a, b, bAsc, bRow) ...@@ -67,19 +67,17 @@ function shiftSort(a, b, bAsc, bRow)
} }
else else
{ {
if(bRow) if (0 != offset.offsetRow) {
{ if (offset.offsetRow > 0)
if(bAsc)
nRes = a.to.r1 - b.to.r1;
else
nRes = b.to.r1 - a.to.r1; nRes = b.to.r1 - a.to.r1;
else
nRes = a.to.r1 - b.to.r1;
} }
if (0 == nRes && 0 != offset.offsetCol) {
if (offset.offsetCol > 0)
nRes = b.to.c1 - a.to.c1;
else else
{
if(bAsc)
nRes = a.to.c1 - b.to.c1; nRes = a.to.c1 - b.to.c1;
else
nRes = b.to.c1 - a.to.c1;
} }
} }
return nRes; return nRes;
...@@ -3990,122 +3988,106 @@ RangeDataManager.prototype = { ...@@ -3990,122 +3988,106 @@ RangeDataManager.prototype = {
shift: function (bbox, bAdd, bHor, oGetRes, oChangeParam) shift: function (bbox, bAdd, bHor, oGetRes, oChangeParam)
{ {
var _this = this; var _this = this;
if(null == oGetRes) if (null == oGetRes)
oGetRes = this.shiftGet(bbox, bHor); oGetRes = this.shiftGet(bbox, bHor);
var aToChange = []; var offset;
var elems = oGetRes.elems; if (bHor)
//сдвигаем inner offset = { offsetRow: 0, offsetCol: bbox.c2 - bbox.c1 + 1 };
if(elems.inner.length > 0)
{
var offset = null;
if(bHor)
offset = {offsetRow: 0, offsetCol: bbox.c2 - bbox.c1 + 1};
else else
offset = {offsetRow: bbox.r2 - bbox.r1 + 1, offsetCol: 0}; offset = { offsetRow: bbox.r2 - bbox.r1 + 1, offsetCol: 0 };
if(!bAdd) if (!bAdd) {
{
offset.offsetRow = -offset.offsetRow; offset.offsetRow = -offset.offsetRow;
offset.offsetCol = -offset.offsetCol; offset.offsetCol = -offset.offsetCol;
} }
for(var i = 0, length = elems.inner.length; i < length; i++) this._shiftmove(true, bbox, offset, oGetRes.elems, oChangeParam);
},
move: function (from, to, oChangeParam)
{ {
var offset = { offsetRow: to.r1 - from.r1, offsetCol: to.c1 - from.c1 };
var oGetRes = this.get(from);
this._shiftmove(false, from, offset, oGetRes, oChangeParam);
},
_shiftmove: function (bShift, bbox, offset, elems, oChangeParam) {
var aToChange = [];
var bAdd = offset.offsetRow > 0 || offset.offsetCol > 0;
var bHor = 0 != offset.offsetCol ? true : false;
//сдвигаем inner
if (elems.inner.length > 0) {
var bboxAsc = Asc.Range(bbox.c1, bbox.r1, bbox.c2, bbox.r2);
for (var i = 0, length = elems.inner.length; i < length; i++) {
var elem = elems.inner[i]; var elem = elems.inner[i];
var from = elem.bbox; var from = elem.bbox;
var to = null; var to = null;
if(bAdd) if (bShift) {
{ if (bAdd) {
to = elem.bbox.clone(); to = from.clone();
to.setOffset(offset); to.setOffset(offset);
} }
else else if (!bboxAsc.containsRange(from)) {
{ to = from.clone();
var bboxAsc = Asc.Range(bbox.c1, bbox.r1, bbox.c2, bbox.r2); if (bHor) {
if(!bboxAsc.containsRange(from)) if (to.c1 <= bbox.c2)
{ to.setOffsetFirst({ offsetRow: 0, offsetCol: bbox.c2 - to.c1 + 1 });
to = elem.bbox.clone();
if(bHor)
{
if(to.c1 <= bbox.c2)
to.setOffsetFirst({offsetRow: 0, offsetCol: bbox.c2 - to.c1 + 1});
} }
else else {
{ if (to.r1 <= bbox.r2)
if(to.r1 <= bbox.r2) to.setOffsetFirst({ offsetRow: bbox.r2 - to.r1 + 1, offsetCol: 0 });
to.setOffsetFirst({offsetRow: bbox.r2 - to.r1 + 1, offsetCol: 0});
} }
to.setOffset(offset); to.setOffset(offset);
} }
} }
aToChange.push({elem: elem, to: to}); else {
to = from.clone();
to.setOffset(offset);
}
aToChange.push({ elem: elem, to: to });
} }
} }
//меняем outer //меняем outer
if(elems.outer.length > 0) if (bShift) {
{ if (elems.outer.length > 0) {
for(var i = 0, length = elems.outer.length; i < length; i++) for (var i = 0, length = elems.outer.length; i < length; i++) {
{
var elem = elems.outer[i]; var elem = elems.outer[i];
var from = elem.bbox; var from = elem.bbox;
var to = null; var to = null;
if(bHor) if (bHor) {
{ if (from.c1 < bbox.c1 && bbox.r1 <= from.r1 && from.r2 <= bbox.r2) {
if(from.c1 < bbox.c1 && bbox.r1 <= from.r1 && from.r2 <= bbox.r2) if (bAdd) {
{
if(bAdd)
{
to = from.clone(); to = from.clone();
to.setOffsetLast({offsetRow: 0, offsetCol: bbox.c2 - bbox.c1 + 1}); to.setOffsetLast({ offsetRow: 0, offsetCol: bbox.c2 - bbox.c1 + 1 });
} }
else else {
{
to = from.clone(); to = from.clone();
var nTemp1 = from.c2 - bbox.c1 + 1; var nTemp1 = from.c2 - bbox.c1 + 1;
var nTemp2 = bbox.c2 - bbox.c1 + 1; var nTemp2 = bbox.c2 - bbox.c1 + 1;
to.setOffsetLast({offsetRow: 0, offsetCol: -Math.min(nTemp1, nTemp2)}); to.setOffsetLast({ offsetRow: 0, offsetCol: -Math.min(nTemp1, nTemp2) });
} }
} }
} }
else else {
{ if (from.r1 < bbox.r1 && bbox.c1 <= from.c1 && from.c2 <= bbox.c2) {
if(from.r1 < bbox.r1 && bbox.c1 <= from.c1 && from.c2 <= bbox.c2) if (bAdd) {
{
if(bAdd)
{
to = from.clone(); to = from.clone();
to.setOffsetLast({offsetRow: bbox.r2 - bbox.r1 + 1, offsetCol: 0}); to.setOffsetLast({ offsetRow: bbox.r2 - bbox.r1 + 1, offsetCol: 0 });
} }
else else {
{
to = from.clone(); to = from.clone();
var nTemp1 = from.r2 - bbox.r1 + 1; var nTemp1 = from.r2 - bbox.r1 + 1;
var nTemp2 = bbox.r2 - bbox.r1 + 1; var nTemp2 = bbox.r2 - bbox.r1 + 1;
to.setOffsetLast({offsetRow: -Math.min(nTemp1, nTemp2), offsetCol: 0}); to.setOffsetLast({ offsetRow: -Math.min(nTemp1, nTemp2), offsetCol: 0 });
}
} }
} }
if(null != to)
aToChange.push({elem: elem, to: to});
} }
if (null != to)
aToChange.push({ elem: elem, to: to });
} }
//сначала сортируем чтобы не было конфликтов при сдвиге
if(bHor)
{
if(bAdd)
aToChange.sort(function(a, b){return shiftSort(a, b, false, false);});
else
aToChange.sort(function(a, b){return shiftSort(a, b, true, false);});
} }
else
{
if(bAdd)
aToChange.sort(function(a, b){return shiftSort(a, b, false, true);});
else
aToChange.sort(function(a, b){return shiftSort(a, b, true, true);});
} }
if(null != this.fChange) //сначала сортируем чтобы не было конфликтов при сдвиге
{ aToChange.sort(function (a, b) { return shiftSort(a, b, offset); });
for(var i = 0, length = aToChange.length; i < length; ++i)
{ if (null != this.fChange) {
for (var i = 0, length = aToChange.length; i < length; ++i) {
var item = aToChange[i]; var item = aToChange[i];
this.fChange.call(this, item.elem.data, item.elem.bbox, item.to, oChangeParam); this.fChange.call(this, item.elem.data, item.elem.bbox, item.to, oChangeParam);
} }
...@@ -4114,41 +4096,19 @@ RangeDataManager.prototype = { ...@@ -4114,41 +4096,19 @@ RangeDataManager.prototype = {
var fOldChange = this.fChange; var fOldChange = this.fChange;
this.fChange = null; this.fChange = null;
//сначала удаляем все чтобы не было конфликтов //сначала удаляем все чтобы не было конфликтов
for(var i = 0, length = aToChange.length; i < length; ++i) for (var i = 0, length = aToChange.length; i < length; ++i) {
{
var item = aToChange[i]; var item = aToChange[i];
var elem = item.elem; var elem = item.elem;
this.removeElement(elem, oChangeParam); this.removeElement(elem, oChangeParam);
} }
//добавляем измененные ячейки //добавляем измененные ячейки
for(var i = 0, length = aToChange.length; i < length; ++i) for (var i = 0, length = aToChange.length; i < length; ++i) {
{
var item = aToChange[i]; var item = aToChange[i];
if(null != item.to) if (null != item.to)
this.add(item.to, item.elem.data, oChangeParam); this.add(item.to, item.elem.data, oChangeParam);
} }
this.fChange = fOldChange; this.fChange = fOldChange;
}, },
move: function (from, to, oChangeParam)
{
var fOldChange = this.fChange;
var nOffsetRow = to.r1 - from.r1;
var nOffsetCol = to.c1 - from.c1;
var oGetRes = this.get(from);
for(var i = 0, length = oGetRes.inner.length; i < length; i++)
{
var elem = oGetRes.inner[i];
var oNewBBox = new Asc.Range(elem.bbox.c1 + nOffsetCol, elem.bbox.r1 + nOffsetRow, elem.bbox.c2 + nOffsetCol, elem.bbox.r2 + nOffsetRow);
if(null != fOldChange)
fOldChange.call(this, elem.data, elem.bbox, oNewBBox, oChangeParam);
//убираем fChange, чтобы потом послать его только на одну операцию, а не 2
this.fChange = null;
this.removeElement(elem, oChangeParam);
this.add(oNewBBox, elem.data, oChangeParam);
this.fChange = fOldChange;
}
},
getAll : function() getAll : function()
{ {
var aRes = []; var aRes = [];
...@@ -4249,75 +4209,49 @@ CellArea.prototype = { ...@@ -4249,75 +4209,49 @@ CellArea.prototype = {
var bboxGet = shiftGetBBox(bbox, bHor); var bboxGet = shiftGetBBox(bbox, bHor);
return {bbox: bboxGet, elems: this.get(bboxGet)}; return {bbox: bboxGet, elems: this.get(bboxGet)};
}, },
shift : function(bbox, bAdd, bHor, oGetRes) shift: function (bbox, bAdd, bHor, oGetRes)
{ {
if(null == oGetRes) var _this = this;
if (null == oGetRes)
oGetRes = this.shiftGet(bbox, bHor); oGetRes = this.shiftGet(bbox, bHor);
var aToChange = []; var offset;
var elems = oGetRes.elems; if (bHor)
//сдвигаем inner offset = { offsetRow: 0, offsetCol: bbox.c2 - bbox.c1 + 1 };
if(elems.length > 0)
{
var offset = null;
if(bHor)
offset = {offsetRow: 0, offsetCol: bbox.c2 - bbox.c1 + 1};
else else
offset = {offsetRow: bbox.r2 - bbox.r1 + 1, offsetCol: 0}; offset = { offsetRow: bbox.r2 - bbox.r1 + 1, offsetCol: 0 };
if(!bAdd) if (!bAdd) {
{
offset.offsetRow = -offset.offsetRow; offset.offsetRow = -offset.offsetRow;
offset.offsetCol = -offset.offsetCol; offset.offsetCol = -offset.offsetCol;
} }
for(var i = 0, length = elems.length; i < length; i++) this._shiftmove(true, bbox, offset, oGetRes.elems);
},
move: function (from, to)
{ {
var offset = { offsetRow: to.r1 - from.r1, offsetCol: to.c1 - from.c1 };
var oGetRes = this.get(from);
this._shiftmove(false, from, offset, oGetRes);
},
_shiftmove: function (bShift, bbox, offset, elems) {
var aToChange = [];
//сдвигаем inner
if (elems.length > 0) {
var bboxAsc = Asc.Range(bbox.c1, bbox.r1, bbox.c2, bbox.r2);
var bAdd = offset.offsetRow > 0 || offset.offsetCol > 0;
for (var i = 0, length = elems.length; i < length; i++) {
var elem = elems[i]; var elem = elems[i];
var to = null; var to = null;
if(bAdd) if (!bShift || bAdd || !bboxAsc.containsRange(elem.bbox)) {
{
to = elem.bbox.clone(); to = elem.bbox.clone();
to.setOffset(offset); to.setOffset(offset);
} }
else aToChange.push({ elem: elem, to: to });
{
var bboxAsc = Asc.Range(bbox.c1, bbox.r1, bbox.c2, bbox.r2);
if(!bboxAsc.containsRange(elem.bbox))
{
to = elem.bbox.clone();
if(bHor)
{
if(to.c1 <= bbox.c2)
to.setOffsetFirst({offsetRow: 0, offsetCol: bbox.c2 - to.c1 + 1});
}
else
{
if(to.r1 <= bbox.r2)
to.setOffsetFirst({offsetRow: bbox.r2 - to.r1 + 1, offsetCol: 0});
}
to.setOffset(offset);
}
}
aToChange.push({elem: elem, to: to});
} }
} }
//сначала сортируем чтобы не было конфликтов при сдвиге //сначала сортируем чтобы не было конфликтов при сдвиге
if(bHor) aToChange.sort(function (a, b) { return shiftSort(a, b, offset); });
{
if(bAdd) if (null != this.fChange) {
aToChange.sort(function(a, b){return shiftSort(a, b, false, false);}); for (var i = 0, length = aToChange.length; i < length; ++i) {
else
aToChange.sort(function(a, b){return shiftSort(a, b, true, false);});
}
else
{
if(bAdd)
aToChange.sort(function(a, b){return shiftSort(a, b, false, true);});
else
aToChange.sort(function(a, b){return shiftSort(a, b, true, true);});
}
if(null != this.fChange)
{
for(var i = 0, length = aToChange.length; i < length; ++i)
{
var item = aToChange[i]; var item = aToChange[i];
this.fChange.call(this, item.elem.data, item.elem.bbox, item.to); this.fChange.call(this, item.elem.data, item.elem.bbox, item.to);
} }
...@@ -4326,40 +4260,19 @@ CellArea.prototype = { ...@@ -4326,40 +4260,19 @@ CellArea.prototype = {
var fOldChange = this.fChange; var fOldChange = this.fChange;
this.fChange = null; this.fChange = null;
//сначала удаляем все чтобы не было конфликтов //сначала удаляем все чтобы не было конфликтов
for(var i = 0, length = aToChange.length; i < length; ++i) for (var i = 0, length = aToChange.length; i < length; ++i) {
{
var item = aToChange[i]; var item = aToChange[i];
var elem = item.elem; var elem = item.elem;
this.removeElement(elem); this.removeElement(elem);
} }
//добавляем измененные ячейки //добавляем измененные ячейки
for(var i = 0, length = aToChange.length; i < length; ++i) for (var i = 0, length = aToChange.length; i < length; ++i) {
{
var item = aToChange[i]; var item = aToChange[i];
if(null != item.to) if (null != item.to)
this.add(item.to.r1, item.to.c1, item.elem.data); this.add(item.to.r1, item.to.c1, item.elem.data);
} }
this.fChange = fOldChange; this.fChange = fOldChange;
}, },
move : function(from, to)
{
var fOldChange = this.fChange;
var nOffsetRow = to.r1 - from.r1;
var nOffsetCol = to.c1 - from.c1;
var oGetRes = this.get(from);
for(var i = 0, length = oGetRes.length; i < length; i++)
{
var elem = oGetRes[i];
var oNewBBox = new Asc.Range(elem.bbox.c1 + nOffsetCol, elem.bbox.r1 + nOffsetRow, elem.bbox.c2 + nOffsetCol, elem.bbox.r2 + nOffsetRow);
if(null != fOldChange)
fOldChange.call(this, elem.data, elem.bbox, oNewBBox);
//убираем fChange, чтобы потом послать его только на одну операцию, а не 2
this.fChange = null;
this.removeElement(elem);
this.add(oNewBBox.r1, oNewBBox.c1, elem.data);
this.fChange = fOldChange;
}
},
getAll : function(){ getAll : function(){
var aRes = []; var aRes = [];
var oRows = this.rows.getNodeAll(); var oRows = this.rows.getNodeAll();
......
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