Commit 78698b5c authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

поправил undo после удаления форматированных таблиц(удаленеием всех строчек/столбцов целиком)

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51247 954022d7-b5bf-4e40-9824-e11837661b57
parent f108783e
......@@ -1845,7 +1845,17 @@
aWs.TableParts = [];
aWs.TableParts[aWs.TableParts.length] = data;
var splitRange = data.Ref.split(':');
this._setColorStyleTable(splitRange[0], splitRange[1], data, null, true);
if(!gUndoInsDelCellsFlag)
{
gUndoInsDelCellsFlag =
{
arg1: splitRange[0],
arg2: splitRange[1],
data: data
}
}
else
this._setColorStyleTable(splitRange[0], splitRange[1], data, null, true);
this._addButtonAF({result: data.result,isVis: true});
}
else
......
......@@ -8169,8 +8169,11 @@
functionModelAction = function () {
fullRecalc = true;
t.model.insertColsBefore(_updateRangeIns.c1, _updateRangeIns.c2 - _updateRangeIns.c1 + 1);
if(gUndoInsDelCellsFlag)
if(gUndoInsDelCellsFlag == true)
t.autoFilters.insertColumn(prop, _updateRangeIns, arn);
else if(gUndoInsDelCellsFlag && typeof gUndoInsDelCellsFlag == "object" && gUndoInsDelCellsFlag.arg1 && gUndoInsDelCellsFlag.arg2 && gUndoInsDelCellsFlag.data)
t.autoFilters._setColorStyleTable(gUndoInsDelCellsFlag.arg1, gUndoInsDelCellsFlag.arg2, gUndoInsDelCellsFlag.data, null, true);
gUndoInsDelCellsFlag = true;
t.objectRender.updateDrawingObject(true, val, _updateRangeIns);
t.cellCommentator.updateCommentsDependencies(true, val, _updateRangeIns);
};
......@@ -8185,8 +8188,11 @@
functionModelAction = function () {
fullRecalc = true;
t.model.insertRowsBefore(_updateRangeIns.r1, _updateRangeIns.r2 - _updateRangeIns.r1 + 1);
if(gUndoInsDelCellsFlag)
if(gUndoInsDelCellsFlag == true)
t.autoFilters.insertRows(prop,_updateRangeIns, arn);
else if(gUndoInsDelCellsFlag && typeof gUndoInsDelCellsFlag == "object" && gUndoInsDelCellsFlag.arg1 && gUndoInsDelCellsFlag.arg2 && gUndoInsDelCellsFlag.data)
t.autoFilters._setColorStyleTable(gUndoInsDelCellsFlag.arg1, gUndoInsDelCellsFlag.arg2, gUndoInsDelCellsFlag.data, null, true);
gUndoInsDelCellsFlag = true;
t.objectRender.updateDrawingObject(true, val, _updateRangeIns);
t.cellCommentator.updateCommentsDependencies(true, val, _updateRangeIns);
};
......
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