Added fix for html images

Author: OssianEPPlus

src/EPPlus/Export/HtmlExport/Exporters/Internal/HtmlExporterBaseInternal.cs

@@ -148,7 +148,7 @@ protected HTMLElement GetThead(ExcelRangeBase range, List<string> headers = null
 
                     AddTableData(table, contentElement, col);
 
-                    if (Settings.Pictures.Include == (ePictureInclude.Include | ePictureInclude.IncludeInHtmlOnly))
+                    if ((Settings.Pictures.Include == ePictureInclude.Include) || (Settings.Pictures.Include == ePictureInclude.IncludeInHtmlOnly))
                     {
                         image = GetImage(cell.Worksheet.PositionId, cell._fromRow, cell._fromCol);
                     }
@@ -269,7 +269,7 @@ protected HTMLElement GetTableBody(ExcelRangeBase range, int row, int endRow)
 
                     SetColRowSpan(range, tblData, cell);
 
-                    if (Settings.Pictures.Include == (ePictureInclude.Include | ePictureInclude.IncludeInHtmlOnly))
+                    if ((Settings.Pictures.Include == ePictureInclude.Include) || (Settings.Pictures.Include == ePictureInclude.IncludeInHtmlOnly))
                     { 
                         image = GetImage(cell.Worksheet.PositionId, cell._fromRow, cell._fromCol);
                     }

src/EPPlusTest/Export/HtmlExport/TableExporterTests.cs

@@ -443,6 +443,9 @@ public async Task WriteImages_TableAsync()
                 exporter.Settings.SetColumnWidth = true;
                 exporter.Settings.SetRowHeight = true;
                 exporter.Settings.Pictures.Include = ePictureInclude.Include;
+                exporter.Settings.Pictures.Position = ePicturePosition.Absolute;
+                exporter.Settings.Pictures.AddMarginLeft = true;
+                exporter.Settings.Pictures.AddMarginTop = true;
                 exporter.Settings.Minify = false;
                 var html = exporter.GetSinglePage();
                 var htmlAsync = await exporter.GetSinglePageAsync();

src/EPPlusTest/Issues/ConditionalFormattingIssues.cs

@@ -161,5 +161,24 @@ public void VerifyReadWritePriority()
                 //SaveAndCleanup(p);
             }
         }
+
+        [TestMethod]
+        public void i2381()
+        {
+            using (var package = OpenTemplatePackage("Cabinet_template_test_clean.xlsx"))
+            {
+                var copyCount = package.Workbook.Worksheets.Count;
+                var worksheets = package.Workbook.Worksheets;
+
+                //for (int i = 0; i < copyCount; i++)
+                //{
+                //    package.Workbook.Worksheets.Copy(
+                //    worksheets[i].Name, $"{worksheets[i].Name}_{i}");
+                //}
+
+                SaveAndCleanup(package);
+            }
+        }
+
     }
 }