diff --git a/Delphi10/开发档案/Dp10RepoV1/public10/design/U_BaseList.pas b/Delphi10/开发档案/Dp10RepoV1/public10/design/U_BaseList.pas index 21e92a9..a531d0a 100644 --- a/Delphi10/开发档案/Dp10RepoV1/public10/design/U_BaseList.pas +++ b/Delphi10/开发档案/Dp10RepoV1/public10/design/U_BaseList.pas @@ -8,7 +8,7 @@ uses Data.Win.ADODB, cxGraphics, U_WindowFormdesign, cxEdit, Vcl.ExtCtrls, cxControls, cxProgressBar, cxLookAndFeels, cxLookAndFeelPainters, cxContainer, dxSkinsCore, dxSkinsDefaultPainters, dxSkinWXI, dxSkinSharpPlus, - System.JSON; + System.JSON, dxSkinMySkin_WXI, dxSkinOffice2013White; type TfrmBaseList = class(TForm) @@ -35,7 +35,7 @@ type fFormCaption:string; fFormRightButtons:string; fModuleId,fModuleSubId:string; - constructor Create(AOwner: TComponent; ACaption: string=''; Parameters1: string=''; Parameters2: string=''; Parameters3: string=''; Parameters4: string=''; Parameters5: string=''; Parameters10: string='';FormID:Integer=0); + constructor Create(AOwner: TComponent; ACaption: string=''; Parameters1: string=''; Parameters2: string=''; Parameters3: string=''; Parameters4: string=''; Parameters5: string=''; Parameters10: string='';FormID:Integer=0;formName:string=''); end; var @@ -47,7 +47,7 @@ uses U_RTFun, U_globalVar, U_dataLink,U_FormLayOutDesign; {$R *.dfm} -constructor TfrmBaseList.Create(AOwner: TComponent; ACaption: string=''; Parameters1: string=''; Parameters2: string=''; Parameters3: string=''; Parameters4: string=''; Parameters5: string=''; Parameters10: string='';FormID:Integer=0); +constructor TfrmBaseList.Create(AOwner: TComponent; ACaption: string=''; Parameters1: string=''; Parameters2: string=''; Parameters3: string=''; Parameters4: string=''; Parameters5: string=''; Parameters10: string='';FormID:Integer=0;formName:string=''); var jsonObject: TJSONObject; jsonValue: TJSONValue; @@ -80,8 +80,11 @@ begin finally jsonValue.Free; end; - end; + end; + // + if trim(formName)<>'' then + self.Name:=self.Name+trim(formName); fFormId:= FormID ;