소스 검색

* Patch from Pascal Riekenberg:
* fixed and extended nested grouping in column mode
* updated nestedgroups demo

git-svn-id: trunk@37493 -

michael 7 년 전
부모
커밋
d28a790a43
2개의 변경된 파일342개의 추가작업 그리고 175개의 파일을 삭제
  1. 6 6
      packages/fcl-report/demos/rptnestedgroups.pp
  2. 336 169
      packages/fcl-report/src/fpreport.pp

+ 6 - 6
packages/fcl-report/demos/rptnestedgroups.pp

@@ -195,8 +195,8 @@ begin
   GroupHeader1Region.Frame.Shape := fsRectangle;
   GroupHeader1Region.Frame.BackgroundColor := clGroupHeaderFooter;
   //GroupHeader1Region.StartOnNewPage := True;
-  GroupHeader1Region.ReprintedHeader := True;
-  GroupHeader1Region.IntermediateFooter := True;
+  GroupHeader1Region.ReprintedHeader := [rsPage];
+  GroupHeader1Region.IntermediateFooter := [rsPage];
   //GroupHeader1Region.FooterPosition := fpStackAtBottom;
   GroupHeader1Region.VisibleExpr := 'not InRepeatedGroupHeader';
 
@@ -246,8 +246,8 @@ begin
   GroupHeader2Subregion.GroupCondition := 'subregion';
   GroupHeader2Subregion.ParentGroupHeader := GroupHeader1Region;
   //GroupHeader2Subregion.StartOnNewPage := True;
-  GroupHeader2Subregion.ReprintedHeader := True;
-  GroupHeader2Subregion.IntermediateFooter := True;
+  GroupHeader2Subregion.ReprintedHeader := [rsPage];
+  GroupHeader2Subregion.IntermediateFooter := [rsPage];
   //GroupHeader2Subregion.FooterPosition := fpStackAtBottom;
 
     Shape := TFPReportShape.Create(GroupHeader2Subregion);
@@ -350,8 +350,8 @@ begin
   GroupHeader3Initial.Layout.Height := 2;
   GroupHeader3Initial.GroupCondition := 'copy(country,1,1)';
   GroupHeader3Initial.ParentGroupHeader := GroupHeader2Subregion;
-  GroupHeader3Initial.ReprintedHeader := True;
-  GroupHeader3Initial.IntermediateFooter := True;
+  GroupHeader3Initial.ReprintedHeader := [rsPage];
+  GroupHeader3Initial.IntermediateFooter := [rsPage];
   //GroupHeader3Initial.OverflowedFooterNeedsReprintedHeader := True;
 
     Shape := TFPReportShape.Create(GroupHeader3Initial);

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 336 - 169
packages/fcl-report/src/fpreport.pp


이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.