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

http://bugzserver/show_bug.cgi?id=25002 - Появление автофильтра в...

http://bugzserver/show_bug.cgi?id=25002 - Появление автофильтра в форматированной таблице без фильтров при удалении столбца или Undo удаления

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56980 954022d7-b5bf-4e40-9824-e11837661b57
parent d8725a97
...@@ -1813,6 +1813,7 @@ var gUndoInsDelCellsFlag = true; ...@@ -1813,6 +1813,7 @@ var gUndoInsDelCellsFlag = true;
} }
else*/ else*/
this._setColorStyleTable(splitRange, cloneData, null, true); this._setColorStyleTable(splitRange, cloneData, null, true);
if(cloneData.AutoFilter != null)
this._addButtonAF({result: cloneData.result,isVis: true}); this._addButtonAF({result: cloneData.result,isVis: true});
} }
else else
...@@ -1837,6 +1838,7 @@ var gUndoInsDelCellsFlag = true; ...@@ -1837,6 +1838,7 @@ var gUndoInsDelCellsFlag = true;
if(this._rangeHitInAnRange(cloneData.oldFilter.Ref, aWs.TableParts[l].Ref)) if(this._rangeHitInAnRange(cloneData.oldFilter.Ref, aWs.TableParts[l].Ref))
{ {
aWs.TableParts[l] = cloneData.oldFilter; aWs.TableParts[l] = cloneData.oldFilter;
if(aWs.TableParts[l].AutoFilter != null)
this._addButtonAF({result: cloneData.oldFilter.result,isVis: true}); this._addButtonAF({result: cloneData.oldFilter.result,isVis: true});
//var splitRange = cloneData.oldFilter.Ref.split(':'); //var splitRange = cloneData.oldFilter.Ref.split(':');
...@@ -5215,6 +5217,7 @@ var gUndoInsDelCellsFlag = true; ...@@ -5215,6 +5217,7 @@ var gUndoInsDelCellsFlag = true;
newResult[n].hiddenRows = []; newResult[n].hiddenRows = [];
var num = 1; var num = 1;
if(filter.AutoFilter !== null)
this._changeContentButton(newResult[n],num,'add',inFilter); this._changeContentButton(newResult[n],num,'add',inFilter);
//changeNum[insCol - 1] = n; //changeNum[insCol - 1] = n;
n++; n++;
...@@ -5335,7 +5338,7 @@ var gUndoInsDelCellsFlag = true; ...@@ -5335,7 +5338,7 @@ var gUndoInsDelCellsFlag = true;
} }
}; };
if(type == 'insCol') if(type == 'insCol' && filter.AutoFilter !== null)
{ {
for(var n = 0; n < newResult.length; n++) for(var n = 0; n < newResult.length; n++)
{ {
...@@ -5353,11 +5356,11 @@ var gUndoInsDelCellsFlag = true; ...@@ -5353,11 +5356,11 @@ var gUndoInsDelCellsFlag = true;
else else
{ {
if(filter.AutoFilter) if(filter.AutoFilter)
{
filter.AutoFilter.FilterColumns = cloneFilterColums; filter.AutoFilter.FilterColumns = cloneFilterColums;
if(!filter.AutoFilter)
filter.AutoFilter = new AutoFilter();
filter.AutoFilter.Ref = inFilter; filter.AutoFilter.Ref = inFilter;
} };
};
}; };
//change tableColumn //change tableColumn
......
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