diff --git a/CPB/uMainForm.cpp b/CPB/uMainForm.cpp index 5c5ac7f..ecfbe4d 100644 --- a/CPB/uMainForm.cpp +++ b/CPB/uMainForm.cpp @@ -28,20 +28,15 @@ #pragma link "cxStyles" #pragma link "dxDateRanges" #pragma link "dxReport" -#pragma link "dxReport.Backend" -#pragma link "dxReport.ConnectionString.JSON" - -#if defined(_WIN64) - #pragma link "dxReport.ConnectionString.JSON.DB.O" -#else - #pragma link "dxReport.ConnectionString.JSON.DB.OBJ" -#endif #pragma link "dxScrollbarAnnotations" #pragma link "dxmdaset" #pragma link "cxContainer" #pragma link "cxLabel" +#pragma link "dxBackend" +#pragma link "dxBackend.ConnectionString.JSON" +#pragma link "dxBackend.ConnectionString.JSON.DataSet" #pragma resource "*.dfm" TMainForm *MainForm; //--------------------------------------------------------------------------- diff --git a/CPB/uMainForm.dfm b/CPB/uMainForm.dfm index 148f330..b1c38d1 100644 --- a/CPB/uMainForm.dfm +++ b/CPB/uMainForm.dfm @@ -36,13 +36,8 @@ object MainForm: TMainForm Height = 265 TabOrder = 2 object gvCategories: TcxGridDBTableView - Navigator.Buttons.CustomButtons = <> - ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataModule1.dsCategories DataController.KeyFieldNames = 'CategoryID' - DataController.Summary.DefaultGroupSummaryItems = <> - DataController.Summary.FooterSummaryItems = <> - DataController.Summary.SummaryGroups = <> object gvCategoriesCategoryID: TcxGridDBColumn DataBinding.FieldName = 'CategoryID' end @@ -54,15 +49,10 @@ object MainForm: TMainForm end end object gvProducts: TcxGridDBTableView - Navigator.Buttons.CustomButtons = <> - ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataModule1.dsProducts DataController.DetailKeyFieldNames = 'CategoryID' DataController.KeyFieldNames = 'ProductID' DataController.MasterKeyFieldNames = 'CategoryID' - DataController.Summary.DefaultGroupSummaryItems = <> - DataController.Summary.FooterSummaryItems = <> - DataController.Summary.SummaryGroups = <> object gvProductsProductID: TcxGridDBColumn DataBinding.FieldName = 'ProductID' end @@ -133,19 +123,20 @@ object MainForm: TMainForm TabOrder = 5 end object dxReport1: TdxReport + Parameters = <> Left = 48 Top = 88 end - object dxReportDataConnectionManager1: TdxReportDataConnectionManager + object dxBackendDataConnectionManager1: TdxBackendDataConnectionManager Left = 112 Top = 88 - object dxReportDataConnectionManager1dxReportDataSetJSONConnection1: TdxReportDataSetJSONConnection + object dxBackendDataConnectionManager1dxBackendDataSetJSONConnection1: TdxBackendDataSetJSONConnection DisplayName = 'DataSetConnection' - object itmProducts: TdxReportDataSetCollectionItem + object itmProducts: TdxBackendDataSetCollectionItem DataSet = DataModule1.mdProducts DataSetAlias = 'mdProducts' end - object itmCategories: TdxReportDataSetCollectionItem + object itmCategories: TdxBackendDataSetCollectionItem DataSet = DataModule1.mdCategories DataSetAlias = 'mdCategories' end diff --git a/CPB/uMainForm.h b/CPB/uMainForm.h index 36d0bbb..169766d 100644 --- a/CPB/uMainForm.h +++ b/CPB/uMainForm.h @@ -28,9 +28,6 @@ #include "cxNavigator.hpp" #include "cxStyles.hpp" #include "dxDateRanges.hpp" -#include "dxReport.Backend.hpp" -#include "dxReport.ConnectionString.JSON.DB.hpp" -#include "dxReport.ConnectionString.JSON.hpp" #include "dxReport.hpp" #include "dxScrollbarAnnotations.hpp" #include @@ -39,6 +36,9 @@ #include "uData.h" #include "cxContainer.hpp" #include "cxLabel.hpp" +#include "dxBackend.ConnectionString.JSON.DataSet.hpp" +#include "dxBackend.ConnectionString.JSON.hpp" +#include "dxBackend.hpp" //--------------------------------------------------------------------------- class TMainForm : public TForm { @@ -65,10 +65,10 @@ class TMainForm : public TForm TcxGridLevel *cxGrid1Level1; TcxGridLevel *cxGrid1Level2; TdxReport *dxReport1; - TdxReportDataConnectionManager *dxReportDataConnectionManager1; - TdxReportDataSetJSONConnection *dxReportDataConnectionManager1dxReportDataSetJSONConnection1; - TdxReportDataSetCollectionItem *itmProducts; - TdxReportDataSetCollectionItem *itmCategories; + TdxBackendDataConnectionManager *dxBackendDataConnectionManager1; + TdxBackendDataSetJSONConnection *dxBackendDataConnectionManager1dxBackendDataSetJSONConnection1; + TdxBackendDataSetCollectionItem *itmProducts; + TdxBackendDataSetCollectionItem *itmCategories; TcxButton *btnSetLanguageUS; TcxButton *btnSetLanguageDE; TcxLabel *lblSelectLanguage; diff --git a/Delphi/uMainForm.dfm b/Delphi/uMainForm.dfm index 56174b9..deb7ba9 100644 --- a/Delphi/uMainForm.dfm +++ b/Delphi/uMainForm.dfm @@ -36,13 +36,8 @@ object MainForm: TMainForm Height = 265 TabOrder = 2 object gvCategories: TcxGridDBTableView - Navigator.Buttons.CustomButtons = <> - ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataModule1.dsCategories DataController.KeyFieldNames = 'CategoryID' - DataController.Summary.DefaultGroupSummaryItems = <> - DataController.Summary.FooterSummaryItems = <> - DataController.Summary.SummaryGroups = <> object gvCategoriesCategoryID: TcxGridDBColumn DataBinding.FieldName = 'CategoryID' end @@ -54,15 +49,10 @@ object MainForm: TMainForm end end object gvProducts: TcxGridDBTableView - Navigator.Buttons.CustomButtons = <> - ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataModule1.dsProducts DataController.DetailKeyFieldNames = 'CategoryID' DataController.KeyFieldNames = 'ProductID' DataController.MasterKeyFieldNames = 'CategoryID' - DataController.Summary.DefaultGroupSummaryItems = <> - DataController.Summary.FooterSummaryItems = <> - DataController.Summary.SummaryGroups = <> object gvProductsProductID: TcxGridDBColumn DataBinding.FieldName = 'ProductID' end @@ -133,19 +123,20 @@ object MainForm: TMainForm TabOrder = 5 end object dxReport1: TdxReport + Parameters = <> Left = 48 Top = 128 end - object dxReportDataConnectionManager1: TdxReportDataConnectionManager + object dxBackendDataConnectionManager1: TdxBackendDataConnectionManager Left = 112 Top = 128 - object dxReportDataConnectionManager1dxReportDataSetJSONConnection1: TdxReportDataSetJSONConnection + object dxBackendDataConnectionManager1dxBackendDataSetJSONConnection1: TdxBackendDataSetJSONConnection DisplayName = 'DataSetConnection' - object itmProducts: TdxReportDataSetCollectionItem + object itmProducts: TdxBackendDataSetCollectionItem DataSet = DataModule1.mdProducts DataSetAlias = 'mdProducts' end - object itmCategories: TdxReportDataSetCollectionItem + object itmCategories: TdxBackendDataSetCollectionItem DataSet = DataModule1.mdCategories DataSetAlias = 'mdCategories' end diff --git a/Delphi/uMainForm.pas b/Delphi/uMainForm.pas index e35cff5..e54bbc8 100644 --- a/Delphi/uMainForm.pas +++ b/Delphi/uMainForm.pas @@ -6,23 +6,23 @@ interface Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, cxClasses, dxReport, cxGraphics, cxLookAndFeels, cxLookAndFeelPainters, Vcl.Menus, cxButtons, - dxReport.Backend, cxControls, cxStyles, cxCustomData, cxFilter, cxData, + dxBackend, cxControls, cxStyles, cxCustomData, cxFilter, cxData, cxDataStorage, cxEdit, cxNavigator, dxDateRanges, dxScrollbarAnnotations, Data.DB, cxDBData, cxGridLevel, cxGridCustomView, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGrid, FireDAC.Comp.DataSet, - FireDAC.Comp.Client, dxReport.ConnectionString.JSON.DB, - dxReport.ConnectionString.JSON, Vcl.StdCtrls, dxmdaset, uData, cxContainer, + FireDAC.Comp.Client, dxBackend.ConnectionString.JSON.DataSet, + dxBackend.ConnectionString.JSON, Vcl.StdCtrls, dxmdaset, uData, cxContainer, cxLabel; type TMainForm = class(TForm) dxReport1: TdxReport; - dxReportDataConnectionManager1: TdxReportDataConnectionManager; + dxBackendDataConnectionManager1: TdxBackendDataConnectionManager; btnShowDesigner: TcxButton; btnViewReport: TcxButton; - dxReportDataConnectionManager1dxReportDataSetJSONConnection1: TdxReportDataSetJSONConnection; - itmProducts: TdxReportDataSetCollectionItem; - itmCategories: TdxReportDataSetCollectionItem; + dxBackendDataConnectionManager1dxBackendDataSetJSONConnection1: TdxBackendDataSetJSONConnection; + itmProducts: TdxBackendDataSetCollectionItem; + itmCategories: TdxBackendDataSetCollectionItem; cxGrid1: TcxGrid; gvCategories: TcxGridDBTableView; gvCategoriesCategoryID: TcxGridDBColumn; diff --git a/README.md b/README.md index 46a0722..94ca9aa 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -![](https://img.shields.io/endpoint?url=https://codecentral.devexpress.com/api/v1/VersionRange/1048527919/25.1.4%2B) +![](https://img.shields.io/endpoint?url=https://codecentral.devexpress.com/api/v1/VersionRange/1048527919/25.2.3%2B) [![](https://img.shields.io/badge/Open_in_DevExpress_Support_Center-FF7200?style=flat-square&logo=DevExpress&logoColor=white)](https://supportcenter.devexpress.com/ticket/details/T1305951) [![](https://img.shields.io/badge/📖_How_to_use_DevExpress_Examples-e9f6fc?style=flat-square)](https://docs.devexpress.com/GeneralInformation/403183) [![](https://img.shields.io/badge/💬_Leave_Feedback-feecdd?style=flat-square)](#does-this-example-address-your-development-requirementsobjectives)