From c5bb71f6e3b2f745fe333b6057fefdee9d54e419 Mon Sep 17 00:00:00 2001 From: FastReports-bot Date: Mon, 28 Nov 2022 13:30:34 +0300 Subject: [PATCH] * sync 11/28/2022 version: 2023.1.0 --- .../OpenSourceCustomViewer.csproj | 2 +- .../WinFormsOpenSource.csproj | 2 +- Demos/Reports/About Microsoft Chart.frx | 34 ++-- Demos/Reports/AdvMatrix - Collapse + Sort.frx | 40 ++--- .../Reports/AdvMatrix - Items comparison.frx | 95 +++++------ Demos/Reports/AdvMatrix - Order details.frx | 76 ++++----- .../AdvMatrix - Sort Year by total.frx | 30 ++-- .../Reports/AdvMatrix - Sparkline, Gauge.frx | 42 ++--- Demos/Reports/AdvMatrix - Stepped layout.frx | 36 ++-- Demos/Reports/AdvMatrix - Two data cells.frx | 46 ++--- Demos/Reports/AdvMatrix - User function.frx | 34 ++-- Demos/Reports/Advanced Matrix.frx | 96 +++++------ Demos/Reports/Alternate Color Each Row.frx | 80 ++++----- Demos/Reports/Badges.frx | 157 ++++++++++++++++-- Demos/Reports/Barcode.frx | 86 +++++----- Demos/Reports/Box.frx | 76 +++++---- Demos/Reports/Business Objects.frx | 38 ++--- Demos/Reports/Cascaded Data Filtering.frx | 46 ++--- Demos/Reports/CellularText.frx | 38 ++--- Demos/Reports/Chart.frx | 18 +- Demos/Reports/CheckBox.frx | 44 ++--- Demos/Reports/Column Datasource, Wrapped.frx | 42 ++--- Demos/Reports/Column Datasource.frx | 42 ++--- Demos/Reports/Complete upto N Rows.frx | 28 ++-- .../Complex (Hyperlinks, Outline, TOC).frx | 65 ++++---- .../Complex (Master-detail + Group).frx | 64 ++++--- Demos/Reports/Complex Column Headers.frx | 38 ++--- .../Reports/Databand Columns, Row Numbers.frx | 29 ++-- Demos/Reports/Dialog Events.frx | 20 +-- Demos/Reports/Double Pass, Total Pages.frx | 40 ++--- Demos/Reports/Drill-Down Groups.frx | 34 ++-- Demos/Reports/Duplicate Values.frx | 24 +-- .../Reports/Filtering with CheckedListBox.frx | 46 ++--- Demos/Reports/Filtering with DataSelector.frx | 46 ++--- Demos/Reports/Filtering with Date Ranges.frx | 42 ++--- Demos/Reports/Filtering with Ranges.frx | 42 ++--- Demos/Reports/Fit Dynamic Table To Page.frx | 19 ++- Demos/Reports/Gauge.frx | 50 +++--- Demos/Reports/Groups.frx | 39 ++--- Demos/Reports/Guidelines.frx | 40 ++--- Demos/Reports/Handle Dialog Forms.frx | 16 +- Demos/Reports/Handle Page Breaks.frx | 44 ++--- Demos/Reports/Handle Preview Clicks.frx | 14 +- Demos/Reports/Hello, FastReport!.frx | 18 +- Demos/Reports/Hierarchic List.frx | 24 +-- .../Reports/Highlight Based on Row-Column.frx | 68 ++++---- Demos/Reports/Highlight.frx | 50 +++--- Demos/Reports/Hyperlinks, Bookmarks.frx | 60 +++---- Demos/Reports/Image.frx | 60 +++---- Demos/Reports/Inherited Report - base.frx | 14 +- Demos/Reports/Inherited Report.frx | 32 ++-- Demos/Reports/Interactive Chart.frx | 61 +++---- Demos/Reports/Interactive Forms.frx | 92 +++++----- .../Reports/Interactive Matrix - Details.frx | 56 ++++--- .../Reports/Interactive Matrix With Chart.frx | 90 +++++----- Demos/Reports/Interactive Matrix.frx | 44 ++--- .../Reports/Interactive Report - Details.frx | 35 ++-- Demos/Reports/Interactive Report, 2-in-1.frx | 47 +++--- Demos/Reports/Interactive Report.frx | 23 +-- Demos/Reports/Keep Together.frx | 42 ++--- Demos/Reports/Labels With Dialog.frx | 38 ++--- Demos/Reports/Labels.frx | 34 ++-- Demos/Reports/Lines and Shapes.frx | 22 +-- Demos/Reports/Mail Merge.frx | 20 +-- Demos/Reports/Master-Detail.frx | 44 ++--- Demos/Reports/Matrix With Columns Only.frx | 46 ++--- Demos/Reports/Matrix With Rows Only.frx | 36 ++-- Demos/Reports/Matrix.frx | 80 ++++----- Demos/Reports/Microsoft Chart Sample.frx | 52 +++--- Demos/Reports/Multiplication Table.frx | 24 +-- Demos/Reports/Objects Inside The Matrix.frx | 48 +++--- .../Odd-Even Pages, Mirror Margins.frx | 58 +++---- Demos/Reports/Odd-Even Rows.frx | 39 ++--- Demos/Reports/Outline.frx | 36 ++-- Demos/Reports/Pharmacode.frx | 116 ++++++++----- Demos/Reports/Pictures Inside The Matrix.frx | 36 ++-- Demos/Reports/Polygon.frx | 32 ++-- Demos/Reports/Print Copy Names.frx | 16 +- Demos/Reports/Print DataTable.frx | 19 ++- Demos/Reports/Print Entered Value.frx | 22 +-- Demos/Reports/Print Month Names.frx | 64 +++---- .../Print Total in The Group Header.frx | 32 ++-- Demos/Reports/Print on Previous Page.frx | 60 +++---- Demos/Reports/Purchase Order.frx | 104 ++++++------ Demos/Reports/QR-Codes.frx | 40 ++--- Demos/Reports/Repeat Headers.frx | 44 ++--- Demos/Reports/Report With Cover Page.frx | 45 ++--- Demos/Reports/RichText.frx | 18 +- Demos/Reports/Row Datasource, Detail Rows.frx | 70 +++++--- .../Reports/Row Datasource, Master-Detail.frx | 87 ++++++---- Demos/Reports/Row Datasource.frx | 78 ++++++--- Demos/Reports/SVG.frx | 32 ++-- Demos/Reports/Sales in Germany.frx | 18 +- Demos/Reports/Sales in the USA.frx | 88 +++++----- Demos/Reports/Series of Chart.frx | 38 ++--- Demos/Reports/Shift Object Position.frx | 20 +-- Demos/Reports/Side-by-Side Subreports.frx | 67 +++++--- Demos/Reports/Simple List.frx | 50 +++--- Demos/Reports/Simple Matrix.frx | 36 ++-- Demos/Reports/Sort Group By Total.frx | 30 ++-- Demos/Reports/Sparkline.frx | 18 +- .../Start New Page, Reset Page Numbers.frx | 52 +++--- Demos/Reports/Subreport.frx | 72 ++++---- Demos/Reports/Table.frx | 94 +++++------ Demos/Reports/Text.frx | 71 ++++---- Demos/Reports/TextureFill.frx | 42 ++--- Demos/Reports/The USA Map.frx | 20 +-- .../Two Cell Dimensions, Side-by-Side.frx | 74 ++++----- Demos/Reports/Two Cell Dimensions.frx | 56 +++---- Demos/Reports/Two Column Dimensions.frx | 64 +++---- Demos/Reports/Two Matrices.frx | 74 ++++----- Demos/Reports/Two Row Dimensions.frx | 46 ++--- Demos/Reports/Unicode.frx | 38 +++-- Demos/Reports/Using Expressions.frx | 48 +++--- Demos/Reports/Watermark.frx | 38 ++--- Demos/Reports/ZipCode.frx | 32 ++-- Demos/Reports/nwind.xml | 39 +++-- Extras/Core/FastReport.Data/Connections.props | 45 +++++ .../FastReport.Data/Directory.Build.props | 7 + .../Directory.Build.targets | 4 +- ...astReport.OpenSource.Data.Cassandra.csproj | 36 +--- .../FastReport.Data.Cassandra/Shared.props | 21 +++ ...stReport.OpenSource.Data.ClickHouse.csproj | 29 +--- .../FastReport.Data.ClickHouse/Shared.props | 21 +++ .../Directory.Build.targets | 11 -- ...astReport.OpenSource.Data.Couchbase.csproj | 69 +++----- .../FastReport.Data.Couchbase/Shared.props | 21 +++ .../Directory.Build.targets | 11 -- ...eport.OpenSource.Data.ElasticSearch.csproj | 32 +--- .../Shared.props | 17 ++ .../FastReport.Excel.sln | 25 --- .../FastReport.OpenSource.Data.Excel.csproj | 37 +---- .../FastReport.Data.Excel/Shared.props | 22 +++ .../FastReport.Data.Excel/packages.config | 6 - .../Directory.Build.targets | 11 -- ...FastReport.OpenSource.Data.Firebird.csproj | 65 ++------ .../FastReport.Data.Firebird/Shared.props | 21 +++ .../Directory.Build.targets | 11 -- .../FastReport.OpenSource.Data.Json.csproj | 58 ++----- .../JsonClassGenerator/JsonClassGenerator.cs | 2 +- .../FastReport.Data.Json/Shared.props | 21 +++ .../FastReport.OpenSource.Data.Linter.csproj | 33 +--- .../FastReport.Data.Linter/Shared.props | 17 ++ .../Community_FastReport.Data.MongoDB.csproj | 14 +- .../Directory.Build.targets | 11 -- .../FastReport.OpenSource.Data.MongoDB.csproj | 71 ++------ .../FastReport.Data.MongoDB/Shared.props | 23 +++ .../Directory.Build.targets | 11 -- .../FastReport.OpenSource.Data.MsSql.csproj | 33 +--- .../FastReport.Data.MsSql/Shared.props | 21 +++ .../Directory.Build.targets | 11 -- .../FastReport.OpenSource.Data.MySql.csproj | 49 +----- .../FastReport.Data.MySql/Shared.props | 21 +++ .../Directory.Build.targets | 11 -- ...eport.OpenSource.Data.OracleODPCore.csproj | 43 +---- .../Shared.props | 21 +++ .../Directory.Build.targets | 11 -- ...FastReport.OpenSource.Data.Postgres.csproj | 36 +--- .../FastReport.Data.Postgres/Shared.props | 21 +++ .../Directory.Build.targets | 11 -- .../FastReport.OpenSource.Data.RavenDB.csproj | 53 +----- .../FastReport.Data.RavenDB/Shared.props | 21 +++ .../Directory.Build.targets | 11 -- .../FastReport.OpenSource.Data.SQLite.csproj | 47 +----- .../FastReport.Data.SQLite/Shared.props | 21 +++ ...tReport.OpenSource.Export.PdfSimple.csproj | 2 +- FastReport.Base/AssemblyInitializer.cs | 2 + FastReport.Base/Data/CommandParameter.cs | 37 ++++- FastReport.Base/Data/DataComponentBase.cs | 2 +- FastReport.Base/Data/DataConnectionBase.cs | 137 ++++++++++++++- .../JsonConnection/JsonTableDataSource.cs | 14 +- FastReport.Base/Data/Parameter.cs | 2 + FastReport.Base/Data/ProcedureDataSource.cs | 63 +++++++ FastReport.Base/Data/ProcedureParameter.cs | 26 +++ FastReport.Base/Engine/ReportEngine.cs | 5 + .../Export/Html/HTMLExportLayers.cs | 7 +- FastReport.Base/Report.cs | 2 +- FastReport.Base/ReportComponentBase.cs | 7 + FastReport.Base/Table/TableResult.cs | 2 +- .../Json/Serialization/JsonAttributes.cs | 2 +- .../Data/DataConnectionBase.Core.cs | 1 + .../Data/ProcedureDataSource.Core.cs | 17 ++ .../FastReport.OpenSource.csproj | 10 +- FastReport/Resources/Ribbon/WebPreview.png | Bin 0 -> 7812 bytes FastReport/Resources/buttons-1-hi.png | Bin 129483 -> 129483 bytes FastReport/Resources/buttons-1.png | Bin 69239 -> 69239 bytes FastReport/Resources/buttons.png | Bin 60579 -> 68839 bytes FastReport/Resources/en.xml | 46 ++++- Localization/Russian.frl | 56 ++++++- Pack/BuildScripts/Tasks/Constants.cs | 4 + .../BuildScripts/Tasks/LocalizationPackage.cs | 2 +- 191 files changed, 3786 insertions(+), 3358 deletions(-) create mode 100644 Extras/Core/FastReport.Data/Connections.props create mode 100644 Extras/Core/FastReport.Data/Directory.Build.props rename Extras/Core/FastReport.Data/{FastReport.Data.ClickHouse => }/Directory.Build.targets (88%) create mode 100644 Extras/Core/FastReport.Data/FastReport.Data.Cassandra/Shared.props create mode 100644 Extras/Core/FastReport.Data/FastReport.Data.ClickHouse/Shared.props delete mode 100644 Extras/Core/FastReport.Data/FastReport.Data.Couchbase/Directory.Build.targets create mode 100644 Extras/Core/FastReport.Data/FastReport.Data.Couchbase/Shared.props delete mode 100644 Extras/Core/FastReport.Data/FastReport.Data.ElasticSearch/Directory.Build.targets create mode 100644 Extras/Core/FastReport.Data/FastReport.Data.ElasticSearch/Shared.props delete mode 100644 Extras/Core/FastReport.Data/FastReport.Data.Excel/FastReport.Excel.sln create mode 100644 Extras/Core/FastReport.Data/FastReport.Data.Excel/Shared.props delete mode 100644 Extras/Core/FastReport.Data/FastReport.Data.Excel/packages.config delete mode 100644 Extras/Core/FastReport.Data/FastReport.Data.Firebird/Directory.Build.targets create mode 100644 Extras/Core/FastReport.Data/FastReport.Data.Firebird/Shared.props delete mode 100644 Extras/Core/FastReport.Data/FastReport.Data.Json/Directory.Build.targets create mode 100644 Extras/Core/FastReport.Data/FastReport.Data.Json/Shared.props create mode 100644 Extras/Core/FastReport.Data/FastReport.Data.Linter/Shared.props delete mode 100644 Extras/Core/FastReport.Data/FastReport.Data.MongoDB/Directory.Build.targets create mode 100644 Extras/Core/FastReport.Data/FastReport.Data.MongoDB/Shared.props delete mode 100644 Extras/Core/FastReport.Data/FastReport.Data.MsSql/Directory.Build.targets create mode 100644 Extras/Core/FastReport.Data/FastReport.Data.MsSql/Shared.props delete mode 100644 Extras/Core/FastReport.Data/FastReport.Data.MySql/Directory.Build.targets create mode 100644 Extras/Core/FastReport.Data/FastReport.Data.MySql/Shared.props delete mode 100644 Extras/Core/FastReport.Data/FastReport.Data.OracleODPCore/Directory.Build.targets create mode 100644 Extras/Core/FastReport.Data/FastReport.Data.OracleODPCore/Shared.props delete mode 100644 Extras/Core/FastReport.Data/FastReport.Data.Postgres/Directory.Build.targets create mode 100644 Extras/Core/FastReport.Data/FastReport.Data.Postgres/Shared.props delete mode 100644 Extras/Core/FastReport.Data/FastReport.Data.RavenDB/Directory.Build.targets create mode 100644 Extras/Core/FastReport.Data/FastReport.Data.RavenDB/Shared.props delete mode 100644 Extras/Core/FastReport.Data/FastReport.Data.SQLite/Directory.Build.targets create mode 100644 Extras/Core/FastReport.Data/FastReport.Data.SQLite/Shared.props create mode 100644 FastReport.Base/Data/ProcedureDataSource.cs create mode 100644 FastReport.Base/Data/ProcedureParameter.cs create mode 100644 FastReport.OpenSource/Data/ProcedureDataSource.Core.cs create mode 100644 FastReport/Resources/Ribbon/WebPreview.png diff --git a/Demos/OpenSource/WPFOpenSourceViewer/OpenSourceCustomViewer/OpenSourceCustomViewer.csproj b/Demos/OpenSource/WPFOpenSourceViewer/OpenSourceCustomViewer/OpenSourceCustomViewer.csproj index 6f20366f..44176dcc 100644 --- a/Demos/OpenSource/WPFOpenSourceViewer/OpenSourceCustomViewer/OpenSourceCustomViewer.csproj +++ b/Demos/OpenSource/WPFOpenSourceViewer/OpenSourceCustomViewer/OpenSourceCustomViewer.csproj @@ -8,7 +8,7 @@ WinExe OpenSourceCustomViewer OpenSourceCustomViewer - v4.6.1 + v4.6.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Demos/OpenSource/WinFormsOpenSourceViewer/WinFormsOpenSource/WinFormsOpenSource.csproj b/Demos/OpenSource/WinFormsOpenSourceViewer/WinFormsOpenSource/WinFormsOpenSource.csproj index c3e85769..6a22a261 100644 --- a/Demos/OpenSource/WinFormsOpenSourceViewer/WinFormsOpenSource/WinFormsOpenSource.csproj +++ b/Demos/OpenSource/WinFormsOpenSourceViewer/WinFormsOpenSource/WinFormsOpenSource.csproj @@ -8,7 +8,7 @@ WinExe WinFormsOpenSource WinFormsOpenSource - v4.6.1 + v4.6.2 512 true true diff --git a/Demos/Reports/About Microsoft Chart.frx b/Demos/Reports/About Microsoft Chart.frx index 00f64ac1..79c8f783 100644 --- a/Demos/Reports/About Microsoft Chart.frx +++ b/Demos/Reports/About Microsoft Chart.frx @@ -1,24 +1,24 @@  - + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + diff --git a/Demos/Reports/AdvMatrix - Collapse + Sort.frx b/Demos/Reports/AdvMatrix - Collapse + Sort.frx index 8d1ef498..4404ae8e 100644 --- a/Demos/Reports/AdvMatrix - Collapse + Sort.frx +++ b/Demos/Reports/AdvMatrix - Collapse + Sort.frx @@ -1,5 +1,5 @@  - + @@ -11,10 +11,10 @@ - - + + - + @@ -32,47 +32,47 @@ - - - + + + - + - + - + - - + + - + - - + + - + - - + + - - + + diff --git a/Demos/Reports/AdvMatrix - Items comparison.frx b/Demos/Reports/AdvMatrix - Items comparison.frx index 9fd718aa..fa559810 100644 --- a/Demos/Reports/AdvMatrix - Items comparison.frx +++ b/Demos/Reports/AdvMatrix - Items comparison.frx @@ -1,5 +1,5 @@  - + @@ -11,10 +11,11 @@ - - + + + - + @@ -30,26 +31,26 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - + + @@ -65,26 +66,26 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - + + @@ -100,30 +101,30 @@ - - - - + + + + - - - - + + + + - - - - + + + + - + - - + + diff --git a/Demos/Reports/AdvMatrix - Order details.frx b/Demos/Reports/AdvMatrix - Order details.frx index 61504766..15bd839a 100644 --- a/Demos/Reports/AdvMatrix - Order details.frx +++ b/Demos/Reports/AdvMatrix - Order details.frx @@ -1,5 +1,5 @@  - +