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

DataModules/PHPWebDm.pas

@@ -120,6 +120,7 @@ type
     function UrlGet(AUrl: string; APostParam: TStrings; var AResult: string): Integer; overload;
     function UrlGet(AUrl: string; APostParam: TStrings; var AResult: TStrings): Integer; overload;
     procedure ReadIniValues;
+    function RepalceSpecChars(AFileName: string): string;
 
     property Account: string read FAccount write SetAccount;
     property UserID: Integer read FUserID write SetUserID;
@@ -976,6 +977,22 @@ begin
   end;
 end;
 
+function TPHPWeb.RepalceSpecChars(AFileName: string): string;
+const
+  BefChar: array [0..10] of Char = ('(', ')', '[', ']', '{', '}', ':', '"', '''', ',', ';');
+  AftChar: array [0..10] of string = ('（', '）', '【', '】', '『', '』', '：', '”', '”', '，', '；');
+var
+  I: Integer;
+begin
+  AFileName := Trim(AFileName);
+  for I := low(BefChar) to High(BefChar) do
+  begin
+    if Pos(BefChar[I], AFileName) > 0 then
+      AFileName := StringReplace(AFileName, BefChar[I], AftChar[I], [rfReplaceAll]);
+  end;
+  Result := AFileName;
+end;
+
 initialization
 
 finalization

Dprs/CSL/Measure_Cloud.cfg

@@ -31,11 +31,11 @@
 -M
 -$M16384,1048576
 -K$00400000
--E"C:\Program Files (x86)\纵横软件\纵横结算决算计量一体化软件(云版)渭武"
+-E"C:\Program Files (x86)\纵横软件\计量支付 (单机版+云版) 1"
 -N"C:\DelphiTemp"
 -LE"c:\program files (x86)\borland\delphi7\Projects\Bpl"
 -LN"c:\program files (x86)\borland\delphi7\Projects\Bpl"
--D_mCloud;_mLoginNoPW;
+-D_mCloud;
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CAST

Dprs/CSL/Measure_Cloud.dof

@@ -90,13 +90,13 @@ MaxStackSize=1048576
 ImageBase=4194304
 ExeDescription=
 [Directories]
-OutputDir=C:\Program Files (x86)\纵横软件\纵横结算决算计量一体化软件(云版)渭武
+OutputDir=C:\Program Files (x86)\纵横软件\计量支付 (单机版+云版) 1
 UnitOutputDir=C:\DelphiTemp
 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;_mLoginNoPW;
+Conditionals=_mCloud;
 DebugSourceDirs=
 UsePackages=0
 [Parameters]
@@ -137,8 +137,8 @@ ProductVersion=3.1.7
 c:\program files (x86)\borland\delphi7\Bin\DBWEBXPRT.BPL=Borland Web Wizard Package
 [HistoryLists\hlConditionals]
 Count=4
-Item0=_mCloud;_mLoginNoPW;
-Item1=_mCloud;
+Item0=_mCloud;
+Item1=_mCloud;_mLoginNoPW;
 Item2=_mCloud;_mLoginNoPW
 Item3=_mCloud;_mDebugView
 [HistoryLists\hlUnitAliases]
@@ -149,7 +149,8 @@ Count=2
 Item0=C:\DelphiTemp
 Item1=..\..\Dcus
 [HistoryLists\hlOutputDirectorry]
-Count=3
-Item0=C:\Program Files (x86)\纵横软件\纵横结算决算计量一体化软件(云版)渭武
-Item1=D:\SmartCostExe\Measure\PWFree
-Item2=D:\SmartCostExe\Measure
+Count=4
+Item0=C:\Program Files (x86)\纵横软件\计量支付 (单机版+云版) 1
+Item1=C:\Program Files (x86)\纵横软件\纵横结算决算计量一体化软件(云版)渭武
+Item2=D:\SmartCostExe\Measure\PWFree
+Item3=D:\SmartCostExe\Measure

Forms/UpFileManageFrame.pas

@@ -456,7 +456,7 @@ procedure TUpFileManageView.SelectUpFile;
 var vODlg: TOpenDialog;
   i, iBillID: Integer;
   vFile: TUpFile;
-  sFile, sName: string;
+  sFile, sFile2, sName, sName2: string;
   iV: Int64;
 begin
   vODlg := TOpenDialog.Create(nil);
@@ -483,14 +483,22 @@ begin
       end;
 
       sName := ExtractFileName(sFile);
+      sName2 := PHPWeb.RepalceSpecChars(sName);
+
+      sFile2 := sFile;
+      if sName2 <> sName then
+      begin
+        sFile2 := ExtractFilePath(sFile) + sName2;
+        CopyFile(PChar(sFile), PChar(sFile2), False);
+      end;
 
       vFile := Datas.Add(iBillID);
       vFile.Phase := TProjectData(FProjectData).PhaseIndex;
-      vFile.OrgFile := sFile;
+      vFile.OrgFile := sFile2;
       vFile.Category := '̨Õʸ½¼þ';
       vFile.Memo := 'Îҵı¸×¢';
-      vFile.LocalFile := Datas.Path + sName;
-      vFile.DisplayName := sName;
+      vFile.LocalFile := Datas.Path + sName2;
+      vFile.DisplayName := sName2;
       vFile.Status := ufsNeedUp;
 
       if G_IsCloud then