Commit 59761e2d authored by GoshaZotov's avatar GoshaZotov

add asc_setCellPosX and asc_setCellPosY in AutoFiltersOptions

parent 91efaf5d
...@@ -129,6 +129,8 @@ ...@@ -129,6 +129,8 @@
this.Properties = g_oAutoFiltersOptionsProperties; this.Properties = g_oAutoFiltersOptionsProperties;
this.cellId = null; this.cellId = null;
this.cellPosX = null;
this.cellPosY = null;
this.values = null; this.values = null;
this.filter = null; this.filter = null;
this.sortVal = null; this.sortVal = null;
...@@ -180,6 +182,8 @@ ...@@ -180,6 +182,8 @@
}, },
asc_setCellId : function(cellId) { this.cellId = cellId;}, asc_setCellId : function(cellId) { this.cellId = cellId;},
asc_setCellPosX : function(val) { this.cellPosX = val; },
asc_setCellPosY : function(val) { this.cellPosY = val; },
asc_setValues : function(values) { this.values = values; }, asc_setValues : function(values) { this.values = values; },
asc_setFilterObj : function(filter) { this.filter = filter; }, asc_setFilterObj : function(filter) { this.filter = filter; },
...@@ -193,6 +197,8 @@ ...@@ -193,6 +197,8 @@
asc_setSortColor : function(val) { this.sortColor = val; }, asc_setSortColor : function(val) { this.sortColor = val; },
asc_getCellId : function() { return this.cellId; }, asc_getCellId : function() { return this.cellId; },
asc_getCellPosX : function() { return this.cellPosX; },
asc_getCellPosY : function() { return this.cellPosY; },
asc_getValues : function() { return this.values; }, asc_getValues : function() { return this.values; },
asc_getFilterObj : function() { return this.filter; }, asc_getFilterObj : function() { return this.filter; },
...@@ -4886,6 +4892,8 @@ ...@@ -4886,6 +4892,8 @@
prot["asc_getValues"] = prot.asc_getValues; prot["asc_getValues"] = prot.asc_getValues;
prot["asc_getFilterObj"] = prot.asc_getFilterObj; prot["asc_getFilterObj"] = prot.asc_getFilterObj;
prot["asc_getCellId"] = prot.asc_getCellId; prot["asc_getCellId"] = prot.asc_getCellId;
prot["asc_getCellPosX"] = prot.asc_getCellPosX;
prot["asc_getCellPosY"] = prot.asc_getCellPosY;
prot["asc_getDisplayName"] = prot.asc_getDisplayName; prot["asc_getDisplayName"] = prot.asc_getDisplayName;
prot["asc_getIsTextFilter"] = prot.asc_getIsTextFilter; prot["asc_getIsTextFilter"] = prot.asc_getIsTextFilter;
prot["asc_getColorsFill"] = prot.asc_getColorsFill; prot["asc_getColorsFill"] = prot.asc_getColorsFill;
......
...@@ -12836,7 +12836,10 @@ ...@@ -12836,7 +12836,10 @@
var rangeButton = Asc.Range(autoFilter.Ref.c1 + colId, autoFilter.Ref.r1, autoFilter.Ref.c1 + colId, autoFilter.Ref.r1); var rangeButton = Asc.Range(autoFilter.Ref.c1 + colId, autoFilter.Ref.r1, autoFilter.Ref.c1 + colId, autoFilter.Ref.r1);
var cellId = ws.autoFilters._rangeToId(rangeButton); var cellId = ws.autoFilters._rangeToId(rangeButton);
var posX = this.cols[autoFilter.Ref.c1 + colId].left + this.cols[autoFilter.Ref.c1 + colId].width;
var posY = this.rows[autoFilter.Ref.r1].top + this.rows[autoFilter.Ref.r1].height;
//get filter object //get filter object
var filterObj = new Asc.AutoFilterObj(); var filterObj = new Asc.AutoFilterObj();
if(filters && filters.ColorFilter) if(filters && filters.ColorFilter)
...@@ -12920,7 +12923,9 @@ ...@@ -12920,7 +12923,9 @@
var autoFilterObject = new Asc.AutoFiltersOptions(); var autoFilterObject = new Asc.AutoFiltersOptions();
autoFilterObject.asc_setSortState(sortVal); autoFilterObject.asc_setSortState(sortVal);
autoFilterObject.asc_setCellId(cellId); autoFilterObject.asc_setCellPosX(posX);
autoFilterObject.asc_setCellPosY(posY);
autoFilterObject.asc_setCellId(cellId);
autoFilterObject.asc_setValues(values); autoFilterObject.asc_setValues(values);
autoFilterObject.asc_setFilterObj(filterObj); autoFilterObject.asc_setFilterObj(filterObj);
autoFilterObject.asc_setAutomaticRowCount(automaticRowCount); autoFilterObject.asc_setAutomaticRowCount(automaticRowCount);
......
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