From 2e4d94727cf484b3e7305fd1f037677f1b77d35f Mon Sep 17 00:00:00 2001
From: sgwp <63001967@qq.com>
Date: Wed, 30 Oct 2024 13:45:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public10/design/U_BaseHelp.pas          |  15 +++
 public10/design/U_BaseInput.pas         |  17 ++-
 public10/design/U_BaseList.pas          |  22 ++-
 public10/design/U_BaseOneTableInput.pas |  15 +++
 public10/design/U_DetailBaseList.pas    |  15 +++
 public10/design/U_FormLayOutDesign.pas  |  24 ++++
 public10/design/U_MainBaseList.dfm      |  82 ------------
 public10/design/U_MainBaseList.pas      |  26 ++--
 public10/design/U_PageBaseList.dfm      | 157 +++++++++++++++++-----
 public10/design/U_PageBaseList.pas      |  46 +++++--
 public10/design/U_QryBaseList.dfm       | 170 +++++++++++++++++++++++-
 public10/design/U_QryBaseList.pas       |  36 +++++
 public10/design/U_QryPivotBaseList.dfm  |   2 +-
 public10/design/U_QryPivotBaseList.pas  |  20 ++-
 public10/design/U_WindowFormdesign.pas  |  36 ++---
 public10/design/U_globalVar.pas         |   1 +
 16 files changed, 523 insertions(+), 161 deletions(-)

diff --git a/public10/design/U_BaseHelp.pas b/public10/design/U_BaseHelp.pas
index f62b4e2..dc15e16 100644
--- a/public10/design/U_BaseHelp.pas
+++ b/public10/design/U_BaseHelp.pas
@@ -30,7 +30,22 @@ uses
 {$R *.dfm}
 
 procedure TfrmBaseHelp.FormCreate(Sender: TObject);
+var
+  mFontSize:integer;
 begin
+   getSystemIni();
+    if gFontSize<9 then
+    begin
+      mFontSize := 12;
+    end
+    else
+    begin
+      mFontSize:=gFontSize ;
+    end;
+
+  self.Font.Size := gFontSize;
+  if trim(gFontName)<>'' then
+    self.Font.Name:=gFontName;
    fWindowDesign:=TWindowFormDeSign.Create();
 end;
 
diff --git a/public10/design/U_BaseInput.pas b/public10/design/U_BaseInput.pas
index 8923611..8bc5194 100644
--- a/public10/design/U_BaseInput.pas
+++ b/public10/design/U_BaseInput.pas
@@ -29,11 +29,26 @@ var
 
 implementation
 uses
-  U_RTFun ,U_globalVar,U_dataLink;
+  U_RTFun ,U_globalVar,U_dataLink,U_FormLayOutDesign;
 {$R *.dfm}
 
 procedure TfrmBaseInput.FormCreate(Sender: TObject);
+var
+  mFontSize:integer;
 begin
+   getSystemIni();
+    if gFontSize<9 then
+    begin
+      mFontSize := 12;
+    end
+    else
+    begin
+      mFontSize:=gFontSize ;
+    end;
+
+  self.Font.Size := gFontSize;
+  if trim(gFontName)<>'' then
+    self.Font.Name:=gFontName;
   fWindowDesign:=TWindowFormDeSign.Create();
 end;
 
diff --git a/public10/design/U_BaseList.pas b/public10/design/U_BaseList.pas
index 87b24c1..c4086f7 100644
--- a/public10/design/U_BaseList.pas
+++ b/public10/design/U_BaseList.pas
@@ -10,7 +10,7 @@ uses
   cxStyles, cxCustomData, cxFilter, cxData, cxDataStorage, cxEdit, cxNavigator,
   dxDateRanges, dxScrollbarAnnotations, cxDBData, cxGridLevel, cxClasses,
   cxGridCustomView, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
-  cxGrid, cxContainer, cxProgressBar, dxSkinBasic;
+  cxGrid, cxContainer, cxProgressBar;
 
 type
   TfrmBaseList = class(TForm)
@@ -42,7 +42,7 @@ var
 implementation
 
 uses
-  U_RTFun, U_globalVar, U_dataLink;
+  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);
@@ -70,8 +70,23 @@ begin
 end;
 
 procedure TfrmBaseList.FormCreate(Sender: TObject);
+var
+  mFontSize:integer;
 begin
+   getSystemIni();
+    if gFontSize<9 then
+    begin
+      mFontSize := 12;
+    end
+    else
+    begin
+      mFontSize:=gFontSize ;
+    end;
 
+  self.Font.Size := gFontSize;
+  if trim(gFontName)<>'' then
+    self.Font.Name:=gFontName;
+  // 窗口背景色
   fWindowDesign := TWindowFormdesign.Create();
 
 end;
