Merge pull request #1207 from EPPlusSoftware/bug/jsonencode_hyperlinkcopy

OssianEPPlus · web-flow · commit 092a03d051ce · 2023-12-08T12:58:02.000+01:00
Fixes json encoding and hyperlink copy issues
diff --git a/src/EPPlus/Core/Worksheet/WorksheetCopyHelper.cs b/src/EPPlus/Core/Worksheet/WorksheetCopyHelper.cs
@@ -265,7 +265,7 @@ private static void CopyDrawing(ExcelPackage pck, XmlNamespaceManager nsm, Excel
             for (int i = 0; i < copy.Drawings.Count; i++)
             {
                 var draw = copy.Drawings[i];
-                CopyDrawingRels(draw, pck, added, partDraw);
+                CopyDrawingRels(draw, pck, added, partDraw, ref drawXml);
             }
 
             //rewrite the drawing xml with the new relID's
@@ -353,12 +353,10 @@ private static XmlNode GetMatchingNode(XmlDocument drawXml, XmlNode node, XmlNam
             return retNode;
         }
 
-        private static void CopyDrawingRels(ExcelDrawing copyDraw, ExcelPackage pck, ExcelWorksheet added, ZipPackagePart partDraw)
+        private static void CopyDrawingRels(ExcelDrawing copyDraw, ExcelPackage pck, ExcelWorksheet added, ZipPackagePart partDraw, ref XmlDocument drawXml)
         {
-            //var draw = drawings[i];
             var copy = copyDraw._drawings.Worksheet;
             var uriDraw = partDraw.Uri;
-            var drawXml = copyDraw._drawings.DrawingXml;
             if (copyDraw is ExcelChart chart)
             {
                 var xml = chart.ChartXml.InnerXml;
@@ -438,7 +436,7 @@ private static void CopyDrawingRels(ExcelDrawing copyDraw, ExcelPackage pck, Exc
             {
                 for(int j = 0; j < grpDraw.Drawings.Count; j++)
                 {
-                    CopyDrawingRels(grpDraw.Drawings[j], pck, added, partDraw);
+                    CopyDrawingRels(grpDraw.Drawings[j], pck, added, partDraw, ref drawXml);
                 }
             }
 
@@ -447,7 +445,7 @@ private static void CopyDrawingRels(ExcelDrawing copyDraw, ExcelPackage pck, Exc
                 ZipPackageRelationship rel;
                 if (string.IsNullOrEmpty(copyDraw.HypRel.Target))
                 {
-                    rel = partDraw.CreateRelationship(copyDraw.HypRel.TargetUri.OriginalString, copyDraw.HypRel.TargetMode, copyDraw.HypRel.RelationshipType);
+                    rel = partDraw.CreateRelationship(copyDraw.HypRel.TargetUri, copyDraw.HypRel.TargetMode, copyDraw.HypRel.RelationshipType);
                 }
                 else
                 {
diff --git a/src/EPPlus/Export/JsonExport/JsonExport.async.cs b/src/EPPlus/Export/JsonExport/JsonExport.async.cs
@@ -52,7 +52,7 @@ internal protected async Task WriteCellDataAsync(StreamWriter sw, ExcelRangeBase
                     if (hasComment)
                     {
                         var comment = ws.Comments[commentIx];
-                        await WriteItemAsync(sw, $"\"comment\":\"{comment.Text}\"");
+                        await WriteItemAsync(sw, $"\"comment\":\"{JsonEscape(comment.Text)}\"");
                     }
 
                     if (c == dr._toCol)
diff --git a/src/EPPlus/Export/JsonExport/JsonExport.cs b/src/EPPlus/Export/JsonExport/JsonExport.cs
@@ -59,7 +59,7 @@ internal protected void WriteCellData(StreamWriter sw, ExcelRangeBase dr, int he
                     if(hasComment)
                     {
                         var comment = ws.Comments[commentIx];
-                        WriteItem(sw, $"\"comment\":\"{comment.Text}\"");
+                        WriteItem(sw, $"\"comment\":\"{JsonEscape(comment.Text)}\"");
                     }
 
                     if(c == dr._toCol)
diff --git a/src/EPPlus/Export/JsonExport/JsonRangeExport.async.cs b/src/EPPlus/Export/JsonExport/JsonRangeExport.async.cs
@@ -30,7 +30,7 @@ private async Task WriteColumnDataAsync(StreamWriter sw)
                 await WriteStartAsync(sw);
                 if (_settings.FirstRowIsHeader)
                 {
-                    await WriteItemAsync(sw, $"\"name\":\"{_range.GetCellValue<string>(0, i)}\"", false, _settings.AddDataTypesOn == eDataTypeOn.OnColumn);
+                    await WriteItemAsync(sw, $"\"name\":\"{JsonEscape(_range.GetCellValue<string>(0, i))}\"", false, _settings.AddDataTypesOn == eDataTypeOn.OnColumn);
                 }
                 if (_settings.AddDataTypesOn == eDataTypeOn.OnColumn)
                 {
diff --git a/src/EPPlus/Export/JsonExport/JsonRangeExport.cs b/src/EPPlus/Export/JsonExport/JsonRangeExport.cs
@@ -43,7 +43,7 @@ private void WriteColumnData(StreamWriter sw)
                 WriteStart(sw);
                 if (_settings.FirstRowIsHeader)
                 {
-                    WriteItem(sw, $"\"name\":\"{_range.GetCellValue<string>(0,i)}\"", false, _settings.AddDataTypesOn == eDataTypeOn.OnColumn);
+                    WriteItem(sw, $"\"name\":\"{JsonEscape(_range.GetCellValue<string>(0,i))}\"", false, _settings.AddDataTypesOn == eDataTypeOn.OnColumn);
                 }
                 if (_settings.AddDataTypesOn==eDataTypeOn.OnColumn)
                 {
diff --git a/src/EPPlus/Export/JsonExport/JsonTableExport.async.cs b/src/EPPlus/Export/JsonExport/JsonTableExport.async.cs
@@ -39,7 +39,7 @@ private async Task WriteColumnDataAsync(StreamWriter sw)
             for (int i = 0; i < _table.Columns.Count; i++)
             {
                 await WriteStartAsync(sw);
-                await WriteItemAsync(sw, $"\"name\":\"{_table.Columns[i].Name}\"", false, _settings.AddDataTypesOn == eDataTypeOn.OnColumn);
+                await WriteItemAsync(sw, $"\"name\":\"{JsonEscape(_table.Columns[i].Name)}\"", false, _settings.AddDataTypesOn == eDataTypeOn.OnColumn);
                 if (_settings.AddDataTypesOn == eDataTypeOn.OnColumn)
                 {
                     var dt = HtmlRawDataProvider.GetHtmlDataTypeFromValue(_table.DataRange.GetCellValue<object>(0, i));
diff --git a/src/EPPlus/Export/JsonExport/JsonTableExport.cs b/src/EPPlus/Export/JsonExport/JsonTableExport.cs
@@ -51,7 +51,7 @@ private void WriteColumnData(StreamWriter sw)
             for (int i = 0; i < _table.Columns.Count; i++)
             {
                 WriteStart(sw);
-                WriteItem(sw, $"\"name\":\"{_table.Columns[i].Name}\"", false, _settings.AddDataTypesOn == eDataTypeOn.OnColumn);
+                WriteItem(sw, $"\"name\":\"{JsonEscape(_table.Columns[i].Name)}\"", false, _settings.AddDataTypesOn == eDataTypeOn.OnColumn);
                 if (_settings.AddDataTypesOn == eDataTypeOn.OnColumn)
                 {
                     var dt = HtmlRawDataProvider.GetHtmlDataTypeFromValue(_table.DataRange.GetCellValue<object>(0, i));
diff --git a/src/EPPlusTest/Issues.cs b/src/EPPlusTest/Issues.cs
@@ -5571,5 +5571,18 @@ public void s551_2()
                 }
             }
         }
+        [TestMethod]
+        public void i1203()
+        {
+            using (var p = OpenTemplatePackage("i1203.xlsx"))
+            {
+                var sheet1 = p.Workbook.Worksheets[0];
+                var sheet2 = p.Workbook.Worksheets.Add("sheet2", sheet1);
+                Assert.AreEqual(sheet1.Drawings[0].Hyperlink.OriginalString, sheet2.Drawings[0].Hyperlink.OriginalString);
+                Assert.IsTrue(sheet1.Drawings[0].As.Picture.Image.ImageBytes.SequenceEqual(sheet2.Drawings[0].As.Picture.Image.ImageBytes));
+
+                SaveAndCleanup(p);
+            }
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ private static void CopyDrawing(ExcelPackage pck, XmlNamespaceManager nsm, Excel`
`265`	`265`	`for (int i = 0; i < copy.Drawings.Count; i++)`
`266`	`266`	`{`
`267`	`267`	`var draw = copy.Drawings[i];`
`268`		`- CopyDrawingRels(draw, pck, added, partDraw);`
	`268`	`+ CopyDrawingRels(draw, pck, added, partDraw, ref drawXml);`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`//rewrite the drawing xml with the new relID's`
`@@ -353,12 +353,10 @@ private static XmlNode GetMatchingNode(XmlDocument drawXml, XmlNode node, XmlNam`
`353`	`353`	`return retNode;`
`354`	`354`	`}`
`355`	`355`
`356`		`- private static void CopyDrawingRels(ExcelDrawing copyDraw, ExcelPackage pck, ExcelWorksheet added, ZipPackagePart partDraw)`
	`356`	`+ private static void CopyDrawingRels(ExcelDrawing copyDraw, ExcelPackage pck, ExcelWorksheet added, ZipPackagePart partDraw, ref XmlDocument drawXml)`
`357`	`357`	`{`
`358`		`- //var draw = drawings[i];`
`359`	`358`	`var copy = copyDraw._drawings.Worksheet;`
`360`	`359`	`var uriDraw = partDraw.Uri;`
`361`		`- var drawXml = copyDraw._drawings.DrawingXml;`
`362`	`360`	`if (copyDraw is ExcelChart chart)`
`363`	`361`	`{`
`364`	`362`	`var xml = chart.ChartXml.InnerXml;`
`@@ -438,7 +436,7 @@ private static void CopyDrawingRels(ExcelDrawing copyDraw, ExcelPackage pck, Exc`
`438`	`436`	`{`
`439`	`437`	`for(int j = 0; j < grpDraw.Drawings.Count; j++)`
`440`	`438`	`{`
`441`		`- CopyDrawingRels(grpDraw.Drawings[j], pck, added, partDraw);`
	`439`	`+ CopyDrawingRels(grpDraw.Drawings[j], pck, added, partDraw, ref drawXml);`
`442`	`440`	`}`
`443`	`441`	`}`
`444`	`442`
`@@ -447,7 +445,7 @@ private static void CopyDrawingRels(ExcelDrawing copyDraw, ExcelPackage pck, Exc`
`447`	`445`	`ZipPackageRelationship rel;`
`448`	`446`	`if (string.IsNullOrEmpty(copyDraw.HypRel.Target))`
`449`	`447`	`{`
`450`		`- rel = partDraw.CreateRelationship(copyDraw.HypRel.TargetUri.OriginalString, copyDraw.HypRel.TargetMode, copyDraw.HypRel.RelationshipType);`
	`448`	`+ rel = partDraw.CreateRelationship(copyDraw.HypRel.TargetUri, copyDraw.HypRel.TargetMode, copyDraw.HypRel.RelationshipType);`
`451`	`449`	`}`
`452`	`450`	`else`
`453`	`451`	`{`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ internal protected async Task WriteCellDataAsync(StreamWriter sw, ExcelRangeBase`
`52`	`52`	`if (hasComment)`
`53`	`53`	`{`
`54`	`54`	`var comment = ws.Comments[commentIx];`
`55`		`- await WriteItemAsync(sw, $"\"comment\":\"{comment.Text}\"");`
	`55`	`+ await WriteItemAsync(sw, $"\"comment\":\"{JsonEscape(comment.Text)}\"");`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`if (c == dr._toCol)`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ internal protected void WriteCellData(StreamWriter sw, ExcelRangeBase dr, int he`
`59`	`59`	`if(hasComment)`
`60`	`60`	`{`
`61`	`61`	`var comment = ws.Comments[commentIx];`
`62`		`- WriteItem(sw, $"\"comment\":\"{comment.Text}\"");`
	`62`	`+ WriteItem(sw, $"\"comment\":\"{JsonEscape(comment.Text)}\"");`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`if(c == dr._toCol)`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ private async Task WriteColumnDataAsync(StreamWriter sw)`
`30`	`30`	`await WriteStartAsync(sw);`
`31`	`31`	`if (_settings.FirstRowIsHeader)`
`32`	`32`	`{`
`33`		`- await WriteItemAsync(sw, $"\"name\":\"{_range.GetCellValue<string>(0, i)}\"", false, _settings.AddDataTypesOn == eDataTypeOn.OnColumn);`
	`33`	`+ await WriteItemAsync(sw, $"\"name\":\"{JsonEscape(_range.GetCellValue<string>(0, i))}\"", false, _settings.AddDataTypesOn == eDataTypeOn.OnColumn);`
`34`	`34`	`}`
`35`	`35`	`if (_settings.AddDataTypesOn == eDataTypeOn.OnColumn)`
`36`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ private void WriteColumnData(StreamWriter sw)`
`43`	`43`	`WriteStart(sw);`
`44`	`44`	`if (_settings.FirstRowIsHeader)`
`45`	`45`	`{`
`46`		`- WriteItem(sw, $"\"name\":\"{_range.GetCellValue<string>(0,i)}\"", false, _settings.AddDataTypesOn == eDataTypeOn.OnColumn);`
	`46`	`+ WriteItem(sw, $"\"name\":\"{JsonEscape(_range.GetCellValue<string>(0,i))}\"", false, _settings.AddDataTypesOn == eDataTypeOn.OnColumn);`
`47`	`47`	`}`
`48`	`48`	`if (_settings.AddDataTypesOn==eDataTypeOn.OnColumn)`
`49`	`49`	`{`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ private async Task WriteColumnDataAsync(StreamWriter sw)`
`39`	`39`	`for (int i = 0; i < _table.Columns.Count; i++)`
`40`	`40`	`{`
`41`	`41`	`await WriteStartAsync(sw);`
`42`		`- await WriteItemAsync(sw, $"\"name\":\"{_table.Columns[i].Name}\"", false, _settings.AddDataTypesOn == eDataTypeOn.OnColumn);`
	`42`	`+ await WriteItemAsync(sw, $"\"name\":\"{JsonEscape(_table.Columns[i].Name)}\"", false, _settings.AddDataTypesOn == eDataTypeOn.OnColumn);`
`43`	`43`	`if (_settings.AddDataTypesOn == eDataTypeOn.OnColumn)`
`44`	`44`	`{`
`45`	`45`	`var dt = HtmlRawDataProvider.GetHtmlDataTypeFromValue(_table.DataRange.GetCellValue<object>(0, i));`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ private void WriteColumnData(StreamWriter sw)`
`51`	`51`	`for (int i = 0; i < _table.Columns.Count; i++)`
`52`	`52`	`{`
`53`	`53`	`WriteStart(sw);`
`54`		`- WriteItem(sw, $"\"name\":\"{_table.Columns[i].Name}\"", false, _settings.AddDataTypesOn == eDataTypeOn.OnColumn);`
	`54`	`+ WriteItem(sw, $"\"name\":\"{JsonEscape(_table.Columns[i].Name)}\"", false, _settings.AddDataTypesOn == eDataTypeOn.OnColumn);`
`55`	`55`	`if (_settings.AddDataTypesOn == eDataTypeOn.OnColumn)`
`56`	`56`	`{`
`57`	`57`	`var dt = HtmlRawDataProvider.GetHtmlDataTypeFromValue(_table.DataRange.GetCellValue<object>(0, i));`
Original file line number	Diff line number	Diff line change
`@@ -5571,5 +5571,18 @@ public void s551_2()`
`5571`	`5571`	`}`
`5572`	`5572`	`}`
`5573`	`5573`	`}`
	`5574`	`+ [TestMethod]`
	`5575`	`+ public void i1203()`
	`5576`	`+ {`
	`5577`	`+ using (var p = OpenTemplatePackage("i1203.xlsx"))`
	`5578`	`+ {`
	`5579`	`+ var sheet1 = p.Workbook.Worksheets[0];`
	`5580`	`+ var sheet2 = p.Workbook.Worksheets.Add("sheet2", sheet1);`
	`5581`	`+ Assert.AreEqual(sheet1.Drawings[0].Hyperlink.OriginalString, sheet2.Drawings[0].Hyperlink.OriginalString);`
	`5582`	`+ Assert.IsTrue(sheet1.Drawings[0].As.Picture.Image.ImageBytes.SequenceEqual(sheet2.Drawings[0].As.Picture.Image.ImageBytes));`
	`5583`	`+`
	`5584`	`+ SaveAndCleanup(p);`
	`5585`	`+ }`
	`5586`	`+ }`
`5574`	`5587`	`}`
`5575`	`5588`	`}`