Skip to content

Commit

Permalink
Merge pull request #418 from FastReports/sync_branch_2022.2.0
Browse files Browse the repository at this point in the history
FastReport.OpenSource 2022.2.0
  • Loading branch information
KirillKornienko authored Mar 14, 2022
2 parents fbd5d3e + af57a3a commit c978164
Show file tree
Hide file tree
Showing 26 changed files with 1,230 additions and 60 deletions.
18 changes: 9 additions & 9 deletions Demos/Reports/Complex (Hyperlinks, Outline, TOC).frx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" DoublePass="true" TextQuality="Regular" ReportInfo.Description="Demonstrates the complex use of &quot;Hyperlinks&quot;, &quot;Bookmarks&quot; and &quot;Outline&quot; features. New in this report:&#13;&#10;- to create the Table of Contents, use bookmarks. To print the page's number for a given bookmark, use the &quot;Engine.GetBookmarkPage&quot; function. This function will work properly if your report is set to double-pass." ReportInfo.Created="01/17/2008 03:55:42" ReportInfo.Modified="02/25/2020 12:33:45" ReportInfo.CreatorVersion="2020.1.22.0">
<Report ScriptLanguage="CSharp" DoublePass="true" TextQuality="Regular" ReportInfo.Description="Demonstrates the complex use of &quot;Hyperlinks&quot;, &quot;Bookmarks&quot; and &quot;Outline&quot; features. New in this report:&#13;&#10;- to create the Table of Contents, use bookmarks. To print the page's number for a given bookmark, use the &quot;Engine.GetBookmarkPage&quot; function. This function will work properly if your report is set to double-pass." ReportInfo.Created="01/17/2008 03:55:42" ReportInfo.Modified="02/11/2022 15:07:18" ReportInfo.CreatorVersion="1.0.0.0">
<Styles>
<Style Name="EvenRows" Fill.Color="OldLace" Font="Arial, 10pt"/>
</Styles>
Expand Down Expand Up @@ -31,49 +31,49 @@
<TextObject Name="Text19" Top="28.35" Width="718.2" Height="28.35" Anchor="Top, Left, Right" Fill.Color="WhiteSmoke" CanGrow="true" CanShrink="true" Text="[Report.ReportInfo.Description]&#13;&#10;" Padding="4, 4, 4, 4" Font="Tahoma, 8pt"/>
<TextObject Name="Text23" Width="718.2" Height="28.35" Anchor="Top, Left, Right" Fill.Color="WhiteSmoke" Cursor="Hand" Hyperlink.Value="http://fast.report/88bd7" Hyperlink.OpenLinkInNewTab="true" Text="Learn how to build this report on the Fast Reports Academy channel" VertAlign="Center" Font="Tahoma, 10pt, style=Bold, Underline" TextFill.Color="Blue"/>
</ReportTitleBand>
<PageFooterBand Name="PageFooter2" Top="646.6" Width="718.2" Height="28.35" Fill.Color="WhiteSmoke">
<PageFooterBand Name="PageFooter2" Top="645.8" Width="718.2" Height="28.35" Fill.Color="WhiteSmoke">
<TextObject Name="Text20" Left="9.45" Width="217.35" Height="28.35" Cursor="Hand" Hyperlink.Value="https://www.fast-report.com/en/product/fast-report-net/" Text="Generated by FastReport .NET" VertAlign="Center" Font="Tahoma, 8pt, style=Underline" TextFill.Color="Blue"/>
</PageFooterBand>
</ReportPage>
<ReportPage Name="ContentsPage" Watermark.Font="Arial, 60pt" OutlineExpression="&quot;Table of Contents&quot;">
<ReportTitleBand Name="ReportTitle2" Width="718.2" Height="66.15">
<TextObject Name="Text4" Top="28.35" Width="302.4" Height="28.35" Text="Table of contents" Font="Tahoma, 14pt"/>
</ReportTitleBand>
<DataBand Name="Data3" Top="70.15" Width="718.2" Height="28.35" DataSource="Categories">
<DataBand Name="Data3" Top="69.35" Width="718.2" Height="28.35" DataSource="Categories">
<LineObject Name="Line2" Top="12.9" Width="718.2" Border.Style="Dot"/>
<TextObject Name="Text14" Width="302.4" Height="18.9" Fill.Color="White" Cursor="Hand" Hyperlink.Kind="Bookmark" Hyperlink.Expression="[Categories.CategoryName]" Text="[Categories.CategoryName]" AutoWidth="true" VertAlign="Center" WordWrap="false" Font="Tahoma, 10pt"/>
<TextObject Name="Text18" Left="689.85" Width="28.35" Height="18.9" Fill.Color="White" Cursor="Hand" Hyperlink.Kind="Bookmark" Hyperlink.Expression="[Categories.CategoryName]" Text="[Engine.GetBookmarkPage([Categories.CategoryName])]" HorzAlign="Center" VertAlign="Center" Font="Tahoma, 10pt" TextFill.Color="Blue"/>
</DataBand>
<PageFooterBand Name="PageFooter3" Top="102.5" Width="718.2" Height="28.35" Fill.Color="WhiteSmoke">
<PageFooterBand Name="PageFooter3" Top="100.9" Width="718.2" Height="28.35" Fill.Color="WhiteSmoke">
<TextObject Name="Text21" Left="9.45" Width="217.35" Height="28.35" Cursor="Hand" Hyperlink.Value="https://www.fast-report.com/en/product/fast-report-net/" Text="Generated by FastReport .NET" VertAlign="Center" Font="Tahoma, 8pt, style=Underline" TextFill.Color="Blue"/>
</PageFooterBand>
</ReportPage>
<ReportPage Name="CatalogPage" Watermark.Font="Arial, 60pt">
<DataBand Name="Data1" Width="718.2" Height="103.95" Fill.Color="Orange" Bookmark="[Categories.CategoryName]" OutlineExpression="[Categories.CategoryName]" DataSource="Categories" KeepDetail="true">
<TextObject Name="Text1" Left="160.65" Top="9.45" Width="302.4" Height="28.35" Text="[Categories.CategoryName]" Font="Tahoma, 14pt"/>
<TextObject Name="Text1" Left="160.65" Top="9.45" Width="302.4" Height="28.35" Bookmark="[Categories.CategoryName]" Text="[Categories.CategoryName]" Font="Tahoma, 14pt"/>
<PictureObject Name="Picture1" Left="9.45" Top="9.45" Width="141.75" Height="85.05" DataColumn="Categories.Picture"/>
<TextObject Name="Text2" Left="160.65" Top="47.25" Width="302.4" Height="47.25" Text="[Categories.Description]" Font="Tahoma, 8pt"/>
<TextObject Name="Text15" Left="614.25" Top="9.45" Width="94.5" Height="18.9" Cursor="Hand" Hyperlink.Kind="PageNumber" Hyperlink.Value="1" Text="back to top" HorzAlign="Right" Font="Tahoma, 8pt, style=Underline" TextFill.Color="Blue"/>
<DataBand Name="Data2" Top="140.3" Width="718.2" Height="18.9" EvenStyle="EvenRows" OutlineExpression="[Products.ProductName]" DataSource="Products">
<DataBand Name="Data2" Top="138.7" Width="718.2" Height="18.9" EvenStyle="EvenRows" OutlineExpression="[Products.ProductName]" DataSource="Products">
<TextObject Name="Text5" Width="245.7" Height="18.9" Text="[Products.ProductName]" VertAlign="Center" Font="Tahoma, 8pt"/>
<TextObject Name="Text7" Left="245.7" Width="122.85" Height="18.9" Text="[Products.UnitPrice]" Format="Currency" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Right" VertAlign="Center" Font="Tahoma, 8pt"/>
<TextObject Name="Text9" Left="368.55" Width="122.85" Height="18.9" Text="[Products.UnitsInStock]" HorzAlign="Center" VertAlign="Center" Font="Tahoma, 8pt"/>
<CheckBoxObject Name="CheckBox1" Left="529.2" Width="18.9" Height="18.9" Checked="false" DataColumn="Products.Discontinued"/>
<TextObject Name="Text13" Left="595.35" Width="122.85" Height="18.9" Fill.Color="Orange" VertAlign="Center" Font="Arial, 10pt"/>
<DataHeaderBand Name="DataHeader1" Top="107.95" Width="718.2" Height="28.35" Fill.Color="OldLace">
<DataHeaderBand Name="DataHeader1" Top="107.15" Width="718.2" Height="28.35" Fill.Color="OldLace">
<TextObject Name="Text6" Width="245.7" Height="28.35" Text="Product name" VertAlign="Center" Font="Tahoma, 8pt, style=Bold"/>
<TextObject Name="Text8" Left="245.7" Width="122.85" Height="28.35" Text="Unit price" HorzAlign="Right" VertAlign="Center" Font="Tahoma, 8pt, style=Bold"/>
<TextObject Name="Text10" Left="368.55" Width="122.85" Height="28.35" Text="Units in stock" HorzAlign="Center" VertAlign="Center" Font="Tahoma, 8pt, style=Bold"/>
<TextObject Name="Text12" Left="491.4" Width="94.5" Height="28.35" Text="Discontinued" HorzAlign="Center" VertAlign="Center" Font="Tahoma, 8pt, style=Bold"/>
<TextObject Name="Text11" Left="595.35" Width="122.85" Height="28.35" Fill.Color="Orange" VertAlign="Center" Font="Arial, 10pt"/>
</DataHeaderBand>
<DataFooterBand Name="DataFooter1" Top="163.2" Width="718.2" Height="37.8"/>
<DataFooterBand Name="DataFooter1" Top="160.8" Width="718.2" Height="37.8"/>
<Sort>
<Sort Expression="[Products.ProductName]"/>
</Sort>
</DataBand>
</DataBand>
<PageFooterBand Name="PageFooter1" Top="205" Width="718.2" Height="28.35" Fill.Color="WhiteSmoke">
<PageFooterBand Name="PageFooter1" Top="201.8" Width="718.2" Height="28.35" Fill.Color="WhiteSmoke">
<TextObject Name="Text17" Left="623.7" Top="9.45" Width="94.5" Height="18.9" Text="[PageN]" HorzAlign="Right" Font="Tahoma, 8pt"/>
<TextObject Name="Text22" Left="9.45" Width="217.35" Height="28.35" Cursor="Hand" Hyperlink.Value="https://www.fast-report.com/en/product/fast-report-net/" Text="Generated by FastReport .NET" VertAlign="Center" Font="Tahoma, 8pt, style=Underline" TextFill.Color="Blue"/>
</PageFooterBand>
Expand Down
16 changes: 8 additions & 8 deletions Demos/Reports/Hyperlinks, Bookmarks.frx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" TextQuality="Regular" ReportInfo.Description="Demonstrates the &quot;Hyperlinks&quot; feature. To use it:&#13;&#10;- define the items that you want to navigate to. To do this, set the &quot;Bookmark&quot; property of such an item to any valid expression. It will be the bookmark's name;&#13;&#10;- define active items that will receive the mouse clicks and then perform the navigation to bookmarks. To do this:&#13;&#10;- set &quot;Cursor&quot; property to &quot;Hand&quot;;&#13;&#10;- set blue color font with underline style;&#13;&#10;- set the &quot;Hyperlink.Kind&quot; property to &quot;Bookmark&quot;;&#13;&#10;- set the &quot;Hyperlink.Expression&quot; property to any valid expression. In our case, the expression should represent the name of a bookmark we want to navigate to." ReportInfo.Created="01/17/2008 03:55:42" ReportInfo.Modified="02/25/2020 12:32:10" ReportInfo.CreatorVersion="2020.1.22.0">
<Report ScriptLanguage="CSharp" TextQuality="Regular" ReportInfo.Description="Demonstrates the &quot;Hyperlinks&quot; feature. To use it:&#13;&#10;- define the items that you want to navigate to. To do this, set the &quot;Bookmark&quot; property of such an item to any valid expression. It will be the bookmark's name;&#13;&#10;- define active items that will receive the mouse clicks and then perform the navigation to bookmarks. To do this:&#13;&#10;- set &quot;Cursor&quot; property to &quot;Hand&quot;;&#13;&#10;- set blue color font with underline style;&#13;&#10;- set the &quot;Hyperlink.Kind&quot; property to &quot;Bookmark&quot;;&#13;&#10;- set the &quot;Hyperlink.Expression&quot; property to any valid expression. In our case, the expression should represent the name of a bookmark we want to navigate to." ReportInfo.Created="01/17/2008 03:55:42" ReportInfo.Modified="02/11/2022 15:05:22" ReportInfo.CreatorVersion="1.0.0.0">
<Styles>
<Style Name="EvenRows" Fill.Color="OldLace" Font="Arial, 10pt"/>
</Styles>
Expand Down Expand Up @@ -31,39 +31,39 @@
<TextObject Name="Text18" Top="28.35" Width="718.2" Height="28.35" Anchor="Top, Left, Right" Fill.Color="WhiteSmoke" CanGrow="true" CanShrink="true" Text="[Report.ReportInfo.Description]&#13;&#10;" Padding="4, 4, 4, 4" Font="Tahoma, 8pt"/>
<TextObject Name="Text21" Width="718.2" Height="28.35" Anchor="Top, Left, Right" Fill.Color="WhiteSmoke" Cursor="Hand" Hyperlink.Value="http://fast.report/88bd7" Hyperlink.OpenLinkInNewTab="true" Text="Learn how to build this report on the Fast Reports Academy channel" VertAlign="Center" Font="Tahoma, 10pt, style=Bold, Underline" TextFill.Color="Blue"/>
</ReportTitleBand>
<DataBand Name="Data3" Top="98.5" Width="718.2" Height="18.9" DataSource="Categories">
<DataBand Name="Data3" Top="97.7" Width="718.2" Height="18.9" DataSource="Categories">
<TextObject Name="Text14" Width="302.4" Height="18.9" Cursor="Hand" Hyperlink.Kind="Bookmark" Hyperlink.Expression="[Categories.CategoryName]" Text="[Categories.CategoryName]" VertAlign="Center" Font="Tahoma, 8pt, style=Underline" TextFill.Color="Blue"/>
</DataBand>
<PageFooterBand Name="PageFooter2" Top="121.4" Width="718.2" Height="28.35" Fill.Color="WhiteSmoke">
<PageFooterBand Name="PageFooter2" Top="119.8" Width="718.2" Height="28.35" Fill.Color="WhiteSmoke">
<TextObject Name="Text19" Left="9.45" Width="217.35" Height="28.35" Cursor="Hand" Hyperlink.Value="https://www.fast-report.com/en/product/fast-report-net/" Text="Generated by FastReport .NET" VertAlign="Center" Font="Tahoma, 8pt, style=Underline" TextFill.Color="Blue"/>
</PageFooterBand>
</ReportPage>
<ReportPage Name="CatalogPage" Watermark.Font="Arial, 60pt">
<DataBand Name="Data1" Width="718.2" Height="103.95" Fill.Color="Orange" Bookmark="[Categories.CategoryName]" DataSource="Categories" KeepDetail="true">
<TextObject Name="Text1" Left="160.65" Top="9.45" Width="302.4" Height="18.9" Text="[Categories.CategoryName]" Font="Tahoma, 10pt, style=Bold"/>
<TextObject Name="Text1" Left="160.65" Top="9.45" Width="302.4" Height="18.9" Bookmark="[Categories.CategoryName]" Text="[Categories.CategoryName]" Font="Tahoma, 10pt, style=Bold"/>
<PictureObject Name="Picture1" Left="9.45" Top="9.45" Width="141.75" Height="85.05" DataColumn="Categories.Picture"/>
<TextObject Name="Text2" Left="160.65" Top="37.8" Width="302.4" Height="56.7" Text="[Categories.Description]" Font="Tahoma, 8pt"/>
<TextObject Name="Text15" Left="614.25" Top="9.45" Width="94.5" Height="18.9" Cursor="Hand" Hyperlink.Kind="PageNumber" Hyperlink.Value="1" Text="back to top" HorzAlign="Right" Font="Tahoma, 8pt, style=Underline" TextFill.Color="Blue"/>
<DataBand Name="Data2" Top="140.3" Width="718.2" Height="18.9" EvenStyle="EvenRows" DataSource="Products">
<DataBand Name="Data2" Top="138.7" Width="718.2" Height="18.9" EvenStyle="EvenRows" DataSource="Products">
<TextObject Name="Text5" Width="245.7" Height="18.9" Text="[Products.ProductName]" VertAlign="Center" Font="Tahoma, 8pt"/>
<TextObject Name="Text7" Left="245.7" Width="122.85" Height="18.9" Text="[Products.UnitPrice]" Format="Currency" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Right" VertAlign="Center" Font="Tahoma, 8pt"/>
<TextObject Name="Text9" Left="368.55" Width="122.85" Height="18.9" Text="[Products.UnitsInStock]" HorzAlign="Center" VertAlign="Center" Font="Tahoma, 8pt"/>
<CheckBoxObject Name="CheckBox1" Left="529.2" Width="18.9" Height="18.9" Checked="false" DataColumn="Products.Discontinued"/>
<TextObject Name="Text13" Left="595.35" Width="122.85" Height="18.9" Fill.Color="Orange" VertAlign="Center" Font="Arial, 10pt"/>
<DataHeaderBand Name="DataHeader1" Top="107.95" Width="718.2" Height="28.35" Fill.Color="OldLace">
<DataHeaderBand Name="DataHeader1" Top="107.15" Width="718.2" Height="28.35" Fill.Color="OldLace">
<TextObject Name="Text6" Width="245.7" Height="28.35" Text="Product name" VertAlign="Center" Font="Tahoma, 8pt, style=Bold"/>
<TextObject Name="Text8" Left="245.7" Width="122.85" Height="28.35" Text="Unit price" HorzAlign="Right" VertAlign="Center" Font="Tahoma, 8pt, style=Bold"/>
<TextObject Name="Text10" Left="368.55" Width="122.85" Height="28.35" Text="Units in stock" HorzAlign="Center" VertAlign="Center" Font="Tahoma, 8pt, style=Bold"/>
<TextObject Name="Text12" Left="491.4" Width="94.5" Height="28.35" Text="Discontinued" HorzAlign="Center" VertAlign="Center" Font="Tahoma, 8pt, style=Bold"/>
<TextObject Name="Text11" Left="595.35" Width="122.85" Height="28.35" Fill.Color="Orange" VertAlign="Center" Font="Arial, 10pt"/>
</DataHeaderBand>
<DataFooterBand Name="DataFooter1" Top="163.2" Width="718.2" Height="37.8"/>
<DataFooterBand Name="DataFooter1" Top="160.8" Width="718.2" Height="37.8"/>
<Sort>
<Sort Expression="[Products.ProductName]"/>
</Sort>
</DataBand>
</DataBand>
<PageFooterBand Name="PageFooter1" Top="205" Width="718.2" Height="28.35" Fill.Color="WhiteSmoke">
<PageFooterBand Name="PageFooter1" Top="201.8" Width="718.2" Height="28.35" Fill.Color="WhiteSmoke">
<TextObject Name="Text17" Left="614.25" Width="94.5" Height="28.35" Text="[PageN]" HorzAlign="Right" VertAlign="Center" Font="Tahoma, 8pt"/>
<TextObject Name="Text20" Left="9.45" Width="217.35" Height="28.35" Cursor="Hand" Hyperlink.Value="https://www.fast-report.com/en/product/fast-report-net/" Text="Generated by FastReport .NET" VertAlign="Center" Font="Tahoma, 8pt, style=Underline" TextFill.Color="Blue"/>
</PageFooterBand>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net461;netcoreapp3.1</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../../../FastReport.Plugins.snk</AssemblyOriginatorKeyFile>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Copyright>Fast Reports Inc.</Copyright>
<Company>Fast Reports Inc.</Company>
<PackageLicenseUrl>https://www.fast-report.com/en/product/fast-report-net/license</PackageLicenseUrl>
<PackageProjectUrl>https://www.fast-report.com/en/product/fast-report-net</PackageProjectUrl>
<Authors>Fast Reports Inc.</Authors>
<Product>FastReport.Data.Excel</Product>
<PackageId>FastReport.OpenSource.Data.Excel</PackageId>
<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
<PackageTags>reporting, excel, connection, reports, core</PackageTags>
<Version>1.0.0</Version>
<Configurations>Debug;Release;</Configurations>
<AssemblyName>FastReport.Data.Excel</AssemblyName>
<RootNamespace>FastReport.Data</RootNamespace>
<Description>Represents a connection to Excel database for FastReport.OpenSource

