fix bug 32472 - Настройки для числовых фильтров не производят выборку, если...

fix bug 32472 - Настройки для числовых фильтров не производят выборку, если формат Currency, Accounting или Percentage

cell/model/WorkbookElems.js

@@ -5994,7 +5994,7 @@ DynamicFilter.prototype.init = function(range) {
 			var counter = 0;
 			
 			range._foreach2(function(cell){
-				var val = parseFloat(cell.getValue());
+				var val = parseFloat(cell.getValueWithoutFormat());
 				
 				if(!isNaN(val))
 				{
@@ -6277,7 +6277,7 @@ Top10.prototype.init = function(range, reWrite){
 			var alreadyAddValues = {};
 			var count = 0;
 			range._foreach2(function(cell){
-				var val = parseFloat(cell.getValue());
+				var val = parseFloat(cell.getValueWithoutFormat());
 				
 				if(!isNaN(val) && !alreadyAddValues[val])
 				{

cell/model/autofilters.js

@@ -565,7 +565,13 @@
 						{	
 							var cell = worksheet.getCell3(i, filterObj.ColId + autoFilter.Ref.c1);
 							var isDateTimeFormat = cell.getNumFormat().isDateTimeFormat();
-							var currentValue = isDateTimeFormat ? cell.getValueWithoutFormat() : cell.getValueWithFormat();
+							var isNumberFilter = false;
+							if(newFilterColumn.CustomFiltersObj || newFilterColumn.Top10 || newFilterColumn.DynamicFilter)
+							{
+								isNumberFilter = true;
+							}
+							
+							var currentValue = (isDateTimeFormat || isNumberFilter) ? cell.getValueWithoutFormat() : cell.getValueWithFormat();
 							
 							var isSetHidden = newFilterColumn.isHideValue(currentValue, isDateTimeFormat, null, cell);
 							
@@ -2633,8 +2639,15 @@
 					{
 						var cell = worksheet.getCell3(r, colId + c);
 						var isDateTimeFormat = cell.getNumFormat().isDateTimeFormat();
-						var val = isDateTimeFormat ? cell.getValueWithoutFormat() : cell.getValueWithFormat()
-
+						
+						var isNumberFilter = false;
+						if(newFilterColumn.CustomFiltersObj || newFilterColumn.Top10 || newFilterColumn.DynamicFilter)
+						{
+							isNumberFilter = true;
+						}
+						
+						var val = (isDateTimeFormat || isNumberFilter) ? cell.getValueWithoutFormat() : cell.getValueWithFormat()
+			
 						if(filterColumns[j].isHideValue(val, isDateTimeFormat, null, cell))
 						{
 							result = true;
@@ -3660,7 +3673,7 @@
 							//filter current button
 							var checkValue = isDateTimeFormat ? val : text;
 							if (!currentFilterColumn.Top10 && !currentFilterColumn.CustomFiltersObj &&
-								!currentFilterColumn.ColorFilter && !currentFilterColumn.isHideValue(checkValue, isDateTimeFormat))
+								!currentFilterColumn.ColorFilter && !currentFilterColumn.DynamicFilter && !currentFilterColumn.isHideValue(checkValue, isDateTimeFormat))
 							{
 								if(isOpenHiddenRows)
 									worksheet.setRowHidden(false, i, i);