@@ -90,6 +105,9 @@ begin
     else
       fWindowDesign.FormStyleInit(self, fFormId, ADOQueryBaseTemp, ADOQueryBaseCmd, '', fParameters10);
   end;
+
+ // TFormInitThread.Create(fWindowDesign,self, fFormId, ADOQueryBaseTemp, ADOQueryBaseCmd,trim(gStructVer));
+   // SendMessage(self.Handle, WM_SETREDRAW, 1, 0);
 end;
 
 
diff --git a/public10/design/U_BaseOneTableInput.pas b/public10/design/U_BaseOneTableInput.pas
index 6654d47..c00752f 100644
--- a/public10/design/U_BaseOneTableInput.pas
+++ b/public10/design/U_BaseOneTableInput.pas
@@ -71,7 +71,22 @@ begin
 end;
 
 procedure TfrmBaseOneTableInput.FormCreate(Sender: TObject);
+var
+  mFontSize:integer;
 begin
+   getSystemIni();
+    if gFontSize<9 then
+    begin
+      mFontSize := 12;
+    end
+    else
+    begin
+      mFontSize:=gFontSize ;
+    end;
+
+  self.Font.Size := gFontSize;
+  if trim(gFontName)<>'' then
+    self.Font.Name:=gFontName;
   fWindowDesign:=TWindowFormDeSign.Create();
 end;
 
diff --git a/public10/design/U_DetailBaseList.pas b/public10/design/U_DetailBaseList.pas
index dacfc3d..6566270 100644
--- a/public10/design/U_DetailBaseList.pas
+++ b/public10/design/U_DetailBaseList.pas
@@ -330,7 +330,22 @@ begin
 end;
 
 procedure TfrmDetailBaseList.FormCreate(Sender: TObject);
+var
+  mFontSize:integer;
 begin
+   getSystemIni();
+    if gFontSize<9 then
+    begin
+      mFontSize := 12;
+    end
+    else
+    begin
+      mFontSize:=gFontSize ;
+    end;
+
+  self.Font.Size := gFontSize;
+  if trim(gFontName)<>'' then
+    self.Font.Name:=gFontName;
   cxgrid1.Align:=alClient;
   CurrentPage := 1;
   RecordsNumber := 500;
