Merge branch 'main' of http://47.100.72.85:3000/rtgit/RTFormwork

public10/design/U_BaseOneTableInput.dfm

@@ -51,20 +51,21 @@ object frmBaseOneTableInput: TfrmBaseOneTableInput
     object Tsj: TToolButton
       Left = 63
       Top = 0
+      AutoSize = True
       Caption = #20445#23384#35774#35745
       ImageIndex = 16
       Visible = False
       OnClick = TsjClick
     end
     object TgridSet: TToolButton
-      Left = 158
+      Left = 150
       Top = 0
       AutoSize = True
       Caption = #34920#26684#21015#35774#32622
       ImageIndex = 16
     end
     object TBClose: TToolButton
-      Left = 257
+      Left = 249
       Top = 0
       AutoSize = True
       Caption = #20851#38381

public10/design/U_BaseOneTableInput.pas

@@ -99,6 +99,9 @@ procedure TfrmBaseOneTableInput.FormShow(Sender: TObject);
 begin
    tGridSet.Visible:=gIsCanDesign;
    fWindowDesign.FormStyleInit10(self,0,ADOQueryBaseTemp,ADOQueryBaseCmd) ;
+   if dxLayoutControl_input.Tag<>999 then
+    readLayOut(dxLayoutControl_input,ADOQueryBaseTemp,PWideChar( fDllFileName+'|'+self.name+'|'+dxLayoutControl_input.Name+'.ini'));
+
    Tsj.Visible:=gIsCanDesign;
 end;