diff --git a/Delphi10/开发档案/Dp10RepoV1/public10/ThreeFun/Fun/U_RTFun.pas b/Delphi10/开发档案/Dp10RepoV1/public10/ThreeFun/Fun/U_RTFun.pas
index 59ad2c6..dcce5d8 100644
--- a/Delphi10/开发档案/Dp10RepoV1/public10/ThreeFun/Fun/U_RTFun.pas
+++ b/Delphi10/开发档案/Dp10RepoV1/public10/ThreeFun/Fun/U_RTFun.pas
@@ -2910,12 +2910,13 @@ begin
 
   mfromName := GetParentForm(TControl(cxGrid.GetParentComponent), true).Name;
   mGridName := cxGrid.GetParentComponent.Name + '.' + cxGrid.name;
-  // showmessage(mGridName);
+
   ////////////////////////////////
   //
   try
     mADOCmd := TADOQuery.Create(nil);
     mADOCmd.ConnectionString := DConString;
+    mADOCmd.LockType:=ltBatchOptimistic;
     with mADOCmd do
     begin
       close;
@@ -2971,7 +2972,9 @@ begin
         post;
       end;
     end;
+    mADOCmd.UpdateBatch();
   finally
+   // showMessage('3');
     mADOCmd.close;
     mADOCmd.Free;
   end;
diff --git a/Delphi10/开发档案/Dp10RepoV1/public10/design/U_WindowFormdesign.pas b/Delphi10/开发档案/Dp10RepoV1/public10/design/U_WindowFormdesign.pas
index 047a380..912c38b 100644
--- a/Delphi10/开发档案/Dp10RepoV1/public10/design/U_WindowFormdesign.pas
+++ b/Delphi10/开发档案/Dp10RepoV1/public10/design/U_WindowFormdesign.pas
@@ -966,6 +966,8 @@ end;
 ///////////////////////////////////////////////////////////////////
 ///
 function TWindowFormDeSign.geUsertFormButtons(ADOQueryTmp:TADOQuery;mFormId:integer;mFormCaption:string;moduleId:string;moduleSubId:string):string;
+var
+  mformButtons:string;
 begin
     try
       result:='';
@@ -1001,6 +1003,7 @@ begin
           exit;
         end;
       end;
+      mformButtons:= trim(ADOQueryTmp.fieldByName('formButtons').AsString) ;
       with ADOQueryTmp do
       begin
         close;
@@ -1011,6 +1014,8 @@ begin
         sql.Add(',@UserId='+quotedstr(dCode));
         open;
        fFormRightButtons :=   trim(fieldByName('rightButtons').AsString) ;
+       if fFormRightButtons='' then
+         fFormRightButtons:=mformButtons;
        result:= fFormRightButtons;
       end;
     finally