add table HeaderRowCount attribute

OpenXmlPowerTools/ChartUpdater.cs

@@ -58,6 +58,14 @@ public class ChartData
         public string[] CategoryNames;
 
         public double[][] Values;
+
+        /// <summary>
+        /// 组合图表中，第二个图表的序列索引.
+        /// 这些序列数据会被复制到第二个图表的序列中.
+        /// </summary>
+        public int[] SecondChartSeriesIndex;
+
+        public XName SecondChartType;
     }
 
     public class ChartUpdater
@@ -95,6 +103,46 @@ public static void UpdateChart(ChartPart chartPart, ChartData chartData)
             }
 
             UpdateSeries(chartPart, chartData);
+            MoveSecondChartSeries(chartPart, chartData);
+        }
+
+        /// <summary>
+        /// 移动第二图表的序列数据.
+        /// </summary>
+        /// <param name="chartPart">图表部件.</param>
+        /// <param name="chartData">图表数据.</param>
+        private static void MoveSecondChartSeries(ChartPart chartPart, ChartData chartData)
+        {
+            if (chartData.SecondChartType == null)
+            {
+                return;
+            }
+
+            if (chartData.SecondChartSeriesIndex != null && chartData.SecondChartSeriesIndex.Length == 0)
+            {
+                return;
+            }
+
+            XDocument cpXDoc = chartPart.GetXDocument();
+            XElement root = cpXDoc.Root;
+
+            // 根据配置得到序列            
+            var series = chartData.SecondChartSeriesIndex.Select(x =>
+                    root.Descendants(C.ser).ElementAt(x)
+                ).ToList();
+
+            var firstParent = series.First().Parent;
+
+            var chart = root.Descendants(chartData.SecondChartType).FirstOrDefault();
+
+            var firstSeries = chart.Descendants(C.ser).FirstOrDefault();
+            firstSeries.Parent.Elements(C.ser).Skip(1).Remove();
+
+            firstSeries.ReplaceWith(series);
+
+            // 删除旧series
+            series.Remove();
+            chartPart.PutXDocument();
         }
 
         private static Dictionary<int, string> FormatCodes = new Dictionary<int, string>()
@@ -427,7 +475,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/NugetPush.bat

@@ -0,0 +1,2 @@
+nuget push C:\Work\github\Open-Xml-PowerTools\OpenXmlPowerTools\bin\Release\*.nupkg -ApiKey 123.123a -Source http://nuget.cefcfco.com 
+pause 

OpenXmlPowerTools/OpenXmlPowerTools.csproj

@@ -1,6 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net45;net46;netstandard2.0</TargetFrameworks>
+    <Version>4.5.5</Version>
+    <Authors>yitian.chen</Authors>
+    <Company>yitian.chen</Company>
+    <PackageId>OpenXmlPowerTools-HrRd</PackageId>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <ItemGroup>
@@ -21,4 +26,8 @@
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="System.Drawing.Common" Version="4.5.0" />
   </ItemGroup>
+
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="IF NOT &quot;$(ConfigurationName)&quot;==&quot;Release&quot; EXIT /B 0&#xD;&#xA;echo nuget push $(ProjectDir)bin\Release\*.nupkg -ApiKey 123.123a -Source http://nuget.cefcfco.com &gt; NugetPush.bat&#xD;&#xA;echo pause &gt;&gt; NugetPush.bat" />
+  </Target>
 </Project>

OpenXmlPowerToolsExamples/ChartUpdater01/ChartUpdater01.cs

@@ -14,6 +14,46 @@ namespace OpenXmlPowerTools
     class Program
     {
         static void Main(string[] args)
+        {
+            // Example1();
+            TowTypeChartExample();
+        }
+
+        private static void TowTypeChartExample()
+        {
+            var fi = new FileInfo("TowTypeChart.docx");
+
+            using (var wDoc = WordprocessingDocument.Open(fi.FullName, true))
+            {
+                var chart1Data = new ChartData
+                {
+                    SecondChartType = C.lineChart,
+                    SecondChartSeriesIndex = new[] { 1 },
+                    SeriesNames = new[] {
+                            "平仓手数",
+                            "平仓盈亏-逐笔对冲",
+                        },
+                    CategoryDataType = ChartDataType.String,
+                    CategoryNames = new[] {
+                            "1:0天",
+                            "1:1天",
+                            "1:2天",
+                            "1:3天",
+                        },
+                    Values = new double[][] {
+                        new double[] {
+                            100, 310, 220, 450,
+                        },
+                        new double[] {
+                            -11323.65, 3101, -12220, 15421,
+                        },
+                    },
+                };
+                ChartUpdater.UpdateChart(wDoc, "towTypeChart", chart1Data);
+            }
+        }
+
+        private static void Example1()
         {
             var n = DateTime.Now;
             var tempDi = new DirectoryInfo(string.Format("ExampleOutput-{0:00}-{1:00}-{2:00}-{3:00}{4:00}{5:00}", n.Year - 2000, n.Month, n.Day, n.Hour, n.Minute, n.Second));

OpenXmlPowerToolsExamples/ChartUpdater01/ChartUpdater01.csproj

@@ -12,4 +12,10 @@
   <ItemGroup>
     <Reference Include="WindowsBase" />
   </ItemGroup>
+
+  <ItemGroup>
+    <None Update="TowTypeChart.docx">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 </Project>

OpenXmlPowerToolsExamples/DocumentAssembler02/Data.xml

@@ -15,4 +15,21 @@
       <OrderDate>September 26, 2001</OrderDate>
     </Order>
   </Orders>
+  <Items>
+    <Item>
+      <Name>Items1</Name>
+      <MinCount>1</MinCount>
+      <MaxCount>10</MaxCount>
+    </Item>
+    <Item>
+      <Name>Items2</Name>
+      <MinCount>2</MinCount>
+      <MaxCount>15</MaxCount>
+    </Item>
+    <Item>
+      <Name>Items3</Name>
+      <MinCount>3</MinCount>
+      <MaxCount>30</MaxCount>
+    </Item>
+  </Items>
 </Customer>