This package will not be updated. The $(AssemblyName) package now includes a connector for all versions of the FastReport product: FastReport .NET, FastReport.Core, FastReport.OpenSource, FastReport.CoreWin (.Net Core 3.1 and .Net 5 Windows).
</Description>
<PackageReleaseNotes></PackageReleaseNotes>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DocumentFormat.OpenXml" Version="2.11.3" />
<PackageReference Include="SpreadsheetLight" Version="3.5.0" />
</ItemGroup>
<ItemGroup>
<Compile Remove="ExcelConnectionEditor.cs" />
<Compile Remove="*.Designer.cs" />
<Compile Remove="*.DesignExt.cs" />
<EmbeddedResource Remove="ExcelConnectionEditor.resx" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework)=='net461'">
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Design" />
<Reference Include="System.Drawing" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\FastReport.OpenSource\FastReport.OpenSource.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ protected override void Dispose(bool disposing)
}

/// <inheritdoc/>
protected override void ExportBand(Base band)
protected override void ExportBand(BandBase band)
{
base.ExportBand(band);
ExportObj(band);
Expand Down
12 changes: 12 additions & 0 deletions FastReport.Base/Barcode/Barcode2of5.cs
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,12 @@ public BarcodeDeutscheIdentcode()
WideBarRatio = 3F;
PrintCheckSum = true;
}

/// <inheritdoc />
public override string GetDefaultValue()
{
return "12345123456";
}
}

/// <summary>
Expand Down Expand Up @@ -240,6 +246,12 @@ public override void Assign(BarcodeBase source)
PrintCheckSum = src.PrintCheckSum;
}

/// <inheritdoc />
public override string GetDefaultValue()
{
return "1234512312312";
}

internal override string GetPattern()
{
string result = "5050"; //Startcode
Expand Down
9 changes: 9 additions & 0 deletions FastReport.Base/Barcode/BarcodeBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -99,5 +99,14 @@ public BarcodeBase()
text = "";
color = Color.Black;
}

/// <summary>
/// Get default value of this barcode
/// </summary>
/// <returns></returns>
public virtual string GetDefaultValue()
{
return "12345678";
}
}
}
6 changes: 6 additions & 0 deletions FastReport.Base/Barcode/BarcodeGS1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,12 @@ protected void DrawLineBars(string data, IGraphics g, float zoom, RectangleF rec
}
}
}

/// <inheritdoc />
public override string GetDefaultValue()
{
return "(01)0000123456789";
}
}

/// <summary>
Expand Down
Loading

0 comments on commit c978164

Please sign in to comment.