1- using System ;
1+ using System ;
22using System . Drawing ;
33using System . IO ;
44using FastReport . Table ;
@@ -30,7 +30,7 @@ private void ExportPageStylesLayers(FastString styles, int PageNumber)
3030
3131
3232 private void Layer ( FastString Page , ReportComponentBase obj ,
33- float Left , float Top , float Width , float Height , FastString Text , string classTag , FastString addstyletag )
33+ float Left , float Top , float Width , float Height , FastString Text , string classTag , FastString addstyletag , bool borderNone = false )
3434 {
3535 if ( Page != null && obj != null )
3636 {
@@ -77,6 +77,9 @@ private void Layer(FastString Page, ReportComponentBase obj,
7777 Append ( "width:" ) . Append ( Px ( Width * Zoom - borderRight / 2f - borderLeft / 2f ) ) .
7878 Append ( "height:" ) . Append ( Px ( Height * Zoom - borderBottom / 2f - borderTop / 2f ) ) ;
7979
80+ if ( borderNone )
81+ Page . Append ( "border:none;" ) ;
82+
8083 if ( addstyletag != null )
8184 Page . Append ( addstyletag ) ;
8285
@@ -623,7 +626,7 @@ private void LayerShape(FastString Page, ShapeObject obj, FastString text)
623626 Layer ( Page , obj , x , y , obj . Width , obj . Height , text , null , addstyle ) ;
624627 }
625628
626- private void LayerBack ( FastString Page , ReportComponentBase obj , FastString text )
629+ private void LayerBack ( FastString Page , ReportComponentBase obj , FastString text , bool borderNone = false )
627630 {
628631 if ( obj . Border . Shadow )
629632 {
@@ -648,7 +651,12 @@ private void LayerBack(FastString Page, ReportComponentBase obj, FastString text
648651 if ( ! ( obj is PolyLineObject ) )
649652 {
650653 if ( obj . Fill is SolidFill )
651- Layer ( Page , obj , obj . AbsLeft , hPos + obj . AbsTop , obj . Width , obj . Height , text , GetStyle ( obj ) , null ) ;
654+ if ( borderNone )
655+ {
656+ Layer ( Page , obj , obj . AbsLeft , hPos + obj . AbsTop , obj . Width , obj . Height , text , GetStyle ( obj ) , null , borderNone ) ;
657+ }
658+ else
659+ Layer ( Page , obj , obj . AbsLeft , hPos + obj . AbsTop , obj . Width , obj . Height , text , GetStyle ( obj ) , null ) ;
652660 else
653661 LayerPicture ( Page , obj , text ) ;
654662 }
@@ -932,7 +940,7 @@ private void ExportObject(ReportComponentBase obj)
932940 }
933941 else
934942 {
935- LayerBack ( htmlPage , obj , null ) ;
943+ LayerBack ( htmlPage , obj , null , true ) ;
936944 LayerPicture ( htmlPage , obj , null ) ;
937945 }
938946 }
0 commit comments