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

Dprs/CSL/Measure_Cloud.cfg

@@ -35,7 +35,7 @@
 -N"C:\DelphiTemp"
 -LE"c:\program files (x86)\borland\delphi7\Projects\Bpl"
 -LN"c:\program files (x86)\borland\delphi7\Projects\Bpl"
--D_mCloud;_mEncrypt1;_Test;_mLoginNoPW
+-D_mCloud;_mEncrypt1;_Test;_mLoginNoPW1
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CAST

Dprs/CSL/Measure_Cloud.dof

@@ -96,12 +96,12 @@ PackageDLLOutputDir=
 PackageDCPOutputDir=
 SearchPath=
 Packages=vcl;rtl;vclx;indy;inet;xmlrtl;vclie;inetdbbde;inetdbxpress;dbrtl;dsnap;dsnapcon;vcldb;soaprtl;VclSmp;dbexpress;dbxcds;inetdb;bdertl;vcldbx;webdsnap;websnap;adortl;ibxpress;teeui;teedb;tee;dss;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOfficeXP;ZjGridD7;DPanel;ExTree;JimComboBoxs;JimTab;PrintComRep;XPMenu_tom;ZjGridFereD7;ZjCommon;SmartDataSet;ZjGridActns
-Conditionals=_mCloud;_mEncrypt1;_Test;_mLoginNoPW
+Conditionals=_mCloud;_mEncrypt1;_Test;_mLoginNoPW1
 DebugSourceDirs=
 UsePackages=0
 [Parameters]
-RunParams=Measure:363923735@qq.com
-HostApplication=C:\Program Files (x86)\纵横软件\计量支付 (单机版+云版) 1\Measure_Cloud.exe
+RunParams=
+HostApplication=
 Launcher=
 UseLauncher=0
 DebugCWD=
@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=3
-Build=1149
+Build=1161
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化云版
-FileVersion=3.1.3.1149
+FileVersion=3.1.3.1161
 InternalName=
 LegalCopyright=
 LegalTrademarks=
@@ -135,8 +135,8 @@ ProductName=
 ProductVersion=1.0.0.0
 [HistoryLists\hlConditionals]
 Count=2
-Item0=_mCloud;_mEncrypt1;_Test;_mLoginNoPW
-Item1=_mCloud;_mEncrypt1;_Test;_mLoginNoPW1
+Item0=_mCloud;_mEncrypt1;_Test;_mLoginNoPW1
+Item1=_mCloud;_mEncrypt1;_Test;_mLoginNoPW
 [HistoryLists\hlUnitAliases]
 Count=1
 Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;

Dprs/CSL/Measure_Cloud.dpr

@@ -231,7 +231,9 @@ uses
   ReportManagerDM in '..\..\DataModules\ReportManagerDM.pas' {Reports: TDataModule},
   ProjGatherDealPay in '..\..\ProjGather\ProjGatherDealPay.pas',
   ProjGatherProperties in '..\..\ProjGather\ProjGatherProperties.pas',
-  rpgDealPayDm in '..\..\Report\ProjGather\rpgDealPayDm.pas' {rgpDealPayData: TDataModule};
+  rpgDealPayDm in '..\..\Report\ProjGather\rpgDealPayDm.pas' {rgpDealPayData: TDataModule},
+  superobject in '..\..\Units\superobject\superobject.pas',
+  superxmlparser in '..\..\Units\superobject\superxmlparser.pas';
 
 {$R *.res}
 
@@ -301,9 +303,8 @@ begin
               finally
                 vFDForm.Free;
               end;
-            end
-            else
-              Application.Terminate;
+            end;
+            Application.Terminate;
           end;
 
           ltDisCon:

Forms/FileDownLoadFrm.dfm

@@ -1,10 +1,10 @@
 object FileDownLoadForm: TFileDownLoadForm
-  Left = 680
-  Top = 367
+  Left = 907
+  Top = 355
   BorderIcons = [biSystemMenu]
   BorderStyle = bsDialog
   Caption = #26032#29256#26412#19979#36733
-  ClientHeight = 183
+  ClientHeight = 175
   ClientWidth = 463
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET

Forms/FileDownLoadFrm.pas

@@ -71,7 +71,8 @@ end;
 procedure TFileDownLoadForm.ITPDownWorkEnd(Sender: TObject;
   AWorkMode: TWorkMode);
 begin
-  // 
+  // For test.
+  // Application.MessageBox(PChar('下完了！'), '操作提醒', MB_OK + MB_ICONWARNING);
 end;
 
 procedure TFileDownLoadForm.SetURL(const Value: string);
@@ -121,7 +122,7 @@ begin
   // 反斜杠 ExtractFileName 函数搞不定，这里先转换
   s := StringReplace(Value, '/', '\', [rfReplaceAll, rfIgnoreCase]);
   FFileName := ExtractFileName(s);
-  FLocalFile := 'Web\' + FFileName;
+  FLocalFile := ExtractFilePath(Application.ExeName) + 'Web\' + FFileName;
   TFileDownLoadForm(FOwner).RefreshDisplay(FFileName);
 
   Resume;    // 在这里唤醒

Forms/LoginFrm.dfm

@@ -1,6 +1,6 @@
 object LoginFrm: TLoginFrm
-  Left = 241
-  Top = 165
+  Left = 888
+  Top = 186
   ActiveControl = cbUser
   AutoSize = True
   BorderIcons = [biSystemMenu]

Forms/LoginFrm.pas

@@ -220,6 +220,7 @@ begin
           vFDForm.Free;
         end;
       end;
+      Application.Terminate;
     end;
 
     ltIncomplete: