From 233edb1ebb4139cced1006c920ee48e47e5750f4 Mon Sep 17 00:00:00 2001 From: "yitian.chen" <48295852@qq.com> Date: Thu, 16 Jul 2020 18:06:05 +0800 Subject: [PATCH 01/20] add table HeaderRowCount attribute --- OpenXmlPowerTools/DocumentAssembler.cs | 49 +++++++++++------- .../DocumentAssembler02/Data.xml | 17 ++++++ .../DocumentAssembler02/TemplateDocument.docx | Bin 14124 -> 17929 bytes 3 files changed, 48 insertions(+), 18 deletions(-) diff --git a/OpenXmlPowerTools/DocumentAssembler.cs b/OpenXmlPowerTools/DocumentAssembler.cs index f4d9673e..1a1f724d 100644 --- a/OpenXmlPowerTools/DocumentAssembler.cs +++ b/OpenXmlPowerTools/DocumentAssembler.cs @@ -483,6 +483,7 @@ private static string ValidatePerSchema(XElement element) + ", @@ -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 list = new List(); - 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(); + var selectedData = ((IEnumerable)xPathSelectResult).Cast(); 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(); diff --git a/OpenXmlPowerToolsExamples/DocumentAssembler02/Data.xml b/OpenXmlPowerToolsExamples/DocumentAssembler02/Data.xml index 64cc21e5..2ab6983a 100644 --- a/OpenXmlPowerToolsExamples/DocumentAssembler02/Data.xml +++ b/OpenXmlPowerToolsExamples/DocumentAssembler02/Data.xml @@ -15,4 +15,21 @@ September 26, 2001 + + + Items1 + 1 + 10 + + + Items2 + 2 + 15 + + + Items3 + 3 + 30 + + \ No newline at end of file diff --git a/OpenXmlPowerToolsExamples/DocumentAssembler02/TemplateDocument.docx b/OpenXmlPowerToolsExamples/DocumentAssembler02/TemplateDocument.docx index 45e8c9948beddf2ad581c4b1a0db736ad02a8b9d..3b45793a3b46bbeddd53f4d80fa8af7e1411b941 100644 GIT binary patch delta 13479 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 delta 9745 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 F{{XOgH(3Ax From 6ea34d8f64567b9200f5a422e41728d626483306 Mon Sep 17 00:00:00 2001 From: "yitian.chen" <48295852@qq.com> Date: Fri, 17 Jul 2020 14:45:14 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=8C=85=E5=88=B0?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0nuget?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenXmlPowerTools/NugetPush.bat | 2 ++ OpenXmlPowerTools/OpenXmlPowerTools.csproj | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 OpenXmlPowerTools/NugetPush.bat diff --git a/OpenXmlPowerTools/NugetPush.bat b/OpenXmlPowerTools/NugetPush.bat new file mode 100644 index 00000000..bb653544 --- /dev/null +++ b/OpenXmlPowerTools/NugetPush.bat @@ -0,0 +1,2 @@ +nuget push bin\Release\*.nupkg -ApiKey 123.123a -Source http://nuget.cefcfco.com +pause diff --git a/OpenXmlPowerTools/OpenXmlPowerTools.csproj b/OpenXmlPowerTools/OpenXmlPowerTools.csproj index c7220506..e3398957 100644 --- a/OpenXmlPowerTools/OpenXmlPowerTools.csproj +++ b/OpenXmlPowerTools/OpenXmlPowerTools.csproj @@ -1,6 +1,10 @@  net45;net46;netstandard2.0 + 4.5.4 + yitian.chen + yitian.chen + OpenXmlPowerTools-HrRd From a8b6601f09c59409c5383d8744ef7502b373b652 Mon Sep 17 00:00:00 2001 From: "yitian.chen" <48295852@qq.com> Date: Fri, 30 Oct 2020 15:40:59 +0800 Subject: [PATCH 03/20] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=84=E5=90=88?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E7=9A=84=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChartUpdater01/ChartUpdater01.cs | 59 ++++++++++++++++++ .../ChartUpdater01/ChartUpdater01.csproj | 8 ++- .../ChartUpdater01/TowTypeChart.docx | Bin 0 -> 45664 bytes 3 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 OpenXmlPowerToolsExamples/ChartUpdater01/TowTypeChart.docx diff --git a/OpenXmlPowerToolsExamples/ChartUpdater01/ChartUpdater01.cs b/OpenXmlPowerToolsExamples/ChartUpdater01/ChartUpdater01.cs index 5811c0e4..b3e73ee3 100644 --- a/OpenXmlPowerToolsExamples/ChartUpdater01/ChartUpdater01.cs +++ b/OpenXmlPowerToolsExamples/ChartUpdater01/ChartUpdater01.cs @@ -14,6 +14,65 @@ 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 chart2Data = new ChartData + { + ChartType = C.lineChart, + 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", chart2Data); + + var chart1Data = new ChartData + { + SeriesNames = new[] { + "平仓手数", + }, + CategoryDataType = ChartDataType.String, + CategoryNames = new[] { + "1:0天", + "1:1天", + "1:2天", + "1:3天", + }, + Values = new double[][] { + new double[] { + 100, 310, 220, 450, + }, + }, + }; + 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)); diff --git a/OpenXmlPowerToolsExamples/ChartUpdater01/ChartUpdater01.csproj b/OpenXmlPowerToolsExamples/ChartUpdater01/ChartUpdater01.csproj index e188d465..b36deab2 100644 --- a/OpenXmlPowerToolsExamples/ChartUpdater01/ChartUpdater01.csproj +++ b/OpenXmlPowerToolsExamples/ChartUpdater01/ChartUpdater01.csproj @@ -1,4 +1,4 @@ - + Exe net45;net46;netcoreapp2.0 @@ -12,4 +12,10 @@ + + + + PreserveNewest + + \ No newline at end of file diff --git a/OpenXmlPowerToolsExamples/ChartUpdater01/TowTypeChart.docx b/OpenXmlPowerToolsExamples/ChartUpdater01/TowTypeChart.docx new file mode 100644 index 0000000000000000000000000000000000000000..5e4ae53213cc256e856406b8477a38c57d0ec12d GIT binary patch literal 45664 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
  • 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 literal 0 HcmV?d00001 From cd07a0500249873c514d793787c1163177606c60 Mon Sep 17 00:00:00 2001 From: "yitian.chen" <48295852@qq.com> Date: Fri, 30 Oct 2020 16:39:11 +0800 Subject: [PATCH 04/20] =?UTF-8?q?=E4=BC=98=E5=8C=96MoveSecondChartSeries?= =?UTF-8?q?=E5=90=8E=E4=BF=AE=E6=94=B9=E6=97=A7series=E7=9A=84=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenXmlPowerTools/ChartUpdater.cs | 50 ++++++++++++++++++- .../ChartUpdater01/ChartUpdater01.cs | 25 ++-------- .../ChartUpdater01/ChartUpdater01.csproj | 4 +- 3 files changed, 54 insertions(+), 25 deletions(-) diff --git a/OpenXmlPowerTools/ChartUpdater.cs b/OpenXmlPowerTools/ChartUpdater.cs index 79b0f74b..19749e63 100644 --- a/OpenXmlPowerTools/ChartUpdater.cs +++ b/OpenXmlPowerTools/ChartUpdater.cs @@ -58,6 +58,14 @@ public class ChartData public string[] CategoryNames; public double[][] Values; + + /// + /// 组合图表中，第二个图表的序列索引 + /// 这些序列数据会被复制到第二个图表的序列中 + /// + 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); + } + + /// + /// 移动第二图表的序列数据 + /// + /// + /// + 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 FormatCodes = new Dictionary() @@ -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, diff --git a/OpenXmlPowerToolsExamples/ChartUpdater01/ChartUpdater01.cs b/OpenXmlPowerToolsExamples/ChartUpdater01/ChartUpdater01.cs index b3e73ee3..cf4a2027 100644 --- a/OpenXmlPowerToolsExamples/ChartUpdater01/ChartUpdater01.cs +++ b/OpenXmlPowerToolsExamples/ChartUpdater01/ChartUpdater01.cs @@ -25,9 +25,10 @@ private static void TowTypeChartExample() using (var wDoc = WordprocessingDocument.Open(fi.FullName, true)) { - var chart2Data = new ChartData + var chart1Data = new ChartData { - ChartType = C.lineChart, + SecondChartType = C.lineChart, + SecondChartSeriesIndex = new[] { 1 }, SeriesNames = new[] { "平仓手数", "平仓盈亏-逐笔对冲", @@ -48,26 +49,6 @@ private static void TowTypeChartExample() }, }, }; - ChartUpdater.UpdateChart(wDoc, "towTypeChart", chart2Data); - - var chart1Data = new ChartData - { - SeriesNames = new[] { - "平仓手数", - }, - CategoryDataType = ChartDataType.String, - CategoryNames = new[] { - "1:0天", - "1:1天", - "1:2天", - "1:3天", - }, - Values = new double[][] { - new double[] { - 100, 310, 220, 450, - }, - }, - }; ChartUpdater.UpdateChart(wDoc, "towTypeChart", chart1Data); } } diff --git a/OpenXmlPowerToolsExamples/ChartUpdater01/ChartUpdater01.csproj b/OpenXmlPowerToolsExamples/ChartUpdater01/ChartUpdater01.csproj index b36deab2..5bd48a12 100644 --- a/OpenXmlPowerToolsExamples/ChartUpdater01/ChartUpdater01.csproj +++ b/OpenXmlPowerToolsExamples/ChartUpdater01/ChartUpdater01.csproj @@ -1,4 +1,4 @@ - + Exe net45;net46;netcoreapp2.0 @@ -15,7 +15,7 @@ - PreserveNewest + Always \ No newline at end of file From 691d2f26fd7e98abc7617ba3652ee11799dfa4ed Mon Sep 17 00:00:00 2001 From: "yitian.chen" <48295852@qq.com> Date: Fri, 30 Oct 2020 17:10:04 +0800 Subject: [PATCH 05/20] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8C=85?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenXmlPowerTools/ChartUpdater.cs | 10 +++++----- OpenXmlPowerTools/NugetPush.bat | 2 +- OpenXmlPowerTools/OpenXmlPowerTools.csproj | 7 ++++++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/OpenXmlPowerTools/ChartUpdater.cs b/OpenXmlPowerTools/ChartUpdater.cs index 19749e63..61003cb7 100644 --- a/OpenXmlPowerTools/ChartUpdater.cs +++ b/OpenXmlPowerTools/ChartUpdater.cs @@ -60,8 +60,8 @@ public class ChartData public double[][] Values; /// - /// 组合图表中，第二个图表的序列索引 - /// 这些序列数据会被复制到第二个图表的序列中 + /// 组合图表中，第二个图表的序列索引. + /// 这些序列数据会被复制到第二个图表的序列中. /// public int[] SecondChartSeriesIndex; @@ -107,10 +107,10 @@ public static void UpdateChart(ChartPart chartPart, ChartData chartData) } /// - /// 移动第二图表的序列数据 + /// 移动第二图表的序列数据. /// - /// - /// + /// 图表部件. + /// 图表数据. private static void MoveSecondChartSeries(ChartPart chartPart, ChartData chartData) { if (chartData.SecondChartType == null) diff --git a/OpenXmlPowerTools/NugetPush.bat b/OpenXmlPowerTools/NugetPush.bat index bb653544..b9cf2dc8 100644 --- a/OpenXmlPowerTools/NugetPush.bat +++ b/OpenXmlPowerTools/NugetPush.bat @@ -1,2 +1,2 @@ -nuget push bin\Release\*.nupkg -ApiKey 123.123a -Source http://nuget.cefcfco.com +nuget push C:\Work\github\Open-Xml-PowerTools\OpenXmlPowerTools\bin\Release\*.nupkg -ApiKey 123.123a -Source http://nuget.cefcfco.com pause diff --git a/OpenXmlPowerTools/OpenXmlPowerTools.csproj b/OpenXmlPowerTools/OpenXmlPowerTools.csproj index e3398957..60b12d05 100644 --- a/OpenXmlPowerTools/OpenXmlPowerTools.csproj +++ b/OpenXmlPowerTools/OpenXmlPowerTools.csproj @@ -1,10 +1,11 @@  net45;net46;netstandard2.0 - 4.5.4 + 4.5.5 yitian.chen yitian.chen OpenXmlPowerTools-HrRd + true @@ -25,4 +26,8 @@ + + + + \ No newline at end of file From c993302450af20b28215f0ccc60dd62583a5c971 Mon Sep 17 00:00:00 2001 From: "yitian.chen" <48295852@qq.com> Date: Tue, 17 Nov 2020 15:43:25 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=AC=AC=E4=BA=8C?= =?UTF-8?q?=E5=9D=90=E6=A0=87=E8=BD=B4=E4=B8=BA=E6=8A=98=E7=BA=BF=E5=9B=BE?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E4=B8=8D=E5=B1=95=E7=A4=BA=E7=BA=BF=E6=9D=A1?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenXmlPowerTools/ChartUpdater.cs | 14 ++++++++++++++ .../MarkupSimplifierApp/MarkupSimplifierApp.csproj | 4 +--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/OpenXmlPowerTools/ChartUpdater.cs b/OpenXmlPowerTools/ChartUpdater.cs index 61003cb7..c2f900be 100644 --- a/OpenXmlPowerTools/ChartUpdater.cs +++ b/OpenXmlPowerTools/ChartUpdater.cs @@ -138,6 +138,20 @@ private static void MoveSecondChartSeries(ChartPart chartPart, ChartData chartDa var firstSeries = chart.Descendants(C.ser).FirstOrDefault(); firstSeries.Parent.Elements(C.ser).Skip(1).Remove(); + // 如果第二坐标轴为折线图，那么让它正确显示 + if (chartData.SecondChartType == C.lineChart) + { + series.ForEach(x => + { + var spPrs = x.Descendants(C.spPr); + spPrs.Remove(); + + var smooth = new XElement(C.smooth); + smooth.SetAttributeValue(C.val, "0"); + x.Add(smooth); + }); + } + firstSeries.ReplaceWith(series); // 删除旧series diff --git a/OpenXmlPowerToolsExamples/MarkupSimplifierApp/MarkupSimplifierApp.csproj b/OpenXmlPowerToolsExamples/MarkupSimplifierApp/MarkupSimplifierApp.csproj index 90ae7ebe..ff153d40 100644 --- a/OpenXmlPowerToolsExamples/MarkupSimplifierApp/MarkupSimplifierApp.csproj +++ b/OpenXmlPowerToolsExamples/MarkupSimplifierApp/MarkupSimplifierApp.csproj @@ -15,9 +15,7 @@ - - Form - + Form From f5b3ede3e3b7f26e0c70ea77b83f32f8b3932eee Mon Sep 17 00:00:00 2001 From: "yitian.chen" <48295852@qq.com> Date: Tue, 17 Nov 2020 15:52:45 +0800 Subject: [PATCH 07/20] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E6=AC=A1?= =?UTF-8?q?=E7=BA=A7=E5=9D=90=E6=A0=87=E8=BD=B4=E4=B8=BA=E6=8A=98=E7=BA=BF?= =?UTF-8?q?=E5=9B=BE=E6=97=B6=EF=BC=8C=E7=BA=BF=E6=9D=A1=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenXmlPowerTools/OpenXmlPowerTools.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenXmlPowerTools/OpenXmlPowerTools.csproj b/OpenXmlPowerTools/OpenXmlPowerTools.csproj index 60b12d05..38d8e9a8 100644 --- a/OpenXmlPowerTools/OpenXmlPowerTools.csproj +++ b/OpenXmlPowerTools/OpenXmlPowerTools.csproj @@ -1,7 +1,7 @@  net45;net46;netstandard2.0 - 4.5.5 + 4.5.6 yitian.chen yitian.chen OpenXmlPowerTools-HrRd From f219e4c2ceaef36c37c467d019babe22094f6c53 Mon Sep 17 00:00:00 2001 From: "yitian.chen" <48295852@qq.com> Date: Mon, 16 Aug 2021 17:10:57 +0800 Subject: [PATCH 08/20] remove build script for local nuget server --- OpenXmlPowerTools/OpenXmlPowerTools.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/OpenXmlPowerTools/OpenXmlPowerTools.csproj b/OpenXmlPowerTools/OpenXmlPowerTools.csproj index 38d8e9a8..95ac31b4 100644 --- a/OpenXmlPowerTools/OpenXmlPowerTools.csproj +++ b/OpenXmlPowerTools/OpenXmlPowerTools.csproj @@ -26,8 +26,4 @@ - - - - \ No newline at end of file From 1594363bf12d744d7e7de25b0bb790a977effb5a Mon Sep 17 00:00:00 2001 From: "yitian.chen" <48295852@qq.com> Date: Wed, 19 Apr 2023 16:16:33 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=AC=A1=E8=BD=B4?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E5=B1=95=E7=A4=BA=E4=B8=8D=E4=BA=89=E5=8F=96?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenXmlPowerTools/ChartUpdater.cs | 99 +++++++++------------- OpenXmlPowerTools/OpenXmlPowerTools.csproj | 2 +- 2 files changed, 43 insertions(+), 58 deletions(-) diff --git a/OpenXmlPowerTools/ChartUpdater.cs b/OpenXmlPowerTools/ChartUpdater.cs index c2f900be..dbcdad42 100644 --- a/OpenXmlPowerTools/ChartUpdater.cs +++ b/OpenXmlPowerTools/ChartUpdater.cs @@ -63,7 +63,7 @@ public class ChartData /// 组合图表中，第二个图表的序列索引. /// 这些序列数据会被复制到第二个图表的序列中. /// - public int[] SecondChartSeriesIndex; + public Dictionary SecondChartSeriesNames { get; set; } = new Dictionary(); public XName SecondChartType; } @@ -102,61 +102,14 @@ public static void UpdateChart(ChartPart chartPart, ChartData chartData) throw new ArgumentException("Invalid chart data"); } - UpdateSeries(chartPart, chartData); - MoveSecondChartSeries(chartPart, chartData); - } - - /// - /// 移动第二图表的序列数据. - /// - /// 图表部件. - /// 图表数据. - 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(); + UpdateEmbeddedWorkbook(chartPart, chartData); - // 如果第二坐标轴为折线图，那么让它正确显示 - if (chartData.SecondChartType == C.lineChart) + UpdateSeries(chartPart, chartData); + //如果设置了次轴，更新次轴 + if (chartData.SecondChartSeriesNames.Count > 0) { - series.ForEach(x => - { - var spPrs = x.Descendants(C.spPr); - spPrs.Remove(); - - var smooth = new XElement(C.smooth); - smooth.SetAttributeValue(C.val, "0"); - x.Add(smooth); - }); + UpdateSeries(chartPart, chartData, true); } - - firstSeries.ReplaceWith(series); - - // 删除旧series - series.Remove(); - chartPart.PutXDocument(); } private static Dictionary FormatCodes = new Dictionary() @@ -191,13 +144,38 @@ private static void MoveSecondChartSeries(ChartPart chartPart, ChartData chartDa { 49, "@" }, }; - private static void UpdateSeries(ChartPart chartPart, ChartData chartData) + /// + /// + /// + /// + /// + /// 设置次级坐标，默认为false + /// + 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(); + } + else // 处理次轴 + { + series = series.Where(x => x.Descendants(C.tx).SelectMany(tx => tx.Descendants(C.v)).Any(v => chartData.SecondChartSeriesNames.Values.Contains(v.Value))).ToList(); + } + + 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(); @@ -213,6 +191,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"); @@ -441,6 +422,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(); } diff --git a/OpenXmlPowerTools/OpenXmlPowerTools.csproj b/OpenXmlPowerTools/OpenXmlPowerTools.csproj index 95ac31b4..634d6e6e 100644 --- a/OpenXmlPowerTools/OpenXmlPowerTools.csproj +++ b/OpenXmlPowerTools/OpenXmlPowerTools.csproj @@ -1,6 +1,6 @@  - net45;net46;netstandard2.0 + netstandard2.0 4.5.6 yitian.chen yitian.chen From efa7bfb7b9099b460791c237da79c90f62e0e409 Mon Sep 17 00:00:00 2001 From: "yitian.chen" <48295852@qq.com> Date: Wed, 19 Apr 2023 16:48:36 +0800 Subject: [PATCH 10/20] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 4 + OpenXmlPowerTools.sln | 246 +----------------- OpenXmlPowerTools/GlobalSuppressions.cs | 18 ++ OpenXmlPowerTools/NugetPush.bat | 4 +- OpenXmlPowerTools/OpenXmlPowerTools.csproj | 2 +- .../DocumentBuilder01.csproj | 3 + 6 files changed, 31 insertions(+), 246 deletions(-) create mode 100644 .editorconfig create mode 100644 OpenXmlPowerTools/GlobalSuppressions.cs diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..cd7c902d --- /dev/null +++ b/.editorconfig @@ -0,0 +1,4 @@ +[*.cs] + +# SA1626: Single-line comments should not use documentation style slashes +dotnet_diagnostic.SA1626.severity = suggestion diff --git a/OpenXmlPowerTools.sln b/OpenXmlPowerTools.sln index 806dc01e..f076c94a 100644 --- a/OpenXmlPowerTools.sln +++ b/OpenXmlPowerTools.sln @@ -1,82 +1,13 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2036 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.33530.505 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenXmlPowerTools", "OpenXmlPowerTools\OpenXmlPowerTools.csproj", "{6F957FF3-AFCC-4D69-8FBC-71AE21BC45C9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChartUpdater01", "OpenXmlPowerToolsExamples\ChartUpdater01\ChartUpdater01.csproj", "{1B03D24F-FB08-42E1-BB25-2D1BB907991B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocumentBuilder01", "OpenXmlPowerToolsExamples\DocumentBuilder01\DocumentBuilder01.csproj", "{A8A6FCF0-CA4F-4637-8E66-D86603B92204}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocumentBuilder02", "OpenXmlPowerToolsExamples\DocumentBuilder02\DocumentBuilder02.csproj", "{BF8153AA-C390-4D00-98F2-083DEFEC7094}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocumentBuilder03", "OpenXmlPowerToolsExamples\DocumentBuilder03\DocumentBuilder03.csproj", "{BE635672-D3FD-42C5-96E3-EDE50E05CE29}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocumentBuilder04", "OpenXmlPowerToolsExamples\DocumentBuilder04\DocumentBuilder04.csproj", "{CE0ECABB-03AD-42CE-A5BD-D0CC4DCE35AB}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FieldRetriever01", "OpenXmlPowerToolsExamples\FieldRetriever01\FieldRetriever01.csproj", "{E1FD7B15-FA09-4F7F-A30E-9FBD9F765D02}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FormattingAssembler01", "OpenXmlPowerToolsExamples\FormattingAssembler01\FormattingAssembler01.csproj", "{6EAF15B6-98BE-428B-A018-A5266521551E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Formulas01", "OpenXmlPowerToolsExamples\Formulas01\Formulas01.csproj", "{618B95DB-3A70-4DC8-BD87-00F636F72453}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HtmlConverter01", "OpenXmlPowerToolsExamples\HtmlConverter01\HtmlConverter01.csproj", "{BC9E7408-508D-482D-8602-96E76ACBB5EA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ListItemRetriever01", "OpenXmlPowerToolsExamples\ListItemRetriever01\ListItemRetriever01.csproj", "{04935FA6-E48B-496F-8D6A-41A59232303D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MarkupSimplifierApp", "OpenXmlPowerToolsExamples\MarkupSimplifierApp\MarkupSimplifierApp.csproj", "{0CCE83BA-8B8B-4B98-8846-B62A61FDF170}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MetricsGetter01", "OpenXmlPowerToolsExamples\MetricsGetter01\MetricsGetter01.csproj", "{ED37372C-DFBF-4720-BD4B-CE1415961038}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenXmlRegex01", "OpenXmlPowerToolsExamples\OpenXmlRegex01\OpenXmlRegex01.csproj", "{4330D46F-6703-4BA2-844D-177F722C0820}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PivotTables01", "OpenXmlPowerToolsExamples\PivotTables01\PivotTables01.csproj", "{6785A554-BBBB-480C-8E4D-9FE90DD91A46}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PresentationBuilder01", "OpenXmlPowerToolsExamples\PresentationBuilder01\PresentationBuilder01.csproj", "{A4128935-B707-4D56-B924-27910EC92664}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PresentationBuilder02", "OpenXmlPowerToolsExamples\PresentationBuilder02\PresentationBuilder02.csproj", "{495060B4-BD80-4B18-AC44-4680F0D6D5DB}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReferenceAdder01", "OpenXmlPowerToolsExamples\ReferenceAdder01\ReferenceAdder01.csproj", "{211F05D3-F8EE-497F-9DE9-AFFA0A72140D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RevisionAccepter01", "OpenXmlPowerToolsExamples\RevisionAccepter01\RevisionAccepter01.csproj", "{84823BA5-B860-4CAF-885E-981D7F121830}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TextReplacer01", "OpenXmlPowerToolsExamples\TextReplacer01\TextReplacer01.csproj", "{5CA29B44-C4A5-4310-9429-553F0BC9FC1D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TextReplacer02", "OpenXmlPowerToolsExamples\TextReplacer02\TextReplacer02.csproj", "{153E5218-E9C0-4ED8-9073-0802204C8B90}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocumentAssembler01", "OpenXmlPowerToolsExamples\DocumentAssembler01\DocumentAssembler01.csproj", "{EFE77658-EDD7-4597-8016-CBE4A18951B0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocumentAssembler", "OpenXmlPowerToolsExamples\DocumentAssembler\DocumentAssembler.csproj", "{2D081A36-48F9-4A09-8247-420682545492}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SpreadsheetWriter01", "OpenXmlPowerToolsExamples\SpreadsheetWriter01\SpreadsheetWriter01.csproj", "{0911F996-DF86-4FB1-A1CE-0539599EC0E0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SpreadsheetWriter02", "OpenXmlPowerToolsExamples\SpreadsheetWriter02\SpreadsheetWriter02.csproj", "{DF1D84AF-27B8-4F87-A673-CCFADC3AAF02}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenXmlPowerTools.Tests", "OpenXmlPowerTools.Tests\OpenXmlPowerTools.Tests.csproj", "{B1328B70-33B8-40E0-A729-38C34D659B5C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocumentAssembler02", "OpenXmlPowerToolsExamples\DocumentAssembler02\DocumentAssembler02.csproj", "{D6DFAC7C-82F4-4318-A9F0-6450D2945D96}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HtmlToWmlConverter01", "OpenXmlPowerToolsExamples\HtmlToWmlConverter01\HtmlToWmlConverter01.csproj", "{9E194D13-F5A0-4430-8F87-D74326457385}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocumentAssembler03", "OpenXmlPowerToolsExamples\DocumentAssembler03\DocumentAssembler03.csproj", "{214F0E80-D2E3-4E19-A3FC-2BE15B3906B0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HtmlToWmlConverter02", "OpenXmlPowerToolsExamples\HtmlToWmlConverter02\HtmlToWmlConverter02.csproj", "{1E75CB7D-2A4A-4B03-80A9-7B7D59B18BB4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WmlToHtmlConverter01", "OpenXmlPowerToolsExamples\WmlToHtmlConverter01\WmlToHtmlConverter01.csproj", "{396D9209-0D9A-4E61-9471-04C71F6CA6B9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WmlToHtmlConverter02", "OpenXmlPowerToolsExamples\WmlToHtmlConverter02\WmlToHtmlConverter02.csproj", "{D4078011-2611-46A7-8A30-55E4AB8FA786}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmlDataRetriever01", "OpenXmlPowerToolsExamples\SmlDataRetriever01\SmlDataRetriever01.csproj", "{DCE8EC51-1E58-49A0-82CF-5BE269FA0A9D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WmlComparer01", "OpenXmlPowerToolsExamples\WmlComparer01\WmlComparer01.csproj", "{C9CAA69C-575A-442E-9D8A-69C53B39D72C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WmlComparer02", "OpenXmlPowerToolsExamples\WmlComparer02\WmlComparer02.csproj", "{3D1C46E1-7A9E-4A4B-8D95-68613603DEDF}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{A83D6B58-6D38-46AF-8C20-5CFC170A1063}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9AFB8C96-1E6E-483E-9882-75D2483E7076}" ProjectSection(SolutionItems) = preProject + .editorconfig = .editorconfig Directory.Build.props = Directory.Build.props Directory.Build.targets = Directory.Build.targets LICENSE.txt = LICENSE.txt @@ -95,181 +26,10 @@ Global {6F957FF3-AFCC-4D69-8FBC-71AE21BC45C9}.Debug|Any CPU.Build.0 = Debug|Any CPU {6F957FF3-AFCC-4D69-8FBC-71AE21BC45C9}.Release|Any CPU.ActiveCfg = Release|Any CPU {6F957FF3-AFCC-4D69-8FBC-71AE21BC45C9}.Release|Any CPU.Build.0 = Release|Any CPU - {1B03D24F-FB08-42E1-BB25-2D1BB907991B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1B03D24F-FB08-42E1-BB25-2D1BB907991B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1B03D24F-FB08-42E1-BB25-2D1BB907991B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1B03D24F-FB08-42E1-BB25-2D1BB907991B}.Release|Any CPU.Build.0 = Release|Any CPU - {A8A6FCF0-CA4F-4637-8E66-D86603B92204}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A8A6FCF0-CA4F-4637-8E66-D86603B92204}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A8A6FCF0-CA4F-4637-8E66-D86603B92204}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A8A6FCF0-CA4F-4637-8E66-D86603B92204}.Release|Any CPU.Build.0 = Release|Any CPU - {BF8153AA-C390-4D00-98F2-083DEFEC7094}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF8153AA-C390-4D00-98F2-083DEFEC7094}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF8153AA-C390-4D00-98F2-083DEFEC7094}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF8153AA-C390-4D00-98F2-083DEFEC7094}.Release|Any CPU.Build.0 = Release|Any CPU - {BE635672-D3FD-42C5-96E3-EDE50E05CE29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE635672-D3FD-42C5-96E3-EDE50E05CE29}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE635672-D3FD-42C5-96E3-EDE50E05CE29}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE635672-D3FD-42C5-96E3-EDE50E05CE29}.Release|Any CPU.Build.0 = Release|Any CPU - {CE0ECABB-03AD-42CE-A5BD-D0CC4DCE35AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE0ECABB-03AD-42CE-A5BD-D0CC4DCE35AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE0ECABB-03AD-42CE-A5BD-D0CC4DCE35AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE0ECABB-03AD-42CE-A5BD-D0CC4DCE35AB}.Release|Any CPU.Build.0 = Release|Any CPU - {E1FD7B15-FA09-4F7F-A30E-9FBD9F765D02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1FD7B15-FA09-4F7F-A30E-9FBD9F765D02}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1FD7B15-FA09-4F7F-A30E-9FBD9F765D02}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1FD7B15-FA09-4F7F-A30E-9FBD9F765D02}.Release|Any CPU.Build.0 = Release|Any CPU - {6EAF15B6-98BE-428B-A018-A5266521551E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6EAF15B6-98BE-428B-A018-A5266521551E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6EAF15B6-98BE-428B-A018-A5266521551E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6EAF15B6-98BE-428B-A018-A5266521551E}.Release|Any CPU.Build.0 = Release|Any CPU - {618B95DB-3A70-4DC8-BD87-00F636F72453}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {618B95DB-3A70-4DC8-BD87-00F636F72453}.Debug|Any CPU.Build.0 = Debug|Any CPU - {618B95DB-3A70-4DC8-BD87-00F636F72453}.Release|Any CPU.ActiveCfg = Release|Any CPU - {618B95DB-3A70-4DC8-BD87-00F636F72453}.Release|Any CPU.Build.0 = Release|Any CPU - {BC9E7408-508D-482D-8602-96E76ACBB5EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BC9E7408-508D-482D-8602-96E76ACBB5EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BC9E7408-508D-482D-8602-96E76ACBB5EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BC9E7408-508D-482D-8602-96E76ACBB5EA}.Release|Any CPU.Build.0 = Release|Any CPU - {04935FA6-E48B-496F-8D6A-41A59232303D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04935FA6-E48B-496F-8D6A-41A59232303D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04935FA6-E48B-496F-8D6A-41A59232303D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04935FA6-E48B-496F-8D6A-41A59232303D}.Release|Any CPU.Build.0 = Release|Any CPU - {0CCE83BA-8B8B-4B98-8846-B62A61FDF170}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0CCE83BA-8B8B-4B98-8846-B62A61FDF170}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0CCE83BA-8B8B-4B98-8846-B62A61FDF170}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0CCE83BA-8B8B-4B98-8846-B62A61FDF170}.Release|Any CPU.Build.0 = Release|Any CPU - {ED37372C-DFBF-4720-BD4B-CE1415961038}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ED37372C-DFBF-4720-BD4B-CE1415961038}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ED37372C-DFBF-4720-BD4B-CE1415961038}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ED37372C-DFBF-4720-BD4B-CE1415961038}.Release|Any CPU.Build.0 = Release|Any CPU - {4330D46F-6703-4BA2-844D-177F722C0820}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4330D46F-6703-4BA2-844D-177F722C0820}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4330D46F-6703-4BA2-844D-177F722C0820}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4330D46F-6703-4BA2-844D-177F722C0820}.Release|Any CPU.Build.0 = Release|Any CPU - {6785A554-BBBB-480C-8E4D-9FE90DD91A46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6785A554-BBBB-480C-8E4D-9FE90DD91A46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6785A554-BBBB-480C-8E4D-9FE90DD91A46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6785A554-BBBB-480C-8E4D-9FE90DD91A46}.Release|Any CPU.Build.0 = Release|Any CPU - {A4128935-B707-4D56-B924-27910EC92664}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4128935-B707-4D56-B924-27910EC92664}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4128935-B707-4D56-B924-27910EC92664}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4128935-B707-4D56-B924-27910EC92664}.Release|Any CPU.Build.0 = Release|Any CPU - {495060B4-BD80-4B18-AC44-4680F0D6D5DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {495060B4-BD80-4B18-AC44-4680F0D6D5DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {495060B4-BD80-4B18-AC44-4680F0D6D5DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {495060B4-BD80-4B18-AC44-4680F0D6D5DB}.Release|Any CPU.Build.0 = Release|Any CPU - {211F05D3-F8EE-497F-9DE9-AFFA0A72140D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {211F05D3-F8EE-497F-9DE9-AFFA0A72140D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {211F05D3-F8EE-497F-9DE9-AFFA0A72140D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {211F05D3-F8EE-497F-9DE9-AFFA0A72140D}.Release|Any CPU.Build.0 = Release|Any CPU - {84823BA5-B860-4CAF-885E-981D7F121830}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {84823BA5-B860-4CAF-885E-981D7F121830}.Debug|Any CPU.Build.0 = Debug|Any CPU - {84823BA5-B860-4CAF-885E-981D7F121830}.Release|Any CPU.ActiveCfg = Release|Any CPU - {84823BA5-B860-4CAF-885E-981D7F121830}.Release|Any CPU.Build.0 = Release|Any CPU - {5CA29B44-C4A5-4310-9429-553F0BC9FC1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5CA29B44-C4A5-4310-9429-553F0BC9FC1D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5CA29B44-C4A5-4310-9429-553F0BC9FC1D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5CA29B44-C4A5-4310-9429-553F0BC9FC1D}.Release|Any CPU.Build.0 = Release|Any CPU - {153E5218-E9C0-4ED8-9073-0802204C8B90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {153E5218-E9C0-4ED8-9073-0802204C8B90}.Debug|Any CPU.Build.0 = Debug|Any CPU - {153E5218-E9C0-4ED8-9073-0802204C8B90}.Release|Any CPU.ActiveCfg = Release|Any CPU - {153E5218-E9C0-4ED8-9073-0802204C8B90}.Release|Any CPU.Build.0 = Release|Any CPU - {EFE77658-EDD7-4597-8016-CBE4A18951B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EFE77658-EDD7-4597-8016-CBE4A18951B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EFE77658-EDD7-4597-8016-CBE4A18951B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EFE77658-EDD7-4597-8016-CBE4A18951B0}.Release|Any CPU.Build.0 = Release|Any CPU - {2D081A36-48F9-4A09-8247-420682545492}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D081A36-48F9-4A09-8247-420682545492}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D081A36-48F9-4A09-8247-420682545492}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D081A36-48F9-4A09-8247-420682545492}.Release|Any CPU.Build.0 = Release|Any CPU - {0911F996-DF86-4FB1-A1CE-0539599EC0E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0911F996-DF86-4FB1-A1CE-0539599EC0E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0911F996-DF86-4FB1-A1CE-0539599EC0E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0911F996-DF86-4FB1-A1CE-0539599EC0E0}.Release|Any CPU.Build.0 = Release|Any CPU - {DF1D84AF-27B8-4F87-A673-CCFADC3AAF02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DF1D84AF-27B8-4F87-A673-CCFADC3AAF02}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DF1D84AF-27B8-4F87-A673-CCFADC3AAF02}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DF1D84AF-27B8-4F87-A673-CCFADC3AAF02}.Release|Any CPU.Build.0 = Release|Any CPU - {B1328B70-33B8-40E0-A729-38C34D659B5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1328B70-33B8-40E0-A729-38C34D659B5C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1328B70-33B8-40E0-A729-38C34D659B5C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1328B70-33B8-40E0-A729-38C34D659B5C}.Release|Any CPU.Build.0 = Release|Any CPU - {D6DFAC7C-82F4-4318-A9F0-6450D2945D96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D6DFAC7C-82F4-4318-A9F0-6450D2945D96}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D6DFAC7C-82F4-4318-A9F0-6450D2945D96}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D6DFAC7C-82F4-4318-A9F0-6450D2945D96}.Release|Any CPU.Build.0 = Release|Any CPU - {9E194D13-F5A0-4430-8F87-D74326457385}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9E194D13-F5A0-4430-8F87-D74326457385}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9E194D13-F5A0-4430-8F87-D74326457385}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9E194D13-F5A0-4430-8F87-D74326457385}.Release|Any CPU.Build.0 = Release|Any CPU - {214F0E80-D2E3-4E19-A3FC-2BE15B3906B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {214F0E80-D2E3-4E19-A3FC-2BE15B3906B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {214F0E80-D2E3-4E19-A3FC-2BE15B3906B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {214F0E80-D2E3-4E19-A3FC-2BE15B3906B0}.Release|Any CPU.Build.0 = Release|Any CPU - {1E75CB7D-2A4A-4B03-80A9-7B7D59B18BB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1E75CB7D-2A4A-4B03-80A9-7B7D59B18BB4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1E75CB7D-2A4A-4B03-80A9-7B7D59B18BB4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1E75CB7D-2A4A-4B03-80A9-7B7D59B18BB4}.Release|Any CPU.Build.0 = Release|Any CPU - {396D9209-0D9A-4E61-9471-04C71F6CA6B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {396D9209-0D9A-4E61-9471-04C71F6CA6B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {396D9209-0D9A-4E61-9471-04C71F6CA6B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {396D9209-0D9A-4E61-9471-04C71F6CA6B9}.Release|Any CPU.Build.0 = Release|Any CPU - {D4078011-2611-46A7-8A30-55E4AB8FA786}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D4078011-2611-46A7-8A30-55E4AB8FA786}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D4078011-2611-46A7-8A30-55E4AB8FA786}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D4078011-2611-46A7-8A30-55E4AB8FA786}.Release|Any CPU.Build.0 = Release|Any CPU - {DCE8EC51-1E58-49A0-82CF-5BE269FA0A9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DCE8EC51-1E58-49A0-82CF-5BE269FA0A9D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DCE8EC51-1E58-49A0-82CF-5BE269FA0A9D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DCE8EC51-1E58-49A0-82CF-5BE269FA0A9D}.Release|Any CPU.Build.0 = Release|Any CPU - {C9CAA69C-575A-442E-9D8A-69C53B39D72C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C9CAA69C-575A-442E-9D8A-69C53B39D72C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C9CAA69C-575A-442E-9D8A-69C53B39D72C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C9CAA69C-575A-442E-9D8A-69C53B39D72C}.Release|Any CPU.Build.0 = Release|Any CPU - {3D1C46E1-7A9E-4A4B-8D95-68613603DEDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3D1C46E1-7A9E-4A4B-8D95-68613603DEDF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3D1C46E1-7A9E-4A4B-8D95-68613603DEDF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3D1C46E1-7A9E-4A4B-8D95-68613603DEDF}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {1B03D24F-FB08-42E1-BB25-2D1BB907991B} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {A8A6FCF0-CA4F-4637-8E66-D86603B92204} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {BF8153AA-C390-4D00-98F2-083DEFEC7094} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {BE635672-D3FD-42C5-96E3-EDE50E05CE29} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {CE0ECABB-03AD-42CE-A5BD-D0CC4DCE35AB} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {E1FD7B15-FA09-4F7F-A30E-9FBD9F765D02} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {6EAF15B6-98BE-428B-A018-A5266521551E} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {618B95DB-3A70-4DC8-BD87-00F636F72453} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {BC9E7408-508D-482D-8602-96E76ACBB5EA} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {04935FA6-E48B-496F-8D6A-41A59232303D} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {0CCE83BA-8B8B-4B98-8846-B62A61FDF170} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {ED37372C-DFBF-4720-BD4B-CE1415961038} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {4330D46F-6703-4BA2-844D-177F722C0820} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {6785A554-BBBB-480C-8E4D-9FE90DD91A46} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {A4128935-B707-4D56-B924-27910EC92664} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {495060B4-BD80-4B18-AC44-4680F0D6D5DB} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {211F05D3-F8EE-497F-9DE9-AFFA0A72140D} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {84823BA5-B860-4CAF-885E-981D7F121830} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {5CA29B44-C4A5-4310-9429-553F0BC9FC1D} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {153E5218-E9C0-4ED8-9073-0802204C8B90} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {EFE77658-EDD7-4597-8016-CBE4A18951B0} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {2D081A36-48F9-4A09-8247-420682545492} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {0911F996-DF86-4FB1-A1CE-0539599EC0E0} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {DF1D84AF-27B8-4F87-A673-CCFADC3AAF02} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {D6DFAC7C-82F4-4318-A9F0-6450D2945D96} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {9E194D13-F5A0-4430-8F87-D74326457385} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {214F0E80-D2E3-4E19-A3FC-2BE15B3906B0} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {1E75CB7D-2A4A-4B03-80A9-7B7D59B18BB4} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {396D9209-0D9A-4E61-9471-04C71F6CA6B9} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {D4078011-2611-46A7-8A30-55E4AB8FA786} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {DCE8EC51-1E58-49A0-82CF-5BE269FA0A9D} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {C9CAA69C-575A-442E-9D8A-69C53B39D72C} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - {3D1C46E1-7A9E-4A4B-8D95-68613603DEDF} = {A83D6B58-6D38-46AF-8C20-5CFC170A1063} - EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E623EFF5-2CA4-4FA0-B3AB-53F921DA212E} EndGlobalSection diff --git a/OpenXmlPowerTools/GlobalSuppressions.cs b/OpenXmlPowerTools/GlobalSuppressions.cs new file mode 100644 index 00000000..1537b2bd --- /dev/null +++ b/OpenXmlPowerTools/GlobalSuppressions.cs @@ -0,0 +1,18 @@ +// 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 = "<挂起>")] diff --git a/OpenXmlPowerTools/NugetPush.bat b/OpenXmlPowerTools/NugetPush.bat index b9cf2dc8..2beb6680 100644 --- a/OpenXmlPowerTools/NugetPush.bat +++ b/OpenXmlPowerTools/NugetPush.bat @@ -1,2 +1,2 @@ -nuget push C:\Work\github\Open-Xml-PowerTools\OpenXmlPowerTools\bin\Release\*.nupkg -ApiKey 123.123a -Source http://nuget.cefcfco.com -pause +dotnet nuget push .\bin\Release\*.nupkg -k 123.123a -s http://nuget.cefcfco.com +pause \ No newline at end of file diff --git a/OpenXmlPowerTools/OpenXmlPowerTools.csproj b/OpenXmlPowerTools/OpenXmlPowerTools.csproj index 634d6e6e..0b15c24f 100644 --- a/OpenXmlPowerTools/OpenXmlPowerTools.csproj +++ b/OpenXmlPowerTools/OpenXmlPowerTools.csproj @@ -1,7 +1,7 @@  netstandard2.0 - 4.5.6 + 4.5.7 yitian.chen yitian.chen OpenXmlPowerTools-HrRd diff --git a/OpenXmlPowerToolsExamples/DocumentBuilder01/DocumentBuilder01.csproj b/OpenXmlPowerToolsExamples/DocumentBuilder01/DocumentBuilder01.csproj index e188d465..5f593cb0 100644 --- a/OpenXmlPowerToolsExamples/DocumentBuilder01/DocumentBuilder01.csproj +++ b/OpenXmlPowerToolsExamples/DocumentBuilder01/DocumentBuilder01.csproj @@ -3,6 +3,9 @@ Exe net45;net46;netcoreapp2.0 + + + From 3216baa24a008b7a7a6d5d4eaa5f2b8134682f01 Mon Sep 17 00:00:00 2001 From: "yitian.chen" <48295852@qq.com> Date: Wed, 19 Apr 2023 16:50:07 +0800 Subject: [PATCH 11/20] =?UTF-8?q?nuget=E5=8C=85=E7=89=88=E6=9C=AC=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenXmlPowerTools/OpenXmlPowerTools.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenXmlPowerTools/OpenXmlPowerTools.csproj b/OpenXmlPowerTools/OpenXmlPowerTools.csproj index 0b15c24f..a4d382b0 100644 --- a/OpenXmlPowerTools/OpenXmlPowerTools.csproj +++ b/OpenXmlPowerTools/OpenXmlPowerTools.csproj @@ -1,11 +1,12 @@  netstandard2.0 - 4.5.7 + 4.5.8 yitian.chen yitian.chen OpenXmlPowerTools-HrRd true + True From 31b752456f35f27190ebedecbbcc2c7fc908582a Mon Sep 17 00:00:00 2001 From: "yitian.chen" <48295852@qq.com> Date: Wed, 19 Apr 2023 17:42:02 +0800 Subject: [PATCH 12/20] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=89=BE=E5=88=B0=E6=AC=A1=E8=BD=B4=E5=BA=8F=E5=88=97=E5=88=99?= =?UTF-8?q?=E6=8A=9B=E5=87=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenXmlPowerTools/ChartUpdater.cs | 12 ++++++++---- OpenXmlPowerTools/OpenXmlPowerTools.csproj | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/OpenXmlPowerTools/ChartUpdater.cs b/OpenXmlPowerTools/ChartUpdater.cs index dbcdad42..908c3fab 100644 --- a/OpenXmlPowerTools/ChartUpdater.cs +++ b/OpenXmlPowerTools/ChartUpdater.cs @@ -60,12 +60,10 @@ public class ChartData public double[][] Values; /// - /// 组合图表中，第二个图表的序列索引. - /// 这些序列数据会被复制到第二个图表的序列中. + /// 组合图表中，次轴图表的序列名称映射 + /// 映射规则为：chatData中的序列名对应模板中的序列名。 /// public Dictionary SecondChartSeriesNames { get; set; } = new Dictionary(); - - public XName SecondChartType; } public class ChartUpdater @@ -169,10 +167,16 @@ private static void UpdateSeries(ChartPart chartPart, ChartData chartData, bool 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(); diff --git a/OpenXmlPowerTools/OpenXmlPowerTools.csproj b/OpenXmlPowerTools/OpenXmlPowerTools.csproj index a4d382b0..d54cbe19 100644 --- a/OpenXmlPowerTools/OpenXmlPowerTools.csproj +++ b/OpenXmlPowerTools/OpenXmlPowerTools.csproj @@ -1,7 +1,7 @@  netstandard2.0 - 4.5.8 + 4.5.9 yitian.chen yitian.chen OpenXmlPowerTools-HrRd From 5b4cf0177ec1d5ee7fa7d4392f72389d41bbbfd5 Mon Sep 17 00:00:00 2001 From: "yitian.chen" <48295852@qq.com> Date: Mon, 24 Apr 2023 14:50:26 +0800 Subject: [PATCH 13/20] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenXmlPowerTools/ImageReplacer.cs | 43 ++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 OpenXmlPowerTools/ImageReplacer.cs diff --git a/OpenXmlPowerTools/ImageReplacer.cs b/OpenXmlPowerTools/ImageReplacer.cs new file mode 100644 index 00000000..c7640b4c --- /dev/null +++ b/OpenXmlPowerTools/ImageReplacer.cs @@ -0,0 +1,43 @@ +using DocumentFormat.OpenXml.Packaging; +using DocumentFormat.OpenXml.Wordprocessing; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using System.Xml.Linq; + +namespace OpenXmlPowerTools +{ + public class ImageReplacer + { + public static bool ReplaceImage(WordprocessingDocument wDoc, string contentControlTag, string newImagePath) + { + var mainDocumentPart = wDoc.MainDocumentPart; + var mdXDoc = mainDocumentPart.GetXDocument(); + var cc = mdXDoc.Descendants(W.sdt) + .FirstOrDefault(sdt => (string)sdt.Elements(W.sdtPr).Elements(W.tag).Attributes(W.val).FirstOrDefault() == contentControlTag); + + if (cc != null) + { + var imageId = (string)cc.Descendants(A.blip).Attributes(R.embed).FirstOrDefault(); + + if (imageId != null) + { + ImagePart imagePart = (ImagePart)mainDocumentPart.GetPartById(imageId); + ReplaceNewImage(imagePart, newImagePath); + } + } + + return false; + } + + private static void ReplaceNewImage(ImagePart imagePart, string newImagePath) + { + byte[] imageBytes = File.ReadAllBytes(newImagePath); + BinaryWriter writer = new BinaryWriter(imagePart.GetStream()); + writer.Write(imageBytes); + writer.Close(); + } + } +} From 9bbb7594e5cc008bf951905749cb05c2f31a56bf Mon Sep 17 00:00:00 2001 From: "yitian.chen" <48295852@qq.com> Date: Mon, 24 Apr 2023 15:02:04 +0800 Subject: [PATCH 14/20] =?UTF-8?q?=E9=87=8D=E6=9E=84=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=99=A8,=E5=A2=9E=E5=8A=A0byte[]=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E7=9A=84=E8=BE=93=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenXmlPowerTools/ImageReplacer.cs | 67 ++++++++++++++++++++++++++++-- 1 file changed, 64 insertions(+), 3 deletions(-) diff --git a/OpenXmlPowerTools/ImageReplacer.cs b/OpenXmlPowerTools/ImageReplacer.cs index c7640b4c..1ce3ba85 100644 --- a/OpenXmlPowerTools/ImageReplacer.cs +++ b/OpenXmlPowerTools/ImageReplacer.cs @@ -9,9 +9,64 @@ namespace OpenXmlPowerTools { + /// + /// 图片替换器 + /// public class ImageReplacer { + public byte[] ImageBytes { get; private set; } + + /// + /// 图片替换器构造函数 + /// + /// 新图片的字节数组 + public ImageReplacer(byte[] imageBytes) + { + ImageBytes = imageBytes; + } + + /// + /// 新图片路径 + /// + /// + public ImageReplacer(string newImagePath) + { + ImageBytes = File.ReadAllBytes(newImagePath); + } + + /// + /// 替换图片 + /// + /// Word文档对象 + /// 要替换的控件tag + /// 新图片的路径 + /// public static bool ReplaceImage(WordprocessingDocument wDoc, string contentControlTag, string newImagePath) + { + var replacer = new ImageReplacer(newImagePath); + return replacer.Replace(wDoc, contentControlTag); + } + + /// + /// 替换图片 + /// + /// Word文档对象 + /// 要替换的控件tag + /// 新图片的路径 + /// + public static bool ReplaceImage(WordprocessingDocument wDoc, string contentControlTag, byte[] imageBytes) + { + var replacer = new ImageReplacer(imageBytes); + return replacer.Replace(wDoc, contentControlTag); + } + + /// + /// 替换图片 + /// + /// + /// + /// + private bool Replace(WordprocessingDocument wDoc, string contentControlTag) { var mainDocumentPart = wDoc.MainDocumentPart; var mdXDoc = mainDocumentPart.GetXDocument(); @@ -25,19 +80,25 @@ public static bool ReplaceImage(WordprocessingDocument wDoc, string contentContr if (imageId != null) { ImagePart imagePart = (ImagePart)mainDocumentPart.GetPartById(imageId); - ReplaceNewImage(imagePart, newImagePath); + ReplaceNewImage(imagePart, this.ImageBytes); + return true; } } return false; } - private static void ReplaceNewImage(ImagePart imagePart, string newImagePath) + private void ReplaceNewImage(ImagePart imagePart, byte[] imageBytes) { - byte[] imageBytes = File.ReadAllBytes(newImagePath); BinaryWriter writer = new BinaryWriter(imagePart.GetStream()); writer.Write(imageBytes); writer.Close(); } + + private void ReplaceNewImage(ImagePart imagePart, string newImagePath) + { + byte[] imageBytes = File.ReadAllBytes(newImagePath); + ReplaceNewImage(imagePart, imageBytes); + } } } From a7822a4695b3b6a51e8e9b8776ad7df139bd1014 Mon Sep 17 00:00:00 2001 From: "yitian.chen" <48295852@qq.com> Date: Mon, 24 Apr 2023 15:08:05 +0800 Subject: [PATCH 15/20] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenXmlPowerTools/GlobalSuppressions.cs | 2 ++ OpenXmlPowerTools/OpenXmlPowerTools.csproj | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenXmlPowerTools/GlobalSuppressions.cs b/OpenXmlPowerTools/GlobalSuppressions.cs index 1537b2bd..64410479 100644 --- a/OpenXmlPowerTools/GlobalSuppressions.cs +++ b/OpenXmlPowerTools/GlobalSuppressions.cs @@ -16,3 +16,5 @@ [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 = "<挂起>")] diff --git a/OpenXmlPowerTools/OpenXmlPowerTools.csproj b/OpenXmlPowerTools/OpenXmlPowerTools.csproj index d54cbe19..e010612e 100644 --- a/OpenXmlPowerTools/OpenXmlPowerTools.csproj +++ b/OpenXmlPowerTools/OpenXmlPowerTools.csproj @@ -1,7 +1,7 @@  netstandard2.0 - 4.5.9 + 4.5.10-preview yitian.chen yitian.chen OpenXmlPowerTools-HrRd From 1dfc59f84f11daadbb0e908bcb06cd46566ae7dd Mon Sep 17 00:00:00 2001 From: "yitian.chen" <48295852@qq.com> Date: Tue, 25 Apr 2023 14:36:44 +0800 Subject: [PATCH 16/20] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=97=B6=E5=80=99=EF=BC=8C=E5=B0=86=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E5=9B=BE=E7=89=87=E5=85=A8=E9=83=A8=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenXmlPowerTools/ImageReplacer.cs | 21 +++++++++++++++------ OpenXmlPowerTools/NugetPush.bat | 2 ++ OpenXmlPowerTools/OpenXmlPowerTools.csproj | 2 +- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/OpenXmlPowerTools/ImageReplacer.cs b/OpenXmlPowerTools/ImageReplacer.cs index 1ce3ba85..e8923eb4 100644 --- a/OpenXmlPowerTools/ImageReplacer.cs +++ b/OpenXmlPowerTools/ImageReplacer.cs @@ -12,7 +12,7 @@ namespace OpenXmlPowerTools /// /// 图片替换器 /// - public class ImageReplacer + public class ImageUpdater { public byte[] ImageBytes { get; private set; } @@ -20,7 +20,7 @@ public class ImageReplacer /// 图片替换器构造函数 /// /// 新图片的字节数组 - public ImageReplacer(byte[] imageBytes) + public ImageUpdater(byte[] imageBytes) { ImageBytes = imageBytes; } @@ -29,7 +29,7 @@ public ImageReplacer(byte[] imageBytes) /// 新图片路径 /// /// - public ImageReplacer(string newImagePath) + public ImageUpdater(string newImagePath) { ImageBytes = File.ReadAllBytes(newImagePath); } @@ -43,7 +43,7 @@ public ImageReplacer(string newImagePath) /// public static bool ReplaceImage(WordprocessingDocument wDoc, string contentControlTag, string newImagePath) { - var replacer = new ImageReplacer(newImagePath); + var replacer = new ImageUpdater(newImagePath); return replacer.Replace(wDoc, contentControlTag); } @@ -56,7 +56,7 @@ public static bool ReplaceImage(WordprocessingDocument wDoc, string contentContr /// public static bool ReplaceImage(WordprocessingDocument wDoc, string contentControlTag, byte[] imageBytes) { - var replacer = new ImageReplacer(imageBytes); + var replacer = new ImageUpdater(imageBytes); return replacer.Replace(wDoc, contentControlTag); } @@ -81,6 +81,7 @@ private bool Replace(WordprocessingDocument wDoc, string contentControlTag) { ImagePart imagePart = (ImagePart)mainDocumentPart.GetPartById(imageId); ReplaceNewImage(imagePart, this.ImageBytes); + mainDocumentPart.PutXDocument(); return true; } } @@ -90,7 +91,15 @@ private bool Replace(WordprocessingDocument wDoc, string contentControlTag) private void ReplaceNewImage(ImagePart imagePart, byte[] imageBytes) { - BinaryWriter writer = new BinaryWriter(imagePart.GetStream()); + var stream = imagePart.GetStream(); + + // stream保存为图片文件 + //using (var fileStream = new FileStream("f:\\test1.jpg", FileMode.Create)) + //{ + // stream.CopyTo(fileStream); + //} + + BinaryWriter writer = new BinaryWriter(stream); writer.Write(imageBytes); writer.Close(); } diff --git a/OpenXmlPowerTools/NugetPush.bat b/OpenXmlPowerTools/NugetPush.bat index 2beb6680..33e81789 100644 --- a/OpenXmlPowerTools/NugetPush.bat +++ b/OpenXmlPowerTools/NugetPush.bat @@ -1,2 +1,4 @@ +del .\bin\Release\*.nupkg +dotnet pack -o ./bin/release dotnet nuget push .\bin\Release\*.nupkg -k 123.123a -s http://nuget.cefcfco.com pause \ No newline at end of file diff --git a/OpenXmlPowerTools/OpenXmlPowerTools.csproj b/OpenXmlPowerTools/OpenXmlPowerTools.csproj index e010612e..55137278 100644 --- a/OpenXmlPowerTools/OpenXmlPowerTools.csproj +++ b/OpenXmlPowerTools/OpenXmlPowerTools.csproj @@ -1,7 +1,7 @@  netstandard2.0 - 4.5.10-preview + 4.5.10.1-preview yitian.chen yitian.chen OpenXmlPowerTools-HrRd From e7926ce58a6b14e6216d05afd89d18c6ab96be73 Mon Sep 17 00:00:00 2001 From: "yitian.chen" <48295852@qq.com> Date: Wed, 17 May 2023 14:27:16 +0800 Subject: [PATCH 17/20] =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=8E=BB=E6=8E=89=E5=8C=85=E5=9B=B4=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E7=9A=84=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8E=A7=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenXmlPowerTools/ImageReplacer.cs | 19 +++++++++++-------- OpenXmlPowerTools/OpenXmlPowerTools.csproj | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/OpenXmlPowerTools/ImageReplacer.cs b/OpenXmlPowerTools/ImageReplacer.cs index e8923eb4..8f6dcf57 100644 --- a/OpenXmlPowerTools/ImageReplacer.cs +++ b/OpenXmlPowerTools/ImageReplacer.cs @@ -75,15 +75,24 @@ private bool Replace(WordprocessingDocument wDoc, string contentControlTag) if (cc != null) { + // 替换imagePart var imageId = (string)cc.Descendants(A.blip).Attributes(R.embed).FirstOrDefault(); if (imageId != null) { ImagePart imagePart = (ImagePart)mainDocumentPart.GetPartById(imageId); ReplaceNewImage(imagePart, this.ImageBytes); - mainDocumentPart.PutXDocument(); - return true; } + + // 替换cc + var paragraph = cc.Descendants(W.sdtContent).Descendants(W.p).FirstOrDefault(); + if (paragraph != null) + { + cc.ReplaceWith(paragraph); + } + + mainDocumentPart.PutXDocument(); + return true; } return false; @@ -93,12 +102,6 @@ private void ReplaceNewImage(ImagePart imagePart, byte[] imageBytes) { var stream = imagePart.GetStream(); - // stream保存为图片文件 - //using (var fileStream = new FileStream("f:\\test1.jpg", FileMode.Create)) - //{ - // stream.CopyTo(fileStream); - //} - BinaryWriter writer = new BinaryWriter(stream); writer.Write(imageBytes); writer.Close(); diff --git a/OpenXmlPowerTools/OpenXmlPowerTools.csproj b/OpenXmlPowerTools/OpenXmlPowerTools.csproj index 55137278..38afb8d2 100644 --- a/OpenXmlPowerTools/OpenXmlPowerTools.csproj +++ b/OpenXmlPowerTools/OpenXmlPowerTools.csproj @@ -1,7 +1,7 @@  netstandard2.0 - 4.5.10.1-preview + 4.5.10.2 yitian.chen yitian.chen OpenXmlPowerTools-HrRd From 7fab0b1a795fe758f0f611b263fa5d6a84488be3 Mon Sep 17 00:00:00 2001 From: "yitian.chen" <48295852@qq.com> Date: Wed, 17 May 2023 17:21:29 +0800 Subject: [PATCH 18/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E6=97=B6=E5=80=99=EF=BC=8C=E6=9B=B4=E6=96=B0=E5=AE=BD=E5=BA=A6?= =?UTF-8?q?=E5=92=8C=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenXmlPowerTools/Helpers/ImageHelper.cs | 49 +++++++++ OpenXmlPowerTools/ImageReplacer.cs | 110 ++++++++++++++++++--- OpenXmlPowerTools/OpenXmlPowerTools.csproj | 2 +- 3 files changed, 148 insertions(+), 13 deletions(-) create mode 100644 OpenXmlPowerTools/Helpers/ImageHelper.cs diff --git a/OpenXmlPowerTools/Helpers/ImageHelper.cs b/OpenXmlPowerTools/Helpers/ImageHelper.cs new file mode 100644 index 00000000..822f28d9 --- /dev/null +++ b/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); + } + + /// + /// 获取图片的宽和高 + /// + /// + /// + 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); + } + } +} diff --git a/OpenXmlPowerTools/ImageReplacer.cs b/OpenXmlPowerTools/ImageReplacer.cs index 8f6dcf57..8b799b4d 100644 --- a/OpenXmlPowerTools/ImageReplacer.cs +++ b/OpenXmlPowerTools/ImageReplacer.cs @@ -1,7 +1,9 @@ using DocumentFormat.OpenXml.Packaging; using DocumentFormat.OpenXml.Wordprocessing; +using OpenXmlPowerTools.Helpers; using System; using System.Collections.Generic; +using System.Drawing.Imaging; using System.IO; using System.Linq; using System.Text; @@ -14,24 +16,34 @@ namespace OpenXmlPowerTools /// public class ImageUpdater { + private readonly ImageFormat _imageFormat; + private readonly int? _maxWidth; + private readonly int? _maxHeight; + public byte[] ImageBytes { get; private set; } /// /// 图片替换器构造函数 /// /// 新图片的字节数组 - public ImageUpdater(byte[] imageBytes) + public ImageUpdater(byte[] imageBytes, ImageFormat imageFormat, int? maxWidth, int? maxHeight) { ImageBytes = imageBytes; + _imageFormat = imageFormat; + _maxWidth = maxWidth; + _maxHeight = maxHeight; } /// /// 新图片路径 /// /// - public ImageUpdater(string newImagePath) + public ImageUpdater(string newImagePath, ImageFormat imageFormat, int? maxWidth, int? maxHeight) { ImageBytes = File.ReadAllBytes(newImagePath); + _imageFormat = imageFormat; + _maxWidth = maxWidth; + _maxHeight = maxHeight; } /// @@ -41,9 +53,14 @@ public ImageUpdater(string newImagePath) /// 要替换的控件tag /// 新图片的路径 /// - public static bool ReplaceImage(WordprocessingDocument wDoc, string contentControlTag, string newImagePath) + public static bool ReplaceImage(WordprocessingDocument wDoc, + string contentControlTag, + string newImagePath, + ImageFormat imageFormat, + int? maxWidth = null, + int? maxHeight = null) { - var replacer = new ImageUpdater(newImagePath); + var replacer = new ImageUpdater(newImagePath, imageFormat, maxWidth, maxHeight); return replacer.Replace(wDoc, contentControlTag); } @@ -54,9 +71,14 @@ public static bool ReplaceImage(WordprocessingDocument wDoc, string contentContr /// 要替换的控件tag /// 新图片的路径 /// - public static bool ReplaceImage(WordprocessingDocument wDoc, string contentControlTag, byte[] imageBytes) + public static bool ReplaceImage(WordprocessingDocument wDoc, + string contentControlTag, + byte[] imageBytes, + ImageFormat imageFormat, + int? maxWidth = null, + int? maxHeight = null) { - var replacer = new ImageUpdater(imageBytes); + var replacer = new ImageUpdater(imageBytes, imageFormat, maxWidth, maxHeight); return replacer.Replace(wDoc, contentControlTag); } @@ -84,6 +106,10 @@ private bool Replace(WordprocessingDocument wDoc, string contentControlTag) ReplaceNewImage(imagePart, this.ImageBytes); } + + // 修改宽度和高度 + UpdateImageMetrics(cc); + // 替换cc var paragraph = cc.Descendants(W.sdtContent).Descendants(W.p).FirstOrDefault(); if (paragraph != null) @@ -98,6 +124,72 @@ private bool Replace(WordprocessingDocument wDoc, string contentControlTag) return false; } + /// + /// 更新图片宽高 + /// + /// + private void UpdateImageMetrics(XElement cc) + { + float dpi = 96; + + var imgStream = new MemoryStream(this.ImageBytes); + var (w, h) = ImageHelper.GetImageMetrics(imgStream, this._imageFormat); + + // 如果设置了最大宽度或最大高度，则按比例缩放 + if (this._maxWidth.HasValue || this._maxHeight.HasValue) + { + var ratio = (float)w / h; + if (this._maxWidth.HasValue && this._maxHeight.HasValue) + { + if (ratio > (float)this._maxWidth.Value / this._maxHeight.Value) + { + w = this._maxWidth.Value; + h = (int)(w / ratio); + } + else + { + h = this._maxHeight.Value; + w = (int)(h * ratio); + } + } + else if (this._maxWidth.HasValue) + { + w = this._maxWidth.Value; + h = (int)(w / ratio); + } + else + { + h = this._maxHeight.Value; + w = (int)(h * ratio); + } + } + + var cx = (long)(w / dpi * 914400); + var cy = (long)(h / dpi * 914400); + + var drawing = cc.Descendants(W.drawing).FirstOrDefault(); + if (drawing != null) + { + var extent = drawing.Descendants(WP.extent).FirstOrDefault(); + if (extent != null) + { + extent.SetAttributeValue("cx", cx); + extent.SetAttributeValue("cy", cy); + } + var aExtent = drawing.Descendants(A.graphic).Descendants(Pic.spPr).Descendants(A.ext).FirstOrDefault(); + if (aExtent != null) + { + aExtent.SetAttributeValue("cx", cx); + aExtent.SetAttributeValue("cy", cy); + } + } + } + + /// + /// 替换新图片 + /// + /// + /// private void ReplaceNewImage(ImagePart imagePart, byte[] imageBytes) { var stream = imagePart.GetStream(); @@ -106,11 +198,5 @@ private void ReplaceNewImage(ImagePart imagePart, byte[] imageBytes) writer.Write(imageBytes); writer.Close(); } - - private void ReplaceNewImage(ImagePart imagePart, string newImagePath) - { - byte[] imageBytes = File.ReadAllBytes(newImagePath); - ReplaceNewImage(imagePart, imageBytes); - } } } diff --git a/OpenXmlPowerTools/OpenXmlPowerTools.csproj b/OpenXmlPowerTools/OpenXmlPowerTools.csproj index 38afb8d2..ca1673d2 100644 --- a/OpenXmlPowerTools/OpenXmlPowerTools.csproj +++ b/OpenXmlPowerTools/OpenXmlPowerTools.csproj @@ -1,7 +1,7 @@  netstandard2.0 - 4.5.10.2 + 4.5.10.4 yitian.chen yitian.chen OpenXmlPowerTools-HrRd From 30b04c6b2d03e439da19af7c1926da27f7ced0af Mon Sep 17 00:00:00 2001 From: "yitian.chen" <48295852@qq.com> Date: Thu, 18 May 2023 10:12:58 +0800 Subject: [PATCH 19/20] =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=8F=AF=E4=BB=A5=E8=AE=BE=E7=BD=AE=E5=AE=BD?= =?UTF-8?q?=E9=AB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenXmlPowerTools/ImageReplacer.cs | 127 +++++++++++++++++++---------- 1 file changed, 85 insertions(+), 42 deletions(-) diff --git a/OpenXmlPowerTools/ImageReplacer.cs b/OpenXmlPowerTools/ImageReplacer.cs index 8b799b4d..579fea53 100644 --- a/OpenXmlPowerTools/ImageReplacer.cs +++ b/OpenXmlPowerTools/ImageReplacer.cs @@ -17,8 +17,16 @@ namespace OpenXmlPowerTools public class ImageUpdater { private readonly ImageFormat _imageFormat; - private readonly int? _maxWidth; - private readonly int? _maxHeight; + + /// + /// 设置的宽度，可以为百分比，如果不填则默认使用页面宽度 + /// + private readonly string _width; + + /// + /// 设置高度，可以为百分比，如果不填则根据宽度缩放后自适应 + /// + private readonly string _height; public byte[] ImageBytes { get; private set; } @@ -26,24 +34,24 @@ public class ImageUpdater /// 图片替换器构造函数 /// /// 新图片的字节数组 - public ImageUpdater(byte[] imageBytes, ImageFormat imageFormat, int? maxWidth, int? maxHeight) + public ImageUpdater(byte[] imageBytes, ImageFormat imageFormat, string width = null, string height = null) { ImageBytes = imageBytes; _imageFormat = imageFormat; - _maxWidth = maxWidth; - _maxHeight = maxHeight; + _width = width; + _height = height; } /// /// 新图片路径 /// /// - public ImageUpdater(string newImagePath, ImageFormat imageFormat, int? maxWidth, int? maxHeight) + public ImageUpdater(string newImagePath, ImageFormat imageFormat, string width = null, string height = null) { ImageBytes = File.ReadAllBytes(newImagePath); _imageFormat = imageFormat; - _maxWidth = maxWidth; - _maxHeight = maxHeight; + _width = width; + _height = height; } /// @@ -57,10 +65,10 @@ public static bool ReplaceImage(WordprocessingDocument wDoc, string contentControlTag, string newImagePath, ImageFormat imageFormat, - int? maxWidth = null, - int? maxHeight = null) + string width = null, + string height = null) { - var replacer = new ImageUpdater(newImagePath, imageFormat, maxWidth, maxHeight); + var replacer = new ImageUpdater(newImagePath, imageFormat, width, height); return replacer.Replace(wDoc, contentControlTag); } @@ -75,10 +83,10 @@ public static bool ReplaceImage(WordprocessingDocument wDoc, string contentControlTag, byte[] imageBytes, ImageFormat imageFormat, - int? maxWidth = null, - int? maxHeight = null) + string width = null, + string height = null) { - var replacer = new ImageUpdater(imageBytes, imageFormat, maxWidth, maxHeight); + var replacer = new ImageUpdater(imageBytes, imageFormat, width, height); return replacer.Replace(wDoc, contentControlTag); } @@ -106,9 +114,8 @@ private bool Replace(WordprocessingDocument wDoc, string contentControlTag) ReplaceNewImage(imagePart, this.ImageBytes); } - // 修改宽度和高度 - UpdateImageMetrics(cc); + UpdateImageMetrics(mdXDoc, cc); // 替换cc var paragraph = cc.Descendants(W.sdtContent).Descendants(W.p).FirstOrDefault(); @@ -128,44 +135,72 @@ private bool Replace(WordprocessingDocument wDoc, string contentControlTag) /// 更新图片宽高 /// /// - private void UpdateImageMetrics(XElement cc) + private void UpdateImageMetrics(XDocument mdXDoc, XElement cc) { float dpi = 96; + // 得到图片宽高 var imgStream = new MemoryStream(this.ImageBytes); - var (w, h) = ImageHelper.GetImageMetrics(imgStream, this._imageFormat); + var (imgWidth, imgHeight) = ImageHelper.GetImageMetrics(imgStream, this._imageFormat); - // 如果设置了最大宽度或最大高度，则按比例缩放 - if (this._maxWidth.HasValue || this._maxHeight.HasValue) + // 得到页面宽高 + double pageWidth = 0; + double pageHeight = 0; + + var pageSize = mdXDoc.Descendants(W.sectPr).FirstOrDefault()?.Descendants(W.pgSz).FirstOrDefault(); + if (pageSize != null) { - var ratio = (float)w / h; - if (this._maxWidth.HasValue && this._maxHeight.HasValue) - { - if (ratio > (float)this._maxWidth.Value / this._maxHeight.Value) - { - w = this._maxWidth.Value; - h = (int)(w / ratio); - } - else - { - h = this._maxHeight.Value; - w = (int)(h * ratio); - } - } - else if (this._maxWidth.HasValue) + pageWidth = Convert.ToDouble(pageSize.Attribute(W.w.GetName("w")).Value) / 20; + pageHeight = Convert.ToDouble(pageSize.Attribute(W.w.GetName("h")).Value) / 20; + } + + // 得到设置宽高，传进来的参数 + int.TryParse(this._width, out var settingWidth); + int.TryParse(this._height, out var settingHeight); + + // 如果设置的宽度是百分比，那么按百分比计算宽度 + if (this._width != null && this._width.EndsWith("%")) + { + // 先计算比例，避免宽度变更后比例也跟着变化。 + var radio = imgWidth / (float)imgHeight; + double percent = Convert.ToDouble(this._width.TrimEnd('%')) / 100; + imgWidth = (int)(pageWidth * percent); + + // 如果没有设置高度，那么按比例计算高度 + if (this._height == null) { - w = this._maxWidth.Value; - h = (int)(w / ratio); + // 那么按比例计算高度 + imgHeight = (int)(imgWidth / radio); } - else + } + else if (settingWidth > 0) // 如果设置了宽度，那么按设置的宽度来 + { + imgWidth = settingWidth; + } + + // 如果度是百分比，那么按百分比计算高度 + if (this._height != null && this._height.EndsWith("%")) + { + // 先计算比例，避免宽度变更后比例也跟着变化。 + var radio = imgWidth / (float)imgHeight; + double percent = Convert.ToDouble(this._height.TrimEnd('%')) / 100; + imgHeight = (int)(pageHeight * percent); + + // 如果没有设置宽度，那么按比例计算宽度 + if (this._width == null) { - h = this._maxHeight.Value; - w = (int)(h * ratio); + // 那么按比例计算宽度 + imgWidth = (int)(imgHeight * radio); } } + else if (settingHeight > 0) // 如果设置了高度，那么按设置的高度来 + { + imgHeight = settingHeight; + } - var cx = (long)(w / dpi * 914400); - var cy = (long)(h / dpi * 914400); + // 换算成EMUS + var cx = (long)(imgWidth / dpi * 914400); + var cy = (long)(imgHeight / dpi * 914400); var drawing = cc.Descendants(W.drawing).FirstOrDefault(); if (drawing != null) @@ -185,6 +220,14 @@ private void UpdateImageMetrics(XElement cc) } } + // 按比例缩放图片的方法，传入图片原始宽度和高度，传入缩放后的宽度 + private static (int width, int height) ScaleImage(int originalWidth, int originalHeight, int scaledWidth) + { + var ratio = (float)originalWidth / originalHeight; + var scaledHeight = (int)(scaledWidth / ratio); + return (scaledWidth, scaledHeight); + } + /// /// 替换新图片 /// From c42056c9cd07e4313742357a493628d07125be13 Mon Sep 17 00:00:00 2001 From: "yitian.chen" <48295852@qq.com> Date: Thu, 18 May 2023 10:49:04 +0800 Subject: [PATCH 20/20] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenXmlPowerTools/OpenXmlPowerTools.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenXmlPowerTools/OpenXmlPowerTools.csproj b/OpenXmlPowerTools/OpenXmlPowerTools.csproj index ca1673d2..53c99d63 100644 --- a/OpenXmlPowerTools/OpenXmlPowerTools.csproj +++ b/OpenXmlPowerTools/OpenXmlPowerTools.csproj @@ -1,7 +1,7 @@  netstandard2.0 - 4.5.10.4 + 4.5.10.5 yitian.chen yitian.chen OpenXmlPowerTools-HrRd