소스 검색

取消根据当前打开项目,过滤同顶层文件夹下项目的设置,直接提供全部项目供选择

MaiXinRong 9 년 전
부모
커밋
9ab125e150
2개의 변경된 파일50개의 추가작업 그리고 12개의 파일을 삭제
  1. 46 11
      ProjGather/ProjGatherSelectFrm.dfm
  2. 4 1
      ProjGather/ProjGatherSelectFrm.pas

+ 46 - 11
ProjGather/ProjGatherSelectFrm.dfm

@@ -4,7 +4,7 @@ object ProjGatherSelectForm: TProjGatherSelectForm
   BorderStyle = bsSingle
   Caption = #36873#25321#27719#24635#39033#30446
   ClientHeight = 523
-  ClientWidth = 750
+  ClientWidth = 816
   Color = clBtnFace
   Font.Charset = ANSI_CHARSET
   Font.Color = clWindowText
@@ -15,7 +15,7 @@ object ProjGatherSelectForm: TProjGatherSelectForm
   PixelsPerInch = 96
   TextHeight = 12
   object lblProjectList: TLabel
-    Left = 11
+    Left = 8
     Top = 8
     Width = 72
     Height = 12
@@ -28,7 +28,7 @@ object ProjGatherSelectForm: TProjGatherSelectForm
     ParentFont = False
   end
   object lblResult: TLabel
-    Left = 384
+    Left = 451
     Top = 8
     Width = 48
     Height = 12
@@ -41,18 +41,17 @@ object ProjGatherSelectForm: TProjGatherSelectForm
     ParentFont = False
   end
   object zgSelectProject: TZJGrid
-    Left = 8
+    Left = 5
     Top = 24
-    Width = 369
+    Width = 441
     Height = 457
     Options = [goRangeSelect, goRowSizing, goColSizing, goCellNotMaintainData, goFixedRowShowNo, goFixedColShowNo, goAlwaysShowSelection, goShowTreeLine]
     OptionsEx = []
-    ColCount = 3
     RowCount = 1
     ShowGridLine = False
     DefaultColWidth = 35
     DefaultFixedColWidth = 25
-    DefaultFixedRowHeight = 25
+    DefaultFixedRowHeight = 32
     Selection.AlphaBlend = False
     Selection.TransparentColor = False
     FrozenCol = 0
@@ -63,7 +62,7 @@ object ProjGatherSelectForm: TProjGatherSelectForm
     OnDrawCellText = zgSelectProjectDrawCellText
   end
   object zgResult: TZJGrid
-    Left = 384
+    Left = 451
     Top = 24
     Width = 360
     Height = 457
@@ -73,7 +72,7 @@ object ProjGatherSelectForm: TProjGatherSelectForm
     ShowGridLine = False
     DefaultColWidth = 308
     DefaultFixedColWidth = 25
-    DefaultFixedRowHeight = 25
+    DefaultFixedRowHeight = 32
     Selection.AlphaBlend = False
     Selection.TransparentColor = False
     FrozenCol = 0
@@ -82,7 +81,7 @@ object ProjGatherSelectForm: TProjGatherSelectForm
     OnSetCellText = zgResultSetCellText
   end
   object btnOk: TButton
-    Left = 583
+    Left = 649
     Top = 489
     Width = 74
     Height = 25
@@ -91,7 +90,7 @@ object ProjGatherSelectForm: TProjGatherSelectForm
     OnClick = btnOkClick
   end
   object btnCancel: TButton
-    Left = 670
+    Left = 736
     Top = 489
     Width = 74
     Height = 25
@@ -136,6 +135,42 @@ object ProjGatherSelectForm: TProjGatherSelectForm
         FieldName = 'Name'
         Width = 280
         ReadOnly = True
+      end
+      item
+        Title.Caption = #35745#37327#26399#25968
+        Title.CaptionAcrossCols = '1'
+        Title.Font.Charset = GB2312_CHARSET
+        Title.Font.Color = clWindowText
+        Title.Font.Height = -12
+        Title.Font.Name = #23435#20307
+        Title.Font.Style = []
+        Alignment = taLeftJustify
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -12
+        Font.Name = #23435#20307
+        Font.Style = []
+        FieldName = 'PhaseCount'
+        Width = 35
+        ReadOnly = True
+      end
+      item
+        Title.Caption = #23457#25209#29366#24577
+        Title.CaptionAcrossCols = '1'
+        Title.Font.Charset = GB2312_CHARSET
+        Title.Font.Color = clWindowText
+        Title.Font.Height = -12
+        Title.Font.Name = #23435#20307
+        Title.Font.Style = []
+        Alignment = taLeftJustify
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -12
+        Font.Name = #23435#20307
+        Font.Style = []
+        FieldName = 'AuditStatus'
+        Width = 35
+        ReadOnly = False
       end>
     Grid = zgSelectProject
     ExtendRowCount = 0

+ 4 - 1
ProjGather/ProjGatherSelectFrm.pas

@@ -122,9 +122,12 @@ begin
   end;
 
   FValidProjs := TList.Create;
+  // È¡Ïû¹ýÂË
+  {
   FilterValidProject;
   ProjectManager.sdvProjectsSpare.OnFilterRecord := DoOnFilterRecord;
   ProjectManager.sdvProjectsSpare.Filtered := True;
+  }
   stdSelectProject.DataView := ProjectManager.sdvProjectsSpare;
 
   FSelectProjs := TList.Create;
@@ -423,7 +426,7 @@ end;
 procedure TProjGatherSelectForm.RefreshDiffWindows;
 begin
   ClientHeight := 523;
-  ClientWidth := 750;
+  ClientWidth := 816;
 end;
 
 end.