add table HeaderRowCount attribute

.editorconfig

@@ -0,0 +1,4 @@
+[*.cs]
+
+# SA1626: Single-line comments should not use documentation style slashes
+dotnet_diagnostic.SA1626.severity = suggestion

OpenXmlPowerTools/ChartUpdater.cs

@@ -58,6 +58,12 @@ public class ChartData
         public string[] CategoryNames;
 
         public double[][] Values;
+
+        /// <summary>
+        /// 组合图表中，次轴图表的序列名称映射
+        /// 映射规则为：chatData中的序列名对应模板中的序列名。
+        /// </summary>
+        public Dictionary<string, string> SecondChartSeriesNames { get; set; } = new Dictionary<string, string>();
     }
 
     public class ChartUpdater
@@ -94,7 +100,14 @@ public static void UpdateChart(ChartPart chartPart, ChartData chartData)
                     throw new ArgumentException("Invalid chart data");
             }
 
+            UpdateEmbeddedWorkbook(chartPart, chartData);
+
             UpdateSeries(chartPart, chartData);
+            //如果设置了次轴，更新次轴
+            if (chartData.SecondChartSeriesNames.Count > 0)
+            {
+                UpdateSeries(chartPart, chartData, true);
+            }
         }
 
         private static Dictionary<int, string> FormatCodes = new Dictionary<int, string>()
@@ -129,13 +142,44 @@ public static void UpdateChart(ChartPart chartPart, ChartData chartData)
             { 49, "@" },
         };
 
-        private static void UpdateSeries(ChartPart chartPart, ChartData chartData)
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="chartPart"></param>
+        /// <param name="chartData"></param>
+        /// <param name="setSecond">设置次级坐标，默认为false</param>
+        /// <exception cref="OpenXmlPowerToolsException"></exception>
+        private static void UpdateSeries(ChartPart chartPart, ChartData chartData, bool setSecond = false)
         {
-            UpdateEmbeddedWorkbook(chartPart, chartData);
-
+            // update series
             XDocument cpXDoc = chartPart.GetXDocument();
             XElement root = cpXDoc.Root;
-            var firstSeries = root.Descendants(C.ser).FirstOrDefault();
+
+            // 序列名            
+            var seriesNames = chartData.SeriesNames.Except(chartData.SecondChartSeriesNames.Keys);
+            if (setSecond)
+            {
+                seriesNames = chartData.SecondChartSeriesNames.Keys;
+            }
+
+            var series = root.Descendants(C.ser).ToList();
+            // 如果不处理次轴
+            if (!setSecond)
+            {
+                series = series.Where(x => x.Descendants(C.tx).SelectMany(tx => tx.Descendants(C.v)).Any(v => !chartData.SecondChartSeriesNames.Values.Contains(v.Value))).ToList();
+
+                if (series == null || series.Count == 0)
+                    throw new OpenXmlPowerToolsException("未找到图表主序列");
+            }
+            else // 处理次轴
+            {
+                series = series.Where(x => x.Descendants(C.tx).SelectMany(tx => tx.Descendants(C.v)).Any(v => chartData.SecondChartSeriesNames.Values.Contains(v.Value))).ToList();
+
+                if (series == null || series.Count == 0)
+                    throw new OpenXmlPowerToolsException("未找到次轴序列，请检查次轴映射字典");
+            }
+
+            var firstSeries = series.FirstOrDefault();
             var numRef = firstSeries.Elements(C.val).Elements(C.numRef).FirstOrDefault();
             string sheetName = null;
             var f = (string)firstSeries.Descendants(C.f).FirstOrDefault();
@@ -151,6 +195,9 @@ private static void UpdateSeries(ChartPart chartPart, ChartData chartData)
                 {
                     XElement cat = null;
 
+                    if (!seriesNames.Contains(sn))
+                        return null;
+
                     var oldCat = firstSeries.Elements(C.cat).FirstOrDefault();
                     if (oldCat == null)
                         throw new OpenXmlPowerToolsException("Invalid chart markup");
@@ -379,6 +426,10 @@ private static void UpdateSeries(ChartPart chartPart, ChartData chartData)
                     newSer = (XElement)UpdateAccentTransform(newSer, accentNumber);
                     return newSer;
                 });
+
+            // 删除newSetOfSeries中null的项目
+            newSetOfSeries = newSetOfSeries.Where(x => x != null).ToList();
+
             firstSeries.ReplaceWith(newSetOfSeries);
             chartPart.PutXDocument();
         }
