Merge branch 'master' of http://192.168.1.12:3000/maixinrong/measure

Dprs/CSL/Measure_Cloud.dof

@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=3
-Build=1115
+Build=1116
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化云版
-FileVersion=3.1.3.1115
+FileVersion=3.1.3.1116
 InternalName=
 LegalCopyright=
 LegalTrademarks=

Forms/UpFileFrame.pas

@@ -203,6 +203,7 @@ procedure TUpFileView.FrameClick(Sender: TObject);
 begin
   ShowSelected;
   TUpFileManageView(Owner).Selected := Self;
+  TUpFileManageView(Owner).SetFocus;   // 这句使其取得焦点以响应滚动事件
 end;
 
 procedure TUpFileView.RefreshStatus(AStatus: TUpFileStatus);
@@ -218,7 +219,8 @@ begin
     ufsNormal:
     begin
       pnlOrder.Visible := False;
-      pnlPlay.Visible := PHPWeb.UserID = Data.UperID;
+//      pnlPlay.Visible := PHPWeb.UserID = Data.UperID;
+      pnlPlay.Visible := True;
       lblInfo.Visible := True;
       lblInfo.Font.Color := clBlack;
       lblInfo.Caption := Data.UperName;

Forms/UpFileManageFrame.dfm

@@ -10,6 +10,7 @@ object UpFileManageView: TUpFileManageView
   Font.Style = []
   ParentFont = False
   TabOrder = 0
+  OnMouseWheel = FrameMouseWheel
   object pnlHead: TPanel
     Left = 0
     Top = 0

Forms/UpFileManageFrame.pas

@@ -57,6 +57,8 @@ type
     procedure btnDownClick(Sender: TObject);
     procedure miLocalUpClick(Sender: TObject);
     procedure miServerUpClick(Sender: TObject);
+    procedure FrameMouseWheel(Sender: TObject; Shift: TShiftState;
+      WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean);
   private
     FDetailIsEdit: Boolean;
     FSelected: TUpFileView;
@@ -520,4 +522,14 @@ begin
 
 end;
 
+procedure TUpFileManageView.FrameMouseWheel(Sender: TObject;
+  Shift: TShiftState; WheelDelta: Integer; MousePos: TPoint;
+  var Handled: Boolean);
+begin
+  if WheelDelta < 0 then
+    sbFile.Perform(WM_VSCROLL, SB_LINEDOWN, 0)
+  else
+    sbFile.Perform(WM_VSCROLL, SB_LINEUP, 0);
+end;
+
 end.