Skip to content

Commit a769ba9

Browse files
KirillKornienkoKirillKornienko
authored
Merge pull request #178 from FastReports/sync_branch_637224687543402247
* sync 4/14/2020
2 parents 0d27cb1 + 54451b6 commit a769ba9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+828
-358
lines changed

‎Demos/OpenSource/SPAOnlineDesigner/ClientApp/package-lock.json‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Demos/Reports/Cascaded Data Filtering.frx‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Report ScriptLanguage="CSharp" ReportInfo.Description="Demonstrates how to implement the cascaded filter. When you select an employee, the orders list will be refreshed. To do this:&#13;&#10;- put two comboboxes on a form, EmployeesComboBox and OrdersComboBox;&#13;&#10;- connect EmployeesComboBox to Employees.FirstName data column via its DataColumn property;&#13;&#10;- connect OrdersComboBox to Orders.OrderID data column;&#13;&#10;- select EmployeesComboBox and set its DetailControl property to OrdersComboBox. &#13;&#10;That's all, you don't need to write any code!" ReportInfo.Created="03/19/2009 00:41:35" ReportInfo.Modified="01/22/2019 12:17:11" ReportInfo.CreatorVersion="2019.1.9.0">
2+
<Report ScriptLanguage="CSharp" ReportInfo.Description="Demonstrates how to implement the cascaded filter. When you select an employee, the orders list will be refreshed. To do this:&#13;&#10;- put two comboboxes on a form, EmployeesComboBox and OrdersComboBox;&#13;&#10;- connect EmployeesComboBox to Employees.FirstName data column via its DataColumn property;&#13;&#10;- connect OrdersComboBox to Orders.OrderID data column;&#13;&#10;- select EmployeesComboBox and set its DetailControl property to OrdersComboBox. &#13;&#10;That's all, you don't need to write any code!" ReportInfo.Created="03/19/2009 00:41:35" ReportInfo.Modified="02/25/2020 15:16:35" ReportInfo.CreatorVersion="2020.1.22.0">
33
<Dictionary>
44
<TableDataSource Name="Employees" ReferenceName="NorthWind.Employees" DataType="System.Int32" Enabled="true">
55
<Column Name="EmployeeID" DataType="System.Int32"/>
@@ -63,34 +63,35 @@
6363
<Relation Name="ProductsOrderDetails" ReferenceName="NorthWind.ProductsOrderDetails" ParentDataSource="Products" ChildDataSource="Order Details" ParentColumns="ProductID" ChildColumns="ProductID" Enabled="true"/>
6464
<Total Name="OrderTotal" Expression="[Order Details.UnitPrice] * [Order Details.Quantity]" Evaluator="Data3" PrintOn="ReportSummary1"/>
6565
</Dictionary>
66-
<ReportPage Name="Page1">
67-
<ReportTitleBand Name="ReportTitle1" Width="718.2" Height="28.35" CanGrow="true">
68-
<TextObject Name="Text12" 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"/>
66+
<ReportPage Name="Page1" Watermark.Font="Arial, 60pt">
67+
<ReportTitleBand Name="ReportTitle1" Width="718.2" Height="56.7" CanGrow="true">
68+
<TextObject Name="Text12" Width="718.2" Height="28.35" Anchor="Top, Left, Right" Fill.Color="WhiteSmoke" Cursor="Hand" Hyperlink.Value="http://fast.report/afd51" CanGrow="true" CanShrink="true" Text="Learn about various report objects on the Fast Reports Academy channel" Padding="4, 4, 4, 4" Font="Tahoma, 10pt, style=Bold, Underline" TextFill.Color="Blue"/>
69+
<TextObject Name="Text14" 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"/>
6970
</ReportTitleBand>
70-
<DataBand Name="Data1" Top="32.35" Width="718.2" Height="47.25" Fill.Color="Coral" DataSource="Employees">
71+
<DataBand Name="Data1" Top="60.7" Width="718.2" Height="47.25" Fill.Color="Coral" DataSource="Employees">
7172
<TextObject Name="Text1" Left="9.45" Width="538.65" Height="47.25" Text="[Employees.FirstName] [Employees.LastName]" VertAlign="Center" Font="Tahoma, 16pt, style=Bold" TextFill.Color="White"/>
72-
<DataBand Name="Data2" Top="83.6" Width="718.2" Height="37.8" Fill.Color="LightSalmon" DataSource="Orders">
73+
<DataBand Name="Data2" Top="111.95" Width="718.2" Height="37.8" Fill.Color="LightSalmon" DataSource="Orders">
7374
<TextObject Name="Text2" Left="9.45" Top="9.45" Width="132.3" Height="18.9" Text="Order ID: [Orders.OrderID]" Font="Tahoma, 10pt"/>
7475
<TextObject Name="Text3" Left="160.65" Top="9.45" Width="198.45" Height="18.9" Text="Date: [Orders.OrderDate]" Format="Date" Format.Format="d" Font="Tahoma, 10pt"/>
75-
<DataBand Name="Data3" Top="125.4" Width="718.2" Height="37.8" Fill.Color="MistyRose" DataSource="Order Details">
76+
<DataBand Name="Data3" Top="153.75" Width="718.2" Height="37.8" Fill.Color="MistyRose" DataSource="Order Details">
7677
<TextObject Name="Text4" Left="28.35" Top="9.45" Width="207.9" Height="18.9" Text="[Order Details.Products.ProductName]" Font="Tahoma, 8pt"/>
77-
<TextObject Name="Text5" Left="245.7" Top="9.45" Width="94.5" Height="18.9" Text="[Order Details.UnitPrice]" Format="Currency" Format.UseLocale="true" HorzAlign="Right" Font="Tahoma, 8pt"/>
78+
<TextObject Name="Text5" Left="245.7" Top="9.45" Width="94.5" Height="18.9" Text="[Order Details.UnitPrice]" Format="Currency" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Right" Font="Tahoma, 8pt"/>
7879
<TextObject Name="Text6" Left="359.1" Top="9.45" Width="37.8" Height="18.9" Text="[Order Details.Quantity]" Font="Tahoma, 8pt"/>
7980
<TextObject Name="Text7" Left="340.2" Top="9.45" Width="18.9" Height="18.9" Text="x" HorzAlign="Center" Font="Tahoma, 8pt"/>
80-
<TextObject Name="Text8" Left="415.8" Top="9.45" Width="75.6" Height="18.9" Text="[[Order Details.UnitPrice] * [Order Details.Quantity]]" Format="Currency" Format.UseLocale="true" HorzAlign="Right" Font="Tahoma, 8pt"/>
81-
<TextObject Name="Text9" Left="396.9" Top="9.45" Width="18.9" Height="18.9" Text="=" Format="Currency" Format.UseLocale="true" Font="Tahoma, 8pt"/>
81+
<TextObject Name="Text8" Left="415.8" Top="9.45" Width="75.6" Height="18.9" Text="[[Order Details.UnitPrice] * [Order Details.Quantity]]" Format="Currency" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Right" Font="Tahoma, 8pt"/>
82+
<TextObject Name="Text9" Left="396.9" Top="9.45" Width="18.9" Height="18.9" Text="=" Format="Currency" Format.UseLocale="true" Format.DecimalDigits="2" Font="Tahoma, 8pt"/>
8283
</DataBand>
8384
</DataBand>
8485
</DataBand>
85-
<ReportSummaryBand Name="ReportSummary1" Top="167.2" Width="718.2" Height="37.8" Fill.Color="LightSalmon">
86-
<TextObject Name="Text10" Left="415.8" Top="9.45" Width="75.6" Height="18.9" Text="[OrderTotal]" Format="Currency" Format.UseLocale="true" HorzAlign="Right" Font="Tahoma, 8pt"/>
87-
<TextObject Name="Text11" Left="311.85" Top="9.45" Width="85.05" Height="18.9" Text="Total:" Format="Currency" Format.UseLocale="true" HorzAlign="Right" Font="Tahoma, 8pt"/>
86+
<ReportSummaryBand Name="ReportSummary1" Top="195.55" Width="718.2" Height="37.8" Fill.Color="LightSalmon">
87+
<TextObject Name="Text10" Left="415.8" Top="9.45" Width="75.6" Height="18.9" Text="[OrderTotal]" Format="Currency" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Right" Font="Tahoma, 8pt"/>
88+
<TextObject Name="Text11" Left="311.85" Top="9.45" Width="85.05" Height="18.9" Text="Total:" Format="Currency" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Right" Font="Tahoma, 8pt"/>
8889
</ReportSummaryBand>
89-
<PageFooterBand Name="PageFooter1" Top="209" Width="718.2" Height="28.35" Fill.Color="WhiteSmoke">
90+
<PageFooterBand Name="PageFooter1" Top="237.35" Width="718.2" Height="28.35" Fill.Color="WhiteSmoke">
9091
<TextObject Name="Text13" 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"/>
9192
</PageFooterBand>
9293
</ReportPage>
93-
<DialogPage Name="Form1" Width="298" Height="174" AcceptButton="btnOk" CancelButton="btnCancel">
94+
<DialogPage Name="Form1" Width="298" Height="174" AcceptButton="btnOk" CancelButton="btnCancel" Font="Tahoma, 8pt">
9495
<ButtonControl Name="btnCancel" Left="205" Top="107" Anchor="Bottom, Right" Font="Tahoma, 8pt" TabIndex="0" Text="Cancel" DialogResult="Cancel"/>
9596
<ButtonControl Name="btnOk" Left="122" Top="107" Anchor="Bottom, Right" Font="Tahoma, 8pt" TabIndex="1" Text="OK" DialogResult="OK"/>
9697
<LabelControl Name="Label1" Left="12" Top="40" Width="57" Height="13" Font="Tahoma, 8pt" TabIndex="3" Text="Employee:"/>