@@ -427,7 +478,7 @@ private static void UpdateEmbeddedWorkbook(ChartPart chartPart, ChartData chartD
                         var firstRow = new XElement(S.row,
                             new XAttribute("r", "1"),
                             new XAttribute("spans", string.Format("1:{0}", chartData.SeriesNames.Length + 1)),
-                            new [] { new XElement(S.c,
+                            new[] { new XElement(S.c,
                                 new XAttribute("r", "A1"),
                                 new XAttribute("t", "str"),
                                 new XElement(S.v,

OpenXmlPowerTools/DocumentAssembler.cs

@@ -483,6 +483,7 @@ private static string ValidatePerSchema(XElement element)
                                   <xs:element name='Table'>
                                     <xs:complexType>
                                       <xs:attribute name='Select' type='xs:string' use='required' />
+                                      <xs:attribute name='HeaderRowCount' type='xs:int' use='optional' />
                                     </xs:complexType>
                                   </xs:element>
                                 </xs:schema>",
@@ -575,6 +576,8 @@ private class PA
             public static XName Match = "Match";
             public static XName NotMatch = "NotMatch";
             public static XName Depth = "Depth";
+
+            public static XName HeaderRowCount = "HeaderRowCount";
         }
 
         private class PASchemaSet
@@ -600,8 +603,8 @@ static object ContentReplacementTransform(XNode node, XElement data, TemplateErr
                     XElement para = element.Descendants(W.p).FirstOrDefault();
                     XElement run = element.Descendants(W.r).FirstOrDefault();
 
-                    var xPath = (string) element.Attribute(PA.Select);
-                    var optionalString = (string) element.Attribute(PA.Optional);
+                    var xPath = (string)element.Attribute(PA.Select);
+                    var optionalString = (string)element.Attribute(PA.Optional);
                     bool optional = (optionalString != null && optionalString.ToLower() == "true");
 
                     string newValue;
@@ -618,7 +621,7 @@ static object ContentReplacementTransform(XNode node, XElement data, TemplateErr
                     {
 
                         XElement p = new XElement(W.p, para.Elements(W.pPr));
-                        foreach(string line in newValue.Split('\n'))
+                        foreach (string line in newValue.Split('\n'))
                         {
                             p.Add(new XElement(W.r,
                                     para.Elements(W.r).Elements(W.rPr).FirstOrDefault(),
@@ -630,7 +633,7 @@ static object ContentReplacementTransform(XNode node, XElement data, TemplateErr
                     else
                     {
                         List<XElement> list = new List<XElement>();
-                        foreach(string line in newValue.Split('\n'))
+                        foreach (string line in newValue.Split('\n'))
                         {
                             list.Add(new XElement(W.r,
                                 run.Elements().Where(e => e.Name != W.t),
@@ -692,11 +695,21 @@ static object ContentReplacementTransform(XNode node, XElement data, TemplateErr
                     }
                     if (tableData.Count() == 0)
                         return CreateContextErrorMessage(element, "Table Select returned no data", templateError);
+
+
+
+                    int? headerRowCountAttr = (int?)element.Attribute(PA.HeaderRowCount) ?? 1;
+                    if (headerRowCountAttr.Value < 1)
+                    {
+                        headerRowCountAttr = 1;
+                    }
+                    var headerRowCount = headerRowCountAttr.Value;
+
                     XElement table = element.Element(W.tbl);
-                    XElement protoRow = table.Elements(W.tr).Skip(1).FirstOrDefault();
+                    XElement protoRow = table.Elements(W.tr).Skip(headerRowCount).FirstOrDefault();
                     var footerRowsBeforeTransform = table
                         .Elements(W.tr)
-                        .Skip(2)
+                        .Skip(headerRowCount + 1)
                         .ToList();
                     var footerRows = footerRowsBeforeTransform
                         .Select(x => ContentReplacementTransform(x, data, templateError))
@@ -707,7 +720,7 @@ static object ContentReplacementTransform(XNode node, XElement data, TemplateErr
                     protoRow.Descendants(W.bookmarkEnd).Remove();
                     XElement newTable = new XElement(W.tbl,
                         table.Elements().Where(e => e.Name != W.tr),
-                        table.Elements(W.tr).FirstOrDefault(),
+                        table.Elements(W.tr).Take(headerRowCount),
                         tableData.Select(d =>
                             new XElement(W.tr,
                                 protoRow.Elements().Where(r => r.Name != W.tc),
@@ -756,17 +769,17 @@ static object ContentReplacementTransform(XNode node, XElement data, TemplateErr
                     if (match != null && notMatch != null)
                         return CreateContextErrorMessage(element, "Conditional: Cannot specify both Match and NotMatch", templateError);
 
-                    string testValue = null; 
-                   
+                    string testValue = null;
+
                     try
                     {
                         testValue = EvaluateXPathToString(data, xPath, false);
                     }
-	                catch (XPathException e)
+                    catch (XPathException e)
                     {
                         return CreateContextErrorMessage(element, e.Message, templateError);
                     }
-                  
+
                     if ((match != null && testValue == match) || (notMatch != null && testValue != notMatch))
                     {
                         var content = element.Elements().Select(e => ContentReplacementTransform(e, data, templateError));
@@ -815,14 +828,14 @@ private static XElement CreateParaErrorMessage(string errorMessage, TemplateErro
             return errorPara;
         }
 
-        private static string EvaluateXPathToString(XElement element, string xPath, bool optional )
+        private static string EvaluateXPathToString(XElement element, string xPath, bool optional)
         {
             object xPathSelectResult;
             try
             {
                 //support some cells in the table may not have an xpath expression.
                 if (String.IsNullOrWhiteSpace(xPath)) return String.Empty;
-                
+
                 xPathSelectResult = element.XPathEvaluate(xPath);
             }
             catch (XPathException e)
@@ -832,7 +845,7 @@ private static string EvaluateXPathToString(XElement element, string xPath, bool
 
             if ((xPathSelectResult is IEnumerable) && !(xPathSelectResult is string))
             {
-                var selectedData = ((IEnumerable) xPathSelectResult).Cast<XObject>();
+                var selectedData = ((IEnumerable)xPathSelectResult).Cast<XObject>();
                 if (!selectedData.Any())
                 {
                     if (optional) return string.Empty;
@@ -843,11 +856,11 @@ private static string EvaluateXPathToString(XElement element, string xPath, bool
                     throw new XPathException(string.Format("XPath expression ({0}) returned more than one node", xPath));
                 }
 
-                XObject selectedDatum = selectedData.First(); 
-                
-                if (selectedDatum is XElement) return ((XElement) selectedDatum).Value;
+                XObject selectedDatum = selectedData.First();
+
+                if (selectedDatum is XElement) return ((XElement)selectedDatum).Value;
 
-                if (selectedDatum is XAttribute) return ((XAttribute) selectedDatum).Value;
+                if (selectedDatum is XAttribute) return ((XAttribute)selectedDatum).Value;
             }
 
             return xPathSelectResult.ToString();

OpenXmlPowerTools/GlobalSuppressions.cs

@@ -0,0 +1,20 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+[assembly: SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1004:Documentation lines should begin with single space", Justification = "<挂起>")]
+[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1612:Element parameter documentation should match element parameters", Justification = "<挂起>")]
+[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1616:Element return value documentation should have text", Justification = "<挂起>")]
+[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1617:Void return value should not be documented", Justification = "<挂起>")]
+[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1614:Element parameter documentation should have text", Justification = "<挂起>")]
+[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1627:Documentation text should not be empty", Justification = "<挂起>")]
+[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1606:Element documentation should have summary text", Justification = "<挂起>")]
+[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1629:Documentation text should end with a period", Justification = "<挂起>")]
+[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1623:Property summary documentation should match accessors", Justification = "<挂起>")]
+[assembly: SuppressMessage("StyleCop.CSharp.LayoutRules", "SA1514:Element documentation header should be preceded by blank line", Justification = "<挂起>")]
+[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1626:Single-line comments should not use documentation style slashes", Justification = "<挂起>")]
+[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1636:File header copyright text should match", Justification = "<挂起>")]
+[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1642:Constructor summary documentation should begin with standard text", Justification = "<挂起>")]
+[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1633:File should have header", Justification = "<挂起>")]

OpenXmlPowerTools/Helpers/ImageHelper.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.IO;
+using System.Text;
+
+namespace OpenXmlPowerTools.Helpers
+{
+    public class ImageHelper
+    {
+        public static (int width, int height) GetImageMetrics(Stream imageData, ImageFormat imageFormat)
+        {
+            var width = 0;
+            var height = 0;
+
+            if (imageFormat == ImageFormat.Emf)
+            {
+                using (var metafile = new Metafile(imageData))
+                {
+                    width = metafile.Width; // 获取宽度
+                    height = metafile.Height; // 获取高度                                          
+                }
+            }
+            else
+            {
+                using (var image = Image.FromStream(imageData))
+                {
+                    width = image.Width; // 获取宽度
+                    height = image.Height; // 获取高度
+                }
+            }
+
+            return (width, height);
+        }
+
+        /// <summary>
+        /// 获取图片的宽和高
+        /// </summary>
+        /// <param name="newImagePath"></param>
+        /// <returns></returns>
+        public static (int width, int height) GetImageMetrics(string newImagePath, ImageFormat imageFormat)
+        {
+            var ext = Path.GetExtension(newImagePath).ToLower();
+            var stream = File.OpenRead(newImagePath);
+            return GetImageMetrics(stream, imageFormat);
+        }
+    }
+}