Merge pull request #492 from FastReports/sync_branch_2022.3.12

FastReport.OpenSource 2022.3.12

Author: 0legK

Demos/OpenSource/FastReport.OpenSource.MVC/Controllers/HomeController.cs

@@ -46,6 +46,8 @@ static HomeController()
                     continue;
                 if (folderItem.GetProp("Core") == "false")
                     continue;
+                if (folderItem.GetProp("Name") == "Advanced Matrix")
+                    continue;
                 string culture = System.Globalization.CultureInfo.CurrentCulture.Name;
                 string text = folderItem.GetProp("Name-" + culture);
                 if (String.IsNullOrEmpty(text))
@@ -63,6 +65,8 @@ static HomeController()
                         continue;
                     if (reportItem.GetProp("Core") == "false")
                         continue;
+                    if (reportItem.GetProp("File") == "SVG.frx" || reportItem.GetProp("File") == "Interactive Matrix With Chart.frx")
+                        continue;
 
                     string file = reportItem.GetProp("File");
                     string fileName = reportItem.GetProp("Name-" + culture);

Demos/OpenSource/FastReport.OpenSource.Web.MVC/Controllers/HomeController.cs

@@ -56,8 +56,7 @@ public IActionResult Index(int? reportIndex = 0)
                     "Hyperlinks, Bookmarks",
                     "Outline",
                     "Complex (Hyperlinks, Outline, TOC)",
-                    "Drill-Down Groups",
-                    "Mail Merge"
+                    "Drill-Down Groups"
                 },
             };
 

FastReport.Base/Export/Html/HTMLExportLayers.cs

@@ -853,6 +853,8 @@ private void ExportHTMLPageLayeredBegin(HTMLData d)
                     SolidFill fill = reportPage.Fill as SolidFill;
                     htmlPage.Append(" background-color:").
                         Append(fill.IsTransparent ? "transparent" : ExportUtils.HTMLColor(fill.Color));
+                    if (exportMode == ExportType.WebPrint)
+                        htmlPage.Append("color-adjust: exact !important; print-color-adjust: exact !important; -webkit-print-color-adjust: exact !important;");
                 }
                 else
                 {

FastReport.Base/Export/Html/HTMLExportTemplates.cs

@@ -77,7 +77,7 @@ public string OutlineTemplate
         public string IndexTemplate
         {
             get { return indexTemplate; }
-            set { outlineTemplate = value; }
+            set { indexTemplate = value; }
         }
         #endregion
 

FastReport.Base/Import/ComponentsFactory.cs

@@ -240,7 +240,7 @@ public static ChildBand CreateChildBand(BandBase parent)
         public static OverlayBand CreateOverlayBand(ReportPage page)
         {
             OverlayBand overlay = new OverlayBand();
-            page.Bands.Add(overlay);
+            page.Overlay = overlay;
             overlay.CreateUniqueName();
             return overlay;
         }