diff --git a/public10/design/U_FormLayOutDesign.pas b/public10/design/U_FormLayOutDesign.pas
index 288217c..aeaa2ff 100644
--- a/public10/design/U_FormLayOutDesign.pas
+++ b/public10/design/U_FormLayOutDesign.pas
@@ -31,6 +31,7 @@ procedure addQryCondition( AdoTmp:Tadoquery;formId:Integer;gridName:string;FlowP
 procedure addQryContionByLay(AdoTmp:Tadoquery;formId:Integer;gridName:string;layOut:TdxLayoutControl;rowCount:integer=4);
 procedure initWinData(AdoTmp:TadoQuery;obj:TwinControl;sqlStr:string);
 function GetProcedureParam(layoutControl: TdxLayoutControl; EquTag: Integer=0): string;
+procedure getSystemIni();
 implementation
 uses
   U_globalVar;
@@ -551,4 +552,27 @@ begin
     Result := Trim(RightStr(Result, Length(Result) - 1));
 end;
 
+/////////////////////////////////////////////////////////
+//
+procedure getSystemIni();
+var
+  programIni: Tinifile;  //配置文件名
+  FileName: string;
+begin
+  FileName := ExtractFilePath(Paramstr(0)) + 'SYSTEMSET.INI';
+  if not FileExists(FileName) then
+    exit;
+
+  try
+    programIni := Tinifile.create(FileName);
+    gIsUseSkin := programIni.ReadBool('窗口设置', 'skin',true);
+    gIsCanDesign := programIni.ReadBool('窗口设置', 'design',false);
+    gGridNativeSet := programIni.ReadBool('窗口设置', 'grid',true);
+    gfontSize := programIni.ReadInteger('窗口设置', '字体大小', 12);
+    gfontName := programIni.ReadString('窗口设置', '字体名称', '');
+  finally
+    programIni.Free;
+  end;
+end;
+
 end.
diff --git a/public10/design/U_MainBaseList.dfm b/public10/design/U_MainBaseList.dfm
index b677a21..df0fd3a 100644
--- a/public10/design/U_MainBaseList.dfm
+++ b/public10/design/U_MainBaseList.dfm
@@ -170,88 +170,6 @@ object frmMainBaseList: TfrmMainBaseList
         HeaderAlignmentHorz = taCenter
         Width = 57
       end
-      object tv1OrderNo: TcxGridDBColumn
-        Caption = #35746#21333#21495
-        DataBinding.FieldName = 'OrderNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 102
-      end
-      object tv1custName: TcxGridDBColumn
-        Caption = #23458#25143#21517#31216
-        DataBinding.FieldName = 'custName'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 106
-      end
-      object tv1ConNo: TcxGridDBColumn
-        Caption = #21512#21516#21495
-        DataBinding.FieldName = 'ConNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 95
-      end
-      object tv1C_Name: TcxGridDBColumn
-        Caption = #21697#21517#20013#25991
-        DataBinding.FieldName = 'C_Name'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 86
-      end
-      object tv1C_Color: TcxGridDBColumn
-        Caption = #39068#33394
-        DataBinding.FieldName = 'C_Color'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 92
-      end
-      object tv1C_EColor: TcxGridDBColumn
-        Caption = #39068#33394'('#33521#25991')'
-        DataBinding.FieldName = 'C_EColor'
-        DataBinding.IsNullValueType = True
-        Options.Editing = False
-        Width = 95
-      end
-      object tv1C_ColorNo: TcxGridDBColumn
-        Caption = #33394#21495
-        DataBinding.FieldName = 'C_ColorNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 76
-      end
-      object tv1C_Pattern: TcxGridDBColumn
-        Caption = #33457#22411#33457#21495
-        DataBinding.FieldName = 'C_Pattern'
-        DataBinding.IsNullValueType = True
-        Options.Editing = False
-      end
-      object tv1C_StyleNo: TcxGridDBColumn
-        Caption = #27454#21495
-        DataBinding.FieldName = 'C_StyleNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-      end
-      object tv1C_Width: TcxGridDBColumn
-        Caption = #38376#24133'(cm)'
-        DataBinding.FieldName = 'C_Width'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-      end
-      object tv1C_GramWeight: TcxGridDBColumn
-        Caption = #20811#37325'(g/'#13217')'
-        DataBinding.FieldName = 'C_GramWeight'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-      end
     end
     object cxGrid1Level1: TcxGridLevel
       GridView = tv1
diff --git a/public10/design/U_MainBaseList.pas b/public10/design/U_MainBaseList.pas
index 637b733..95e79ba 100644
--- a/public10/design/U_MainBaseList.pas
+++ b/public10/design/U_MainBaseList.pas
@@ -26,23 +26,12 @@ type
     Tclose: TToolButton;
     cxGrid1: TcxGrid;
     tv1: TcxGridDBTableView;
-    tv1custName: TcxGridDBColumn;
-    tv1OrderNo: TcxGridDBColumn;
-    tv1ConNo: TcxGridDBColumn;
     cxGrid1Level1: TcxGridLevel;
     DataSource1: TDataSource;
     ADOQueryList: TADOQuery;
     cxGridPopupMenu1: TcxGridPopupMenu;
     ADOQueryBaseCmd: TADOQuery;
     ADOQueryBaseTemp: TADOQuery;
-    tv1C_Name: TcxGridDBColumn;
-    tv1C_Color: TcxGridDBColumn;
-    tv1C_ColorNo: TcxGridDBColumn;
-    tv1C_EColor: TcxGridDBColumn;
-    tv1C_Pattern: TcxGridDBColumn;
-    tv1C_StyleNo: TcxGridDBColumn;
-    tv1C_Width: TcxGridDBColumn;
-    tv1C_GramWeight: TcxGridDBColumn;
     tv1SSel: TcxGridDBColumn;
     dxLayoutControl_query: TdxLayoutControl;
     custName: TcxTextEdit;
@@ -331,7 +320,22 @@ begin
 end;
 
 procedure TfrmMainBaseList.FormCreate(Sender: TObject);
+var
+  mFontSize:integer;
 begin
+   getSystemIni();
+    if gFontSize<9 then
+    begin
+      mFontSize := 12;
+    end
+    else
+    begin
+      mFontSize:=gFontSize ;
+    end;
+
+  self.Font.Size := gFontSize;
+  if trim(gFontName)<>'' then
+    self.Font.Name:=gFontName;
   cxgrid1.Align:=alClient;
   CurrentPage := 1;
   RecordsNumber := 500;
diff --git a/public10/design/U_PageBaseList.dfm b/public10/design/U_PageBaseList.dfm
index edae29a..f40732c 100644
--- a/public10/design/U_PageBaseList.dfm
+++ b/public10/design/U_PageBaseList.dfm
@@ -50,7 +50,7 @@ object frmPageBaseList: TfrmPageBaseList
       ImageIndex = 9
       Visible = False
     end
-    object ToolButton2: TToolButton
+    object Tooledit: TToolButton
       Left = 142
       Top = 0
       AutoSize = True
@@ -58,7 +58,7 @@ object frmPageBaseList: TfrmPageBaseList
       ImageIndex = 3
       Visible = False
     end
-    object ToolButton3: TToolButton
+    object ToolDel: TToolButton
       Left = 213
       Top = 0
       AutoSize = True
@@ -66,51 +66,149 @@ object frmPageBaseList: TfrmPageBaseList
       ImageIndex = 5
       Visible = False
     end
-    object Tzdy1: TToolButton
+    object Toolzdy1: TToolButton
       Left = 284
       Top = 0
       AutoSize = True
-      Caption = #33258#23450#20041'1'
+      Caption = '1'
       Visible = False
     end
-    object Tzdy2: TToolButton
-      Left = 352
+    object Toolzdy2: TToolButton
+      Left = 304
       Top = 0
       AutoSize = True
-      Caption = #33258#23450#20041'2'
+      Caption = '2'
       Visible = False
     end
-    object Tzdy3: TToolButton
-      Left = 420
+    object Toolzdy3: TToolButton
+      Left = 324
       Top = 0
       AutoSize = True
-      Caption = #33258#23450#20041'3'
+      Caption = '3'
       Visible = False
     end
-    object Tzdy4: TToolButton
-      Left = 488
+    object Toolzdy4: TToolButton
+      Left = 344
       Top = 0
       AutoSize = True
-      Caption = #33258#23450#20041'4'
+      Caption = '4'
       Visible = False
     end
-    object Tzdy5: TToolButton
-      Left = 556
+    object Toolzdy5: TToolButton
+      Left = 364
       Top = 0
       AutoSize = True
-      Caption = #33258#23450#20041'5'
+      Caption = '5'
+      Visible = False
+    end
+    object Toolzdy6: TToolButton
+      Left = 384
+      Top = 0
+      AutoSize = True
+      Caption = '6'
       Wrap = True
       Visible = False
     end
-    object Tzdy6: TToolButton
+    object Toolzdy7: TToolButton
       Left = 0
       Top = 30
       AutoSize = True
-      Caption = #33258#23450#20041'6'
-      ImageIndex = 8
+      Caption = '7'
+      Visible = False
+    end
+    object Toolzdy8: TToolButton
+      Left = 20
+      Top = 30
+      AutoSize = True
+      Caption = '8'
+      Visible = False
+    end
+    object Toolzdy9: TToolButton
+      Left = 40
+      Top = 30
+      AutoSize = True
+      Caption = '9'
+      Visible = False
+    end
+    object Toolzdy10: TToolButton
+      Left = 60
+      Top = 30
+      AutoSize = True
+      Caption = '10'
+      Visible = False
+    end
+    object Toolzdy11: TToolButton
+      Left = 89
+      Top = 30
+      AutoSize = True
+      Caption = '11'
+      Visible = False
+    end
+    object Toolzdy12: TToolButton
+      Left = 118
+      Top = 30
+      AutoSize = True
+      Caption = '12'
+      Visible = False
+    end
+    object Toolzdy13: TToolButton
+      Left = 147
+      Top = 30
+      AutoSize = True
+      Caption = '13'
+      Visible = False
+    end
+    object Toolzdy14: TToolButton
+      Left = 176
+      Top = 30
+      AutoSize = True
+      Caption = '14'
+      Visible = False
+    end
+    object Toolzdy15: TToolButton
+      Left = 205
+      Top = 30
+      AutoSize = True
+      Caption = '15'
+      Visible = False
+    end
+    object Toolzdy16: TToolButton
+      Left = 234
+      Top = 30
+      AutoSize = True
+      Caption = '16'
+      Visible = False
+    end
+    object Toolzdy17: TToolButton
+      Left = 263
+      Top = 30
+      AutoSize = True
+      Caption = '17'
+      Visible = False
+    end
+    object Toolzdy18: TToolButton
+      Left = 292
+      Top = 30
+      AutoSize = True
+      Caption = '18'
+      Visible = False
+    end
+    object Toolzdy19: TToolButton
+      Left = 321
+      Top = 30
+      AutoSize = True
+      Caption = '19'
+      Visible = False
+    end
+    object Toolzdy20: TToolButton
+      Left = 350
+      Top = 30
+      AutoSize = True
+      Caption = '20'
+      Visible = False
     end
     object Tprint: TToolButton
-      Left = 96
+      Left = 379
       Top = 30
       AutoSize = True
       Caption = #23548#20986'Excel'
@@ -118,7 +216,7 @@ object frmPageBaseList: TfrmPageBaseList
       OnClick = TprintClick
     end
     object TprintGrid: TToolButton
-      Left = 205
+      Left = 488
       Top = 30
       AutoSize = True
       Caption = #25171#21360
@@ -126,7 +224,7 @@ object frmPageBaseList: TfrmPageBaseList
       OnClick = TprintGridClick
     end
     object TsaveGrid: TToolButton
-      Left = 276
+      Left = 559
       Top = 30
       AutoSize = True
       Caption = #20445#23384#26684#24335
@@ -134,7 +232,7 @@ object frmPageBaseList: TfrmPageBaseList
       OnClick = TsaveGridClick
     end
     object TgridSet: TToolButton
-      Left = 379
+      Left = 662
       Top = 30
       AutoSize = True
       Caption = #34920#26684#21015#35774#32622
@@ -143,7 +241,7 @@ object frmPageBaseList: TfrmPageBaseList
       OnClick = TgridSetClick
     end
     object Tclose: TToolButton
-      Left = 498
+      Left = 781
       Top = 30
       AutoSize = True
       Caption = #20851#38381
@@ -161,7 +259,6 @@ object frmPageBaseList: TfrmPageBaseList
     BevelInner = bvRaised
     BevelOuter = bvLowered
     TabOrder = 1
-    ExplicitTop = 150
     DesignSize = (
       1112
       37)
@@ -373,10 +470,6 @@ object frmPageBaseList: TfrmPageBaseList
         Height = 258
         Align = alClient
         TabOrder = 1
-        ExplicitLeft = -547
-        ExplicitTop = 77
-        ExplicitWidth = 1112
-        ExplicitHeight = 238
         object tv1: TcxGridDBTableView
           Navigator.Buttons.CustomButtons = <>
           ScrollbarAnnotations.CustomAnnotations = <>
@@ -434,10 +527,6 @@ object frmPageBaseList: TfrmPageBaseList
         Height = 258
         Align = alClient
         TabOrder = 1
-        ExplicitLeft = -547
-        ExplicitTop = 77
-        ExplicitWidth = 1112
-        ExplicitHeight = 238
         object tv2: TcxGridDBTableView
           Navigator.Buttons.CustomButtons = <>
           ScrollbarAnnotations.CustomAnnotations = <>
@@ -491,7 +580,7 @@ object frmPageBaseList: TfrmPageBaseList
   object cxGridPopupMenu1: TcxGridPopupMenu
     PopupMenus = <>
     Left = 992
-    Top = 39
+    Top = 111
   end
   object ADOQueryBaseCmd: TADOQuery
     Parameters = <>
diff --git a/public10/design/U_PageBaseList.pas b/public10/design/U_PageBaseList.pas
index 7e11737..019aac2 100644
--- a/public10/design/U_PageBaseList.pas
+++ b/public10/design/U_PageBaseList.pas
@@ -39,13 +39,13 @@ type
     frmFrameDateSel1: TfrmFrameDateSel10;
     TgridSet: TToolButton;
     Tadd: TToolButton;
-    ToolButton2: TToolButton;
-    ToolButton3: TToolButton;
-    Tzdy4: TToolButton;
-    Tzdy5: TToolButton;
-    Tzdy1: TToolButton;
-    Tzdy2: TToolButton;
-    Tzdy3: TToolButton;
+    Tooledit: TToolButton;
+    ToolDel: TToolButton;
+    Toolzdy4: TToolButton;
+    Toolzdy5: TToolButton;
+    Toolzdy1: TToolButton;
+    Toolzdy2: TToolButton;
+    Toolzdy3: TToolButton;
     cxPageControl1: TcxPageControl;
     cxTabSheet1: TcxTabSheet;
     cxTabSheet2: TcxTabSheet;
@@ -63,7 +63,21 @@ type
     ADOQueryList2: TADOQuery;
     CDS_List2: TClientDataSet;
     cxProgressBar1: TMovePanel;
-    Tzdy6: TToolButton;
+    Toolzdy6: TToolButton;
+    Toolzdy7: TToolButton;
+    Toolzdy8: TToolButton;
+    Toolzdy9: TToolButton;
+    Toolzdy10: TToolButton;
+    Toolzdy11: TToolButton;
+    Toolzdy12: TToolButton;
+    Toolzdy13: TToolButton;
+    Toolzdy14: TToolButton;
+    Toolzdy15: TToolButton;
+    Toolzdy16: TToolButton;
+    Toolzdy17: TToolButton;
+    Toolzdy18: TToolButton;
+    Toolzdy19: TToolButton;
+    Toolzdy20: TToolButton;
     procedure TrefreshClick(Sender: TObject);
     procedure TprintClick(Sender: TObject);
     procedure TprintGridClick(Sender: TObject);
@@ -464,7 +478,23 @@ begin
 end;
 
 procedure TfrmPageBaseList.FormCreate(Sender: TObject);
+var
+  mFontSize:integer;
 begin
+   getSystemIni();
+    if gFontSize<9 then
+    begin
+      mFontSize := 12;
+    end
+    else
+    begin
+      mFontSize:=gFontSize ;
+    end;
+
+  self.Font.Size := gFontSize;
+  if trim(gFontName)<>'' then
+    self.Font.Name:=gFontName;
+
   cxPageControl1.Align:=alClient;
   CurrentPage := 1;
   RecordsNumber := 500;
diff --git a/public10/design/U_QryBaseList.dfm b/public10/design/U_QryBaseList.dfm
index e79c0b0..72a747b 100644
--- a/public10/design/U_QryBaseList.dfm
+++ b/public10/design/U_QryBaseList.dfm
@@ -40,16 +40,176 @@ object frmQryBaseList: TfrmQryBaseList
       ImageIndex = 1
       OnClick = TrefreshClick
     end
-    object Tprint: TToolButton
+    object toolzdy1: TToolButton
       Left = 48
       Top = 0
       AutoSize = True
+      Caption = '1'
+      ImageIndex = 8
+      Visible = False
+    end
+    object toolzdy2: TToolButton
+      Left = 73
+      Top = 0
+      AutoSize = True
+      Caption = '2'
+      ImageIndex = 8
+      Visible = False
+    end
+    object toolzdy3: TToolButton
+      Left = 98
+      Top = 0
+      AutoSize = True
+      Caption = '3'
+      ImageIndex = 8
+      Visible = False
+    end
+    object toolzdy4: TToolButton
+      Left = 123
+      Top = 0
+      AutoSize = True
+      Caption = '4'
+      ImageIndex = 8
+      Visible = False
+    end
+    object toolzdy5: TToolButton
+      Left = 148
+      Top = 0
+      AutoSize = True
+      Caption = '5'
+      ImageIndex = 8
+      Visible = False
+    end
+    object toolzdy6: TToolButton
+      Left = 173
+      Top = 0
+      AutoSize = True
+      Caption = '6'
+      ImageIndex = 8
+      Visible = False
+    end
+    object toolzdy7: TToolButton
+      Left = 198
+      Top = 0
+      AutoSize = True
+      Caption = '7'
+      ImageIndex = 8
+      Visible = False
+    end
+    object toolzdy8: TToolButton
+      Left = 223
+      Top = 0
+      AutoSize = True
+      Caption = '8'
+      ImageIndex = 8
+      Visible = False
+    end
+    object toolzdy9: TToolButton
+      Left = 248
+      Top = 0
+      AutoSize = True
+      Caption = '9'
+      ImageIndex = 9
+      Visible = False
+    end
+    object toolzdy10: TToolButton
+      Left = 273
+      Top = 0
+      AutoSize = True
+      Caption = '10'
+      ImageIndex = 10
+      Visible = False
+    end
+    object toolzdy11: TToolButton
+      Left = 307
+      Top = 0
+      AutoSize = True
+      Caption = '11'
+      ImageIndex = 8
+      Visible = False
+    end
+    object toolzdy12: TToolButton
+      Left = 341
+      Top = 0
+      AutoSize = True
+      Caption = '12'
+      ImageIndex = 8
+      Visible = False
+    end
+    object toolzdy13: TToolButton
+      Left = 375
+      Top = 0
+      AutoSize = True
+      Caption = '13'
+      ImageIndex = 8
+      Visible = False
+    end
+    object toolzdy14: TToolButton
+      Left = 409
+      Top = 0
+      AutoSize = True
+      Caption = '14'
+      ImageIndex = 8
+      Visible = False
+    end
+    object toolzdy15: TToolButton
+      Left = 443
+      Top = 0
+      AutoSize = True
+      Caption = '15'
+      ImageIndex = 8
+      Visible = False
+    end
+    object toolzdy16: TToolButton
+      Left = 477
+      Top = 0
+      AutoSize = True
+      Caption = '16'
+      ImageIndex = 9
+      Visible = False
+    end
+    object toolzdy17: TToolButton
+      Left = 511
+      Top = 0
+      AutoSize = True
+      Caption = '17'
+      ImageIndex = 10
+      Visible = False
+    end
+    object toolzdy18: TToolButton
+      Left = 545
+      Top = 0
+      AutoSize = True
+      Caption = '18'
+      ImageIndex = 11
+      Visible = False
+    end
+    object toolzdy19: TToolButton
+      Left = 579
+      Top = 0
+      AutoSize = True
+      Caption = '19'
+      ImageIndex = 12
+      Visible = False
+    end
+    object toolzdy20: TToolButton
+      Left = 613
+      Top = 0
+      AutoSize = True
+      Caption = '20'
+      ImageIndex = 8
+      Visible = False
+    end
+    object Tprint: TToolButton
+      Left = 647
+      Top = 0
+      AutoSize = True
       Caption = #23548#20986'Excel'
       ImageIndex = 28
       OnClick = TprintClick
     end
     object TprintGrid: TToolButton
-      Left = 134
+      Left = 733
       Top = 0
       AutoSize = True
       Caption = #25171#21360
@@ -57,7 +217,7 @@ object frmQryBaseList: TfrmQryBaseList
       OnClick = TprintGridClick
     end
     object TsaveGrid: TToolButton
-      Left = 182
+      Left = 781
       Top = 0
       AutoSize = True
       Caption = #20445#23384#26684#24335
@@ -65,7 +225,7 @@ object frmQryBaseList: TfrmQryBaseList
       OnClick = TsaveGridClick
     end
     object TgridSet: TToolButton
-      Left = 262
+      Left = 861
       Top = 0
       AutoSize = True
       Caption = #34920#26684#21015#35774#32622
@@ -74,7 +234,7 @@ object frmQryBaseList: TfrmQryBaseList
       OnClick = TgridSetClick
     end
     object Tclose: TToolButton
-      Left = 358
+      Left = 957
       Top = 0
       AutoSize = True
       Caption = #20851#38381
diff --git a/public10/design/U_QryBaseList.pas b/public10/design/U_QryBaseList.pas
index 09de417..6391318 100644
--- a/public10/design/U_QryBaseList.pas
+++ b/public10/design/U_QryBaseList.pas
@@ -61,6 +61,26 @@ type
     Label31: TLabel;
     TgridSet: TToolButton;
     cxProgressBar1: TMovePanel;
+    toolzdy1: TToolButton;
+    toolzdy2: TToolButton;
+    toolzdy3: TToolButton;
+    toolzdy4: TToolButton;
+    toolzdy5: TToolButton;
+    toolzdy6: TToolButton;
+    toolzdy7: TToolButton;
+    toolzdy8: TToolButton;
+    toolzdy9: TToolButton;
+    toolzdy10: TToolButton;
+    toolzdy11: TToolButton;
+    toolzdy12: TToolButton;
+    toolzdy13: TToolButton;
+    toolzdy14: TToolButton;
+    toolzdy15: TToolButton;
+    toolzdy16: TToolButton;
+    toolzdy17: TToolButton;
+    toolzdy18: TToolButton;
+    toolzdy19: TToolButton;
+    toolzdy20: TToolButton;
     procedure TrefreshClick(Sender: TObject);
     procedure TprintClick(Sender: TObject);
     procedure TprintGridClick(Sender: TObject);
@@ -322,7 +342,23 @@ begin
 end;
 
 procedure TfrmQryBaseList.FormCreate(Sender: TObject);
+var
+  mFontSize:integer;
 begin
+   getSystemIni();
+    if gFontSize<9 then
+    begin
+      mFontSize := 12;
+    end
+    else
+    begin
+      mFontSize:=gFontSize ;
+    end;
+
+  self.Font.Size := gFontSize;
+  if trim(gFontName)<>'' then
+    self.Font.Name:=gFontName;
+
   cxgrid1.Align:=alClient;
   CurrentPage := 1;
   RecordsNumber := 500;
diff --git a/public10/design/U_QryPivotBaseList.dfm b/public10/design/U_QryPivotBaseList.dfm
index d4d11b8..afb0fdb 100644
--- a/public10/design/U_QryPivotBaseList.dfm
+++ b/public10/design/U_QryPivotBaseList.dfm
@@ -62,7 +62,7 @@ object frmQryPivotBaseList: TfrmQryPivotBaseList
       Caption = #20445#23384#26684#24335
       ImageIndex = 30
     end
-    object TgridLiSet: TToolButton
+    object TgridSet: TToolButton
       Left = 262
       Top = 0
       AutoSize = True
diff --git a/public10/design/U_QryPivotBaseList.pas b/public10/design/U_QryPivotBaseList.pas
index 7854ca7..09b2b36 100644
--- a/public10/design/U_QryPivotBaseList.pas
+++ b/public10/design/U_QryPivotBaseList.pas
@@ -37,7 +37,7 @@ type
     Tprint: TToolButton;
     TprintGrid: TToolButton;
     TsaveGrid: TToolButton;
-    TgridLiSet: TToolButton;
+    TgridSet: TToolButton;
     Tclose: TToolButton;
     frmFrameDateSel1: TfrmFrameDateSel10;
     dxLayoutControl_query: TdxLayoutControl;
@@ -155,7 +155,23 @@ begin
 end;
 
 procedure TfrmQryPivotBaseList.FormCreate(Sender: TObject);
+var
+  mFontSize:integer;
 begin
+   getSystemIni();
+    if gFontSize<9 then
+    begin
+      mFontSize := 12;
+    end
+    else
+    begin
+      mFontSize:=gFontSize ;
+    end;
+
+  self.Font.Size := gFontSize;
+  if trim(gFontName)<>'' then
+    self.Font.Name:=gFontName;
+
   cxDBPivotGrid1.Align:=alClient;
   CurrentPage := 1;
   RecordsNumber := 500;
@@ -176,7 +192,7 @@ begin
   begin
     fWindowDesign.FormStyleInit10(self, fFormId, ADOQueryBaseTemp, ADOQueryBaseCmd, '', fParameters10);
   end;
-  TgridLiSet.Visible:=gIsCanDesign;
+  TgridSet.Visible:=gIsCanDesign;
   if dxLayoutControl_query.Tag<>999 then
     readLayOut(dxLayoutControl_query,ADOQueryBaseTemp,PWideChar( fDllFileName+'|'+self.name+'|'+dxLayoutControl_query.Name+'.ini'));
   fWindowDesign.fProcedureName:=fProcedureName;
diff --git a/public10/design/U_WindowFormdesign.pas b/public10/design/U_WindowFormdesign.pas
index 878f7cc..73c2ca0 100644
--- a/public10/design/U_WindowFormdesign.pas
+++ b/public10/design/U_WindowFormdesign.pas
@@ -351,6 +351,7 @@ var
   mIsDrawGridHeader: boolean;
   mdesignCode: string;
   setGridButton: TToolButton;
+  SaveRedraw:boolean;
 begin
   ADOQueryCmd := ADOQCmd;
   ADOQueryTmp := ADOTmp;
@@ -358,24 +359,27 @@ begin
   fFormName := mForm.name;
   fFormId := mFormId;
 
-   gIsCanDesign :=IsHasDesignRight(ADOTmp,PWideChar(dCode)) ;
+//   gIsCanDesign :=IsHasDesignRight(ADOTmp,PWideChar(dCode)) ;
+//
+//    if gFontSize>=9 then
+//    begin
+//      fFontSize:= gFontSize ;
+//    end
+//    else
+//    begin
+//      fFontSize:= getSystemFontSize(ADOTmp,PWideChar(mStyleCode));
+//      if fFontSize < 9 then
+//       fFontSize := 12;
+//      gFontSize:=fFontSize;
+//    end;
 
-    if gFontSize>=9 then
-    begin
-      fFontSize:= gFontSize ;
-    end
-    else
-    begin
-      fFontSize:= getSystemFontSize(ADOTmp,PWideChar(mStyleCode));
-      if fFontSize < 9 then
-       fFontSize := 12;
-      gFontSize:=fFontSize;
-    end;
-
-  mForm.Font.Size := fFontSize;
+ // mForm.Font.Size := fFontSize;
+  //if gFontName<>'' then
+   // mForm.Font.Name:=gFontName;
   // 窗口背景色
-
+  //exit;
   try
+  // SaveRedraw := (GetWindowLong(mForm.Handle, GWL_STYLE) and WS_VISIBLE) <> 0;
   for i := 0 to mForm.ComponentCount - 1 do
   begin
     if not ( mForm.Components[i] is TcxGrid) and  not( mForm.Components[i] is TToolBar) and  not( mForm.Components[i] is TdxCustomLayoutControl) then Continue;
@@ -447,6 +451,7 @@ begin
       continue;
     end;
   end;
+
   except
      showMessage('窗口初始化异常!');
   end;
@@ -476,6 +481,7 @@ begin
   fDllName := gDllFileName;
   fFormName := mForm.name;
   fFormId := mFormId;
+  exit;
 
    gIsCanDesign :=IsHasDesignRight(ADOTmp,PWideChar(dCode)) ;
 //
diff --git a/public10/design/U_globalVar.pas b/public10/design/U_globalVar.pas
index 14b09e9..e49e4c4 100644
--- a/public10/design/U_globalVar.pas
+++ b/public10/design/U_globalVar.pas
@@ -12,6 +12,7 @@ var
   gIsCanDesign:Boolean;
   gGridNativeSet:boolean;
   gFontSize:integer;
+  gFontName:string;
   gIsUseSkin:boolean;
   gStructVer:string;
 const