Merge pull request #1535 from EPPlusSoftware/bug/issue1534

Fixes issue 1534

Author: OssianEPPlus

src/EPPlus/Drawing/Slicer/ExcelPivotTableSlicerCacheTabularData.cs

@@ -135,7 +135,7 @@ internal void UpdateItemsXml()
             {
                 if (item.Type == eItemType.Data)
                 {
-                    if (item.Hidden)
+                    if (IsHidden(item))
                         sb.Append($"<i x=\"{x++}\" />");
                     else
                         sb.Append($"<i x=\"{x++}\" s=\"1\"/>");
@@ -150,5 +150,25 @@ internal void UpdateItemsXml()
             dataNode.SetAttribute("count", x.ToString());
             dataNode.InnerXml = sb.ToString();
         }
+
+        private bool IsHidden(ExcelPivotTableFieldItem item)
+        {
+            if (item.Hidden)
+            {
+                return true;
+            }
+            else
+            {
+                var field = _cache._field;
+                if (field.IsPageField && field.MultipleItemSelectionAllowed == false)
+                {
+                    return field.PageFieldSettings.SelectedItem != item.X;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+        }
     }
 }

src/EPPlus/Drawing/Slicer/ExcelPivotTableSlicerItemCollection.cs

@@ -6,6 +6,7 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Text;
+using System.Xml;
 
 namespace OfficeOpenXml.Drawing.Slicer
 {
@@ -21,7 +22,7 @@ internal ExcelPivotTableSlicerItemCollection(ExcelPivotTableSlicerCache cache)
         {
             _cache = cache;
             _items = new List<ExcelPivotTableSlicerItem>();
-            RefreshMe();
+            RefreshMe();            
         }
 
         /// <summary>

src/EPPlus/Table/PivotTable/ExcelPivotTable.cs

@@ -1758,6 +1758,7 @@ internal void MatchFieldValuesToIndex()
                 if (f.Items.Count > 0)
                 {
                     f.Items.MatchValueToIndex();
+                
                 }
             }
         }

src/EPPlus/Table/PivotTable/ExcelPivotTableFieldCollectionBase.cs

@@ -23,12 +23,12 @@ namespace OfficeOpenXml.Table.PivotTable
     public class ExcelPivotTableFieldItemsCollection : ExcelPivotTableFieldCollectionBase<ExcelPivotTableFieldItem>
     {
         ExcelPivotTableField _field;
-        internal Dictionary<int, int> _cacheDictionary = null;
+        internal Lookup<int, int> _cacheLookup = null;
 
         List<int> _hiddenItemIndex=null;
         internal ExcelPivotTableFieldItemsCollection(ExcelPivotTableField field) : base()
         {
-            _field = field;
+            _field = field;            
         }
         internal void InitNewCalculation()
         {
@@ -78,9 +78,9 @@ public ExcelPivotTableFieldItem GetByValue(object value)
             var cl = _field.Cache.GetCacheLookup();
             if (cl.TryGetValue(value, out int ix))
             {
-                if (_cacheDictionary.TryGetValue(ix, out int i))
+                if (_cacheLookup.Contains(ix))
                 {
-                    return _list[i];
+                    return _list[_cacheLookup[ix].First()];
                 }
             }
 			return null;
@@ -96,9 +96,9 @@ public int GetIndexByValue(object value)
             var cl = _field.Cache.GetCacheLookup();
 			if (cl.TryGetValue(value, out int ix))
             {
-                if(_cacheDictionary.TryGetValue(ix, out int i))
+                if (_cacheLookup.Contains(ix))
                 {
-                    return i;
+                    return _cacheLookup[ix].First();
                 }
             }
             return -1;
@@ -120,7 +120,7 @@ internal void MatchValueToIndex()
                     item.X = -1;
                 }
             }
-            _cacheDictionary = _list.Where(x=>x.X>=0).ToDictionary(x => x.X, y => _list.IndexOf(y));
+            _cacheLookup = (Lookup<int,int>)_list.Where(x=> x.X >= 0).ToLookup(x => x.X, y => _list.IndexOf(y));
         }
         /// <summary>
         /// Set Hidden to false for all items in the collection
@@ -186,15 +186,16 @@ internal void Sort(eSortType sort)
 		{
             var comparer = new PivotItemComparer(sort, _field);
 			_list.Sort(comparer);
-            _cacheDictionary = _list.Where(x=>x.X > -1).ToDictionary(x => x.X, y=>_list.IndexOf(y));
+            _cacheLookup = (Lookup<int,int>)_list.Where(x=>x.X > -1).ToLookup(x => x.X, y=>_list.IndexOf(y));
 		}
 
         internal ExcelPivotTableFieldItem GetByCacheIndex(int index)
         {
-            if(_cacheDictionary.TryGetValue(index, out int i))
+            if (_cacheLookup.Contains(index))
             {
-                return _list[i];
+                return _list[_cacheLookup[index].First()];
             }
+
             return null;
         }
 

src/EPPlusTest/Issues/PivotTableIssues.cs

@@ -10,7 +10,7 @@ public void s688()
         {
             using (ExcelPackage package = OpenTemplatePackage("s688.xlsx"))
             {
-                package.Workbook.Worksheets[0].PivotTables[0].Calculate(true);
+                package.Workbook.Worksheets[0].PivotTables[0].Calculate(false);
                 SaveAndCleanup(package);
             }
         }