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

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

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64085 954022d7-b5bf-4e40-9824-e11837661b57
parent b7962d2c
......@@ -18,6 +18,11 @@ var g_nColorTextDefault = 1;
var g_nColorHyperlink = 10;
var g_nColorHyperlinkVisited = 11;
var g_nFiltersType = {
autoFilter: 1,
tablePart: 2
};
var g_oThemeColorsDefaultModsSpreadsheet = [
[0, -4.9989318521683403E-2, -0.14999847407452621, -0.249977111117893, -0.34998626667073579, -0.499984740745262],
[0, -9.9978637043366805E-2, -0.249977111117893, -0.499984740745262, -0.749992370372631, -0.89999084444715716],
......@@ -4449,6 +4454,10 @@ TablePart.prototype.addTableColumns = function(activeRange, aF)
this.TableColumns = newTableColumns;
};
TablePart.prototype.getType = function(F)
{
return g_nFiltersType.tablePart;
};
/** @constructor */
function AutoFilter() {
......@@ -4522,6 +4531,11 @@ AutoFilter.prototype.isApplySortConditions = function() {
return res;
};
AutoFilter.prototype.getType = function(F)
{
return g_nFiltersType.autoFilter;
};
function FilterColumns() {
this.ColId = null;
this.CustomFiltersObj = null;
......
......@@ -3713,8 +3713,8 @@ var maxIndividualValues = 10000;
_openHiddenRows: function(filter)
{
var aWs = this._getCurrentWS();
var autoFilter = filter.AutoFilter !== null ? filter.AutoFilter : filter;
var isApplyFilter = autoFilter.FilterColumns && autoFilter.FilterColumns.length ? true : false;
var autoFilter = filter.getType() === g_nFiltersType.autoFilter ? filter : filter.AutoFilter;
var isApplyFilter = autoFilter && autoFilter.FilterColumns && autoFilter.FilterColumns.length ? true : false;
if(filter && filter.Ref && isApplyFilter)
{
......
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