From e29ce4d9df66842a55998a3a1cecf8be2d57a3cf Mon Sep 17 00:00:00 2001
From: sgwp <63001967@qq.com>
Date: Fri, 21 Feb 2025 15:29:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=AA=97=E5=8F=A3=E9=87=8D?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D=EF=BC=8C=E8=A7=A3=E5=86=B3=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E5=A4=9A=E7=94=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dp10RepoV1/public10/design/U_BaseList.pas         | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

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 ;