test/MiniExcel
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/MiniExcel.git synced 2024-11-29 18:38:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix SaveAsByTemplate single column demension index error #226

Browse Source
This commit is contained in:
wei 2021-05-10 14:33:09 +08:00
parent a79acd72a9
commit c7e4230729
3 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
samples/xlsx/TestIssue226.xlsx Normal file
View File

Binary file not shown.

26
src/MiniExcel/OpenXml/ExcelOpenXmlTemplate.Impl.cs
View File

@ -86,7 +86,7 @@ namespace MiniExcelLibs.OpenXml
private List<XRowInfo> XRowInfos { get; set; }
private Dictionary<string,XMergeCell> XMergeCellInfos { get; set; }
private Dictionary<string, XMergeCell> XMergeCellInfos { get; set; }
public List<XMergeCell> NewXMergeCellInfos { get; private set; }
private void GenerateSheetXmlImpl(ZipArchiveEntry sheetZipEntry, Stream stream, Stream sheetStream, Dictionary<string, object> inputMaps, List<string> sharedStrings, XmlWriterSettings xmlWriterSettings = null)
@ -273,7 +273,7 @@ namespace MiniExcelLibs.OpenXml
//TODO: ![image](https://user-images.githubusercontent.com/12729184/114848248-17735880-9e11-11eb-8258-63266bda0a1a.png)
newRow.InnerXml = newRow.InnerXml.Replace(key, cellValueStr);
}
}
}
// note: only first time need add diff ![image](https://user-images.githubusercontent.com/12729184/114494728-6bceda80-9c4f-11eb-9685-8b5ed054eabe.png)
if (!first)
@ -352,7 +352,7 @@ namespace MiniExcelLibs.OpenXml
writer.Write($"</{prefix}sheetData>");
if(this.NewXMergeCellInfos.Count != 0)
if (this.NewXMergeCellInfos.Count != 0)
{
writer.Write($"<{prefix}mergeCells count=\"{this.NewXMergeCellInfos.Count}\">");
foreach (var cell in this.NewXMergeCellInfos)
@ -465,7 +465,7 @@ namespace MiniExcelLibs.OpenXml
{
var first = true;
//TODO:if CellIEnumerableValues is ICollection or Array then get length or Count
foreach (var element in xRowInfo.CellIEnumerableValues) //TODO: optimize performance?
{
xRowInfo.CellIEnumerableValuesCount++;
@ -603,12 +603,20 @@ namespace MiniExcelLibs.OpenXml
// e.g <dimension ref=\"A1:B6\" /> only need to update B6 to BMaxRowIndex
var @refs = dimension.GetAttribute("ref").Split(':');
var letter = new String(refs[1].Where(Char.IsLetter).ToArray());
var digit = int.Parse(new String(refs[1].Where(Char.IsDigit).ToArray()));
if (@refs.Length == 2)
{
var letter = new String(refs[1].Where(Char.IsLetter).ToArray());
var digit = int.Parse(new String(refs[1].Where(Char.IsDigit).ToArray()));
dimension.SetAttribute("ref", $"{refs[0]}:{letter}{digit + maxRowIndexDiff}");
dimension.SetAttribute("ref", $"{refs[0]}:{letter}{digit + maxRowIndexDiff}");
}
else
{
var letter = new String(refs[0].Where(Char.IsLetter).ToArray());
var digit = int.Parse(new String(refs[0].Where(Char.IsDigit).ToArray()));
dimension.SetAttribute("ref", $"A1:{letter}{digit + maxRowIndexDiff}");
}
}
}
}

14
tests/MiniExcelTests/MiniExcelIssueTests.cs
View File

@ -25,6 +25,20 @@ namespace MiniExcelLibs.Tests
this.output = output;
}
/// <summary>
/// https://github.com/shps951023/MiniExcel/issues/226
/// Fix SaveAsByTemplate single column demension index error #226
/// </summary>
[Fact]
public void Issue226()
{
var path = PathHelper.GetNewTemplateFilePath();
var templatePath = PathHelper.GetSamplePath("xlsx/TestIssue226.xlsx");
MiniExcel.SaveAsByTemplate(path, templatePath, new { employees = new[] { new { name = "123" }, new { name = "123" } } });
Assert.Equal("A1:A3", Helpers.GetFirstSheetDimensionRefValue(path));
}
/// <summary>
/// ASP.NET Webform gridview datasource can't use miniexcel queryasdatatable · Issue #223]
/// (https://github.com/shps951023/MiniExcel/issues/223)