Browse Source

1、单机版未彻底取消附件功能。
2、只有自己上传的附件才显示线上移除按钮。
3、大量附件时,优化界面加载速度、优化后出现灰块等问题。

Chenshilong 8 years ago
parent
commit
db132e4df9

+ 1 - 1
Dprs/CSL/Measure_Cloud.cfg

@@ -35,7 +35,7 @@
 -N"D:\Work\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

+ 9 - 7
Dprs/CSL/Measure_Cloud.dof

@@ -96,7 +96,7 @@ 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]
@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=3
-Build=1112
+Build=1115
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化云版
-FileVersion=3.1.3.1112
+FileVersion=3.1.3.1115
 InternalName=
 LegalCopyright=
 LegalTrademarks=
@@ -134,10 +134,12 @@ OriginalFilename=
 ProductName=
 ProductVersion=1.0.0.0
 [HistoryLists\hlConditionals]
-Count=3
-Item0=_mCloud;_mEncrypt1;_Test;_mLoginNoPW
-Item1=_mCloud;_mEncrypt1;_Test
-Item2=_mCloud;_mEncrypt;_Test
+Count=5
+Item0=_mCloud;_mEncrypt1;_Test;_mLoginNoPW1
+Item1=_mCloud1;_mEncrypt1;_Test;_mLoginNoPW1
+Item2=_mCloud;_mEncrypt1;_Test;_mLoginNoPW
+Item3=_mCloud;_mEncrypt1;_Test
+Item4=_mCloud;_mEncrypt;_Test
 [HistoryLists\hlUnitAliases]
 Count=1
 Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;

BIN
Dprs/CSL/Measure_Cloud.res


+ 1 - 1
Forms/UpFileFrame.pas

@@ -218,7 +218,7 @@ begin
     ufsNormal:
     begin
       pnlOrder.Visible := False;
-      pnlPlay.Visible := True;
+      pnlPlay.Visible := PHPWeb.UserID = Data.UperID;
       lblInfo.Visible := True;
       lblInfo.Font.Color := clBlack;
       lblInfo.Caption := Data.UperName;

+ 19 - 14
Forms/UpFileManageFrame.pas

@@ -155,20 +155,25 @@ end;
 procedure TUpFileManageView.RefreshViews;
 var i: Integer;
 begin
-  ClearViews;
-  ClearDetail;
-
-  {'HasAttachment'是不可靠的。一但它不可靠,会导致:有附件却不显示,用户会以为
-   附件丢失。不可靠表现为:
-   ①用户上传成功,本地标记修改完成,之后却因死机或程序出错导致项目没有保存成功,
-     这样本地标记没有保存,线上线下不一致。
-   ②当前用户非工作状态,上传了附件。却因下次从服务器更新覆盖了本地项目,标记丢失。}
-  if (FRec <> nil) {and (FRec.ValueByName('HasAttachment').AsBoolean = True)} then
-    for i := 0 to Datas.Count - 1 do
-    begin
-      if (Datas[i].BillID = FRec.ValueByName('ID').AsInteger) and (Datas[i].Phase = TProjectData(FProjectData).PhaseIndex) then
-        AddUpFileView(Datas[i]);
-    end;
+  LockWindowUpdate(Self.Handle);
+  try
+    ClearViews;
+    ClearDetail;
+    {'HasAttachment'是不可靠的。一但它不可靠,会导致:有附件却不显示,用户会以为
+     附件丢失。不可靠表现为:
+     ①用户上传成功,本地标记修改完成,之后却因死机或程序出错导致项目没有保存成功,
+       这样本地标记没有保存,线上线下不一致。
+     ②当前用户非工作状态,上传了附件。却因下次从服务器更新覆盖了本地项目,标记丢失。}
+    if (FRec <> nil) {and (FRec.ValueByName('HasAttachment').AsBoolean = True)} then
+      for i := 0 to Datas.Count - 1 do
+      begin
+        if (Datas[i].BillID = FRec.ValueByName('ID').AsInteger) and (Datas[i].Phase = TProjectData(FProjectData).PhaseIndex) then
+          AddUpFileView(Datas[i]);
+      end;
+  finally
+    pnlHead.Repaint;
+    LockWindowUpdate(0);
+  end;
 end;
 
 procedure TUpFileManageView.RefreshDetail;

+ 5 - 3
Frames/ProjectFme.pas

@@ -525,12 +525,14 @@ procedure TProjectFrame.dxsbViewControlItemClick(Sender: TObject;
       PriceMarginFrame.RefreshBills;
 
     if G_IsCloud then
+    begin
       if (Item.Tag = xbiBillsCompile.Tag) or (Item.Tag = xbiBillsMeasure.Tag) then
         CheckUpFile;
 
-    tobtnUpFile.Visible := Item.Tag = xbiBillsMeasure.Tag;
-    if (tobtnUpFile.Visible = False) and (jpsAssistant.ActivePage = jpsAssistantUpFile) then
-      jpsAssistant.ActivePage := jpsAssistantStandardBills;
+      tobtnUpFile.Visible := Item.Tag = xbiBillsMeasure.Tag;
+      if (tobtnUpFile.Visible = False) and (jpsAssistant.ActivePage = jpsAssistantUpFile) then
+        jpsAssistant.ActivePage := jpsAssistantStandardBills;
+    end;
   end;
 
   procedure ChangeView;