rdlcreator, support border styles

majorsilence · Feb 8, 2025 · 2bcd1da · 2bcd1da
1 parent 5722218
commit 2bcd1da
Show file tree

Hide file tree

Showing 6 changed files with 163 additions and 8 deletions.
diff --git a/RdlCreator.Tests/ManualReportDefinitionTest.cs b/RdlCreator.Tests/ManualReportDefinitionTest.cs
@@ -223,21 +223,96 @@ private RdlCreator.Report GenerateTestData()
                                                              Height = "35.91mm",
                                                              CustomProperties = new CustomProperties
                                                              {
-
                                                                  CustomProperty = new CustomProperty()
                                                                  {
                                                                     Name = "QrCode",
                                                                     Value = "=Fields!CategoryID.Value"
                                                                  }
-                                                             }
+                                                             },
+                                                            CanGrow="true",
+                                                            Style = new Style
+                                                            {
+                                                                BorderStyle= new BorderStyle
+                                                                {
+                                                                    Default="None",
+                                                                    Bottom="Solid"
+                                                                },
+                                                                BorderColor=new BorderColor
+                                                                {
+                                                                    Bottom = "Gray"
+                                                                },
+                                                                BorderWidth= new BorderWidth
+                                                                {
+                                                                    Bottom="1pt"
+                                                                }
+
+                                                            }
                                                          }
                                                     }
                                                 },
-                                                new TableCell { ReportItems = new TableCellReportItems(){ ReportItem = new Textbox { Name = "CategoryName",
-                                                    Value = new Value { Text = "=Fields!CategoryName.Value" }, CanGrow = "true" } } },
-                                                new TableCell { ReportItems= new TableCellReportItems(){ ReportItem = new Textbox { Name = "Description",
-                                                    Value = new Value { Text = "=Fields!Description.Value" }, CanGrow = "true" } } }
-
+                                                new TableCell
+                                                {
+                                                    ReportItems = new TableCellReportItems()
+                                                    {
+                                                        ReportItem = new Textbox {
+                                                            Name = "CategoryName",
+                                                            Value = new Value
+                                                             {
+                                                                Text = "=Fields!CategoryName.Value"
+                                                            },
+                                                            CanGrow = "true",
+                                                            Style = new Style
+                                                            {
+                                                                BorderStyle= new BorderStyle
+                                                                {
+                                                                    Default="None",
+                                                                    Bottom="Solid"
+                                                                },
+                                                                BorderColor=new BorderColor
+                                                                {
+                                                                    Bottom = "Gray"
+                                                                },
+                                                                BorderWidth= new BorderWidth
+                                                                {
+                                                                    Bottom="1pt"
+                                                                }
+
+                                                            }
+                                                        }
+                                                    }
+                                                },
+                                                new TableCell
+                                                {
+                                                    ReportItems= new TableCellReportItems()
+                                                    {
+                                                        ReportItem = new Textbox
+                                                        {
+                                                            Name = "Description",
+                                                            Value = new Value
+                                                            {
+                                                                Text = "=Fields!Description.Value"
+                                                            },
+                                                            CanGrow = "true",
+                                                            Style = new Style
+                                                            {
+                                                                BorderStyle= new BorderStyle
+                                                                {
+                                                                    Default="None",
+                                                                    Bottom="Solid"
+                                                                },
+                                                                BorderColor=new BorderColor
+                                                                {
+                                                                    Bottom = "Gray"
+                                                                },
+                                                                BorderWidth= new BorderWidth
+                                                                {
+                                                                    Bottom="1pt"
+                                                                }
+
+                                                            }
+                                                        }
+                                                    }
+                                                }
                                             }
                                         }
                                     }

diff --git a/RdlCreator/BorderColor.cs b/RdlCreator/BorderColor.cs
@@ -0,0 +1,19 @@
+using System.Xml.Serialization;
+
+namespace Majorsilence.Reporting.RdlCreator
+{
+    public class BorderColor
+    {
+        [XmlElement(ElementName = "Bottom")]
+        public string Bottom { get; set; }
+
+        [XmlElement(ElementName = "Top")]
+        public string Top { get; set; }
+
+        [XmlElement(ElementName = "Left")]
+        public string Left { get; set; }
+
+        [XmlElement(ElementName = "Right")]
+        public string Right { get; set; }
+    }
+}
diff --git a/RdlCreator/BorderStyle.cs b/RdlCreator/BorderStyle.cs
@@ -0,0 +1,29 @@
+using System.Xml.Serialization;
+
+namespace Majorsilence.Reporting.RdlCreator
+{
+    public class BorderStyle
+    {
+        [XmlElement(ElementName = "Default")]
+        public string Default { get; set; }
+
+        [XmlElement(ElementName = "Left")]
+        public string Left { get; set; }
+
+        [XmlElement(ElementName = "Right")]
+        public string Right { get; set; }
+
+        [XmlElement(ElementName = "Top")]
+        public string Top { get; set; }
+
+        [XmlElement(ElementName = "Bottom")]
+        public string Bottom { get; set; }
+
+        public static class Values
+        {
+            public const string None = "None";
+            public const string Solid = "Solid";
+            public const string Dashed = "Dashed";
+        }
+    }
+}
diff --git a/RdlCreator/BorderWidth.cs b/RdlCreator/BorderWidth.cs
@@ -0,0 +1,19 @@
+using System.Xml.Serialization;
+
+namespace Majorsilence.Reporting.RdlCreator
+{
+    public class BorderWidth
+    {
+        [XmlElement(ElementName = "Top")]
+        public string Top { get; set; }
+
+        [XmlElement(ElementName = "Bottom")]
+        public string Bottom { get; set; }
+
+        [XmlElement(ElementName = "Left")]
+        public string Left { get; set; }
+
+        [XmlElement(ElementName = "Right")]
+        public string Right { get; set; }
+    }
+}
diff --git a/RdlCreator/CustomReportItems.cs b/RdlCreator/CustomReportItems.cs
@@ -15,5 +15,9 @@ public class CustomReportItems
 
         [XmlElement(ElementName = "CustomProperties")]
         public CustomProperties CustomProperties { get; set; }
+        [XmlElement(ElementName = "Style")]
+        public Style Style { get; set; }
+        [XmlElement(ElementName = "CanGrow")]
+        public string CanGrow { get; set; }
     }
 }
diff --git a/RdlCreator/Style.cs b/RdlCreator/Style.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 
-
 namespace Majorsilence.Reporting.RdlCreator
 {
     public class Style
@@ -13,5 +12,15 @@ public class Style
 
         [XmlElement(ElementName = "TextAlign")]
         public string TextAlign { get; set; }
+
+        [XmlElement(ElementName = "BorderStyle")]
+        public BorderStyle BorderStyle { get; set; }
+
+        [XmlElement(ElementName = "BorderColor")]
+        public BorderColor BorderColor { get; set; }
+
+        [XmlElement(ElementName = "BorderWidth")]
+        public BorderWidth BorderWidth { get; set; }
+
     }
 }