‎Demos/Reports/CellularText.frx‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Report ScriptLanguage="CSharp" ReportInfo.Description="This report demonstrates the CellularTextObject features." ReportInfo.Created="06/03/2009 16:22:52" ReportInfo.Modified="09/13/2015 14:49:48" ReportInfo.CreatorVersion="1.0.0.0">
2+
<Report ScriptLanguage="CSharp" ReportInfo.Description="This report demonstrates the CellularTextObject features." ReportInfo.Created="06/03/2009 16:22:52" ReportInfo.Modified="02/25/2020 14:50:46" ReportInfo.CreatorVersion="2020.1.22.0">
33
<Dictionary/>
4-
<ReportPage Name="Page1">
5-
<ReportTitleBand Name="ReportTitle1" Width="718.2" Height="94.5" CanGrow="true">
6-
<TextObject Name="Text11" 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"/>
7-
<TextObject Name="Text1" Top="56.7" Width="718.2" Height="37.8" Text="CellularTextObject" HorzAlign="Center" VertAlign="Center" Font="Tahoma, 14pt, style=Bold"/>
4+
<ReportPage Name="Page1" Watermark.Font="Arial, 60pt">
5+
<ReportTitleBand Name="ReportTitle1" Width="718.2" Height="122.85" CanGrow="true">
6+
<TextObject Name="Text11" 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"/>
7+
<TextObject Name="Text1" Top="85.05" Width="718.2" Height="37.8" Text="CellularTextObject" HorzAlign="Center" VertAlign="Center" Font="Tahoma, 14pt, style=Bold"/>
8+
<TextObject Name="Text32" Width="718.2" Height="28.35" Anchor="Top, Left, Right" Fill.Color="WhiteSmoke" Cursor="Hand" Hyperlink.Value="http://fast.report/7fb2d" CanGrow="true" CanShrink="true" Text="Learn about various report objects on the Fast Reports Academy channel" Padding="4, 4, 4, 4" Font="Tahoma, 10pt, style=Bold, Underline" TextFill.Color="Blue"/>
89
</ReportTitleBand>
9-
<DataBand Name="Data1" Top="98.5" Width="718.2" Height="699.3">
10+
<DataBand Name="Data1" Top="126.85" Width="718.2" Height="699.3">
1011
<CellularTextObject Name="CellularText1" Left="103.95" Top="66.15" Width="453.6" Height="28.35" Text="Simple text" Font="Arial, 14pt"/>
1112
<CellularTextObject Name="CellularText2" Left="9.45" Top="340.2" Width="283.5" Height="85.05" Text="Text with WordWrap" Font="Arial, 14pt"/>
1213
<CellularTextObject Name="CellularText3" Left="378" Top="340.2" Width="283.5" Height="85.05" Text="Text without WordWrap" WordWrap="false" Font="Arial, 14pt"/>
@@ -20,7 +21,7 @@
2021
<CellularTextObject Name="CellularText8" Left="103.95" Top="141.75" Width="453.6" Height="28.35" Border.Color="OrangeRed" Border.Style="Dash" Border.Width="2" Text="Border style" Font="Arial, 14pt"/>
2122
<CellularTextObject Name="CellularText9" Left="103.95" Top="226.8" Width="453.6" Height="28.35" Border.Style="Dot" Text="Cell spacing" Font="Arial, 14pt" HorzSpacing="7.56"/>
2223
</DataBand>
23-
<PageFooterBand Name="PageFooter1" Top="801.8" Width="718.2" Height="28.35" Fill.Color="WhiteSmoke">
24+
<PageFooterBand Name="PageFooter1" Top="830.15" Width="718.2" Height="28.35" Fill.Color="WhiteSmoke">
2425
<TextObject Name="Text31" 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"/>
2526
</PageFooterBand>
2627
</ReportPage>

0 commit comments

Comments
 (0)