From 54451b636301daa94bbf72ae37409397db034854 Mon Sep 17 00:00:00 2001 From: Fast Reports Date: Tue, 14 Apr 2020 16:46:06 +0300 Subject: [PATCH] * sync 4/14/2020 --- .../ClientApp/package-lock.json | 12 +- Demos/Reports/Cascaded Data Filtering.frx | 31 ++--- Demos/Reports/CellularText.frx | 15 +-- .../Complex (Hyperlinks, Outline, TOC).frx | 19 +-- .../Complex (Master-detail + Group).frx | 20 ++-- Demos/Reports/Drill-Down Groups.frx | 27 +++-- .../Reports/Filtering with CheckedListBox.frx | 23 ++-- Demos/Reports/Filtering with DataSelector.frx | 23 ++-- Demos/Reports/Filtering with Date Ranges.frx | 23 ++-- Demos/Reports/Filtering with Ranges.frx | 23 ++-- Demos/Reports/Hello, FastReport!.frx | 15 +-- Demos/Reports/Hierarchic List.frx | 8 +- Demos/Reports/Hyperlinks, Bookmarks.frx | 25 ++-- Demos/Reports/Image.frx | 35 +++--- Demos/Reports/Inherited Report.frx | 20 ++-- .../Reports/Interactive Matrix With Chart.frx | 39 +++--- Demos/Reports/Interactive Matrix.frx | 15 +-- Demos/Reports/Interactive Report, 2-in-1.frx | 23 ++-- Demos/Reports/Interactive Report.frx | 19 +-- Demos/Reports/Lines and Shapes.frx | 15 +-- Demos/Reports/Mail Merge.frx | 10 +- Demos/Reports/Outline.frx | 21 ++-- Demos/Reports/Polygon.frx | 13 +- Demos/Reports/Print Entered Value.frx | 15 +-- Demos/Reports/Report With Cover Page.frx | 6 +- Demos/Reports/RichText.frx | 15 +-- Demos/Reports/SVG.frx | 13 +- Demos/Reports/Text.frx | 51 ++++---- Demos/Reports/Watermark.frx | 10 +- Demos/Reports/ZipCode.frx | 15 +-- FastReport.Base/Barcode/BarcodePDF417.cs | 38 +++--- FastReport.Base/Code/AssemblyDescriptor.cs | 113 +++++++++++++++++- FastReport.Base/ComponentBase.cs | 35 ++++++ FastReport.Base/Engine/ReportEngine.Bands.cs | 27 +++++ FastReport.Base/Engine/ReportEngine.Keep.cs | 4 +- FastReport.Base/Export/ExportBase.cs | 15 ++- .../Export/Html/HTMLExportLayers.cs | 11 +- FastReport.Base/PictureObjectBase.cs | 56 ++++++++- FastReport.Base/Preview/PreparedPage.cs | 9 +- FastReport.Base/Preview/SourcePages.cs | 26 +++- FastReport.Base/Report.cs | 2 +- FastReport.Base/ReportComponentBase.cs | 17 +++ FastReport.Base/ReportPage.cs | 15 +++ FastReport.Base/ShapeObject.cs | 21 +++- FastReport.Base/TextObject.cs | 4 +- FastReport.Base/Utils/Config.cs | 4 +- FastReport.Base/Utils/Converter.cs | 16 ++- FastReport.Base/Utils/ExportsOptions.cs | 71 +++++++++-- FastReport.Base/Utils/HtmlTextRenderer.cs | 13 +- FastReport.Base/Utils/Res.cs | 4 +- FastReport.Base/Utils/ResourceLoader.cs | 7 +- .../Application/WebReportDesigner.cs | 27 ++++- .../Controllers/DesignerController.cs | 31 ++++- .../FastReport.OpenSource.Web.csproj | 1 + .../FastReport.OpenSource.csproj | 8 +- FastReport.OpenSource/Utils/Config.Core.cs | 8 ++ FastReport/Resources/en.xml | 4 +- 57 files changed, 828 insertions(+), 358 deletions(-) diff --git a/Demos/OpenSource/SPAOnlineDesigner/ClientApp/package-lock.json b/Demos/OpenSource/SPAOnlineDesigner/ClientApp/package-lock.json index 7debaa54..a526349f 100644 --- a/Demos/OpenSource/SPAOnlineDesigner/ClientApp/package-lock.json +++ b/Demos/OpenSource/SPAOnlineDesigner/ClientApp/package-lock.json @@ -4377,9 +4377,9 @@ "dev": true }, "handlebars": { - "version": "4.5.3", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.3.tgz", - "integrity": "sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz", + "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==", "dev": true, "requires": { "neo-async": "^2.6.0", @@ -6546,9 +6546,9 @@ } }, "mixin-deep": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", - "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", + "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", "dev": true, "requires": { "for-in": "^1.0.2", diff --git a/Demos/Reports/Cascaded Data Filtering.frx b/Demos/Reports/Cascaded Data Filtering.frx index e998c090..bf365d61 100644 --- a/Demos/Reports/Cascaded Data Filtering.frx +++ b/Demos/Reports/Cascaded Data Filtering.frx @@ -1,5 +1,5 @@  - + @@ -63,34 +63,35 @@ - - - + + + + - + - + - + - + - - + + - - - + + + - + - + diff --git a/Demos/Reports/CellularText.frx b/Demos/Reports/CellularText.frx index bb515266..030d47b6 100644 --- a/Demos/Reports/CellularText.frx +++ b/Demos/Reports/CellularText.frx @@ -1,12 +1,13 @@  - + - - - - + + + + + - + @@ -20,7 +21,7 @@ - + diff --git a/Demos/Reports/Complex (Hyperlinks, Outline, TOC).frx b/Demos/Reports/Complex (Hyperlinks, Outline, TOC).frx index 27da01b3..054af04f 100644 --- a/Demos/Reports/Complex (Hyperlinks, Outline, TOC).frx +++ b/Demos/Reports/Complex (Hyperlinks, Outline, TOC).frx @@ -1,7 +1,7 @@  - + -