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

0.14.1

Browse Source 
- [Bug] Fix custom m/d format not convert datetime #222
This commit is contained in:
wei 2021-05-07 10:02:13 +08:00
parent c4309ae27f
commit 8f3d521600
20 changed files with 123 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/README.md
View File

@ -6,6 +6,9 @@
---
### 0.14.1
- [Bug] Fix custom m/d format not convert datetime #222
### 0.14.0
- [New] Query、GetColumns support startCell #147
- [New] GetColumns support read headers

3
docs/README.zh-CN.md
View File

@ -7,6 +7,9 @@
---
### 0.14.1
- [Bug] 修正自定义 m/d 格式没转成 datetime #222
### 0.14.0
- [New] Query、GetColumns 支持 startCell 能指定 cell 开始读取数据 #147
- [New] GetColumns 支持读取表头

3
docs/README.zh-Hant.md
View File

@ -7,6 +7,9 @@
---
### 0.14.1
- [Bug] 修正自定義 m/d 格式沒轉成 datetime #222
### 0.14.0
- [New] Query、GetColumns 支持 startCell 能指定 cell 開始讀取資料 #147
- [New] GetColumns 支持讀取表頭

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

Binary file not shown.

2
samples/xlsx/TestIssue222/[Content_Types].xml Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types"><Default Extension="bin" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.printerSettings"/><Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/><Default Extension="xml" ContentType="application/xml"/><Override PartName="/xl/workbook.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/><Override PartName="/xl/worksheets/sheet1.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"/><Override PartName="/xl/theme/theme1.xml" ContentType="application/vnd.openxmlformats-officedocument.theme+xml"/><Override PartName="/xl/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"/><Override PartName="/xl/sharedStrings.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml"/><Override PartName="/docProps/core.xml" ContentType="application/vnd.openxmlformats-package.core-properties+xml"/><Override PartName="/docProps/app.xml" ContentType="application/vnd.openxmlformats-officedocument.extended-properties+xml"/><Override PartName="/docProps/custom.xml" ContentType="application/vnd.openxmlformats-officedocument.custom-properties+xml"/></Types>

2
samples/xlsx/TestIssue222/_rels/.rels Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties" Target="docProps/app.xml"/><Relationship Id="rId2" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="docProps/core.xml"/><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="xl/workbook.xml"/><Relationship Id="rId4" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties" Target="docProps/custom.xml"/></Relationships>

2
samples/xlsx/TestIssue222/docProps/app.xml Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties" xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"><Application>Microsoft Excel</Application><DocSecurity>0</DocSecurity><ScaleCrop>false</ScaleCrop><HeadingPairs><vt:vector size="2" baseType="variant"><vt:variant><vt:lpstr>工作表</vt:lpstr></vt:variant><vt:variant><vt:i4>1</vt:i4></vt:variant></vt:vector></HeadingPairs><TitlesOfParts><vt:vector size="1" baseType="lpstr"><vt:lpstr>1</vt:lpstr></vt:vector></TitlesOfParts><Company>WWW.YlmF.CoM</Company><LinksUpToDate>false</LinksUpToDate><SharedDoc>false</SharedDoc><HyperlinksChanged>false</HyperlinksChanged><AppVersion>14.0300</AppVersion></Properties>

2
samples/xlsx/TestIssue222/docProps/core.xml Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><dc:creator>user</dc:creator><cp:lastModifiedBy>liangqi</cp:lastModifiedBy><dcterms:created xsi:type="dcterms:W3CDTF">2012-02-04T08:56:57Z</dcterms:created><dcterms:modified xsi:type="dcterms:W3CDTF">2021-05-06T10:40:47Z</dcterms:modified></cp:coreProperties>

2
samples/xlsx/TestIssue222/docProps/custom.xml Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/custom-properties" xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"><property fmtid="{D5CDD505-2E9C-101B-9397-08002B2CF9AE}" pid="2" name="KSOProductBuildVer"><vt:lpwstr>2052-11.1.0.9999</vt:lpwstr></property></Properties>

2
samples/xlsx/TestIssue222/xl/_rels/workbook.xml.rels Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles" Target="styles.xml"/><Relationship Id="rId2" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme" Target="theme/theme1.xml"/><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet" Target="worksheets/sheet1.xml"/><Relationship Id="rId4" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings" Target="sharedStrings.xml"/></Relationships>

BIN
samples/xlsx/TestIssue222/xl/printerSettings/printerSettings1.bin Normal file
View File

Binary file not shown.

2
samples/xlsx/TestIssue222/xl/sharedStrings.xml Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<sst xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" count="63" uniqueCount="32"><si><t>订单编号</t></si><si><t>买家会员名</t></si><si><t>买家支付宝帐号</t></si><si><t>总金额</t></si><si><t>买家留言</t></si><si><t>收货人姓名</t></si><si><t>收货人地址</t></si><si><t>联系电话</t></si><si><t>联系手机</t></si><si><t>订单创建时间</t></si><si><t>订单付款时间</t></si><si><t>订单备注</t></si><si><t>宝贝总数量</t></si><si><t>需要发票</t></si><si><t>发票抬头</t></si><si><t>赠品</t></si><si><t>所属活动</t><phoneticPr fontId="2" type="noConversion"/></si><si><t>礼品SKU</t><phoneticPr fontId="2" type="noConversion"/></si><si><t>否</t><phoneticPr fontId="2" type="noConversion"/></si><si><t>张叶楠</t></si><si><t>胡晓蕾</t></si><si><t>任立冬</t></si><si><t>蒋影</t></si><si><t>王永振</t></si><si><t>张娟</t></si><si><t>杨静丽</t></si><si><t>栾娜</t></si><si><t>王海彦</t></si><si><t>D07156</t><phoneticPr fontId="2" type="noConversion"/></si><si><t>否</t><phoneticPr fontId="2" type="noConversion"/></si><si><t>蛋蛋</t><phoneticPr fontId="2" type="noConversion"/></si><si><t>款收到后让财务写日志</t><phoneticPr fontId="2" type="noConversion"/></si></sst>

2
samples/xlsx/TestIssue222/xl/styles.xml Normal file
View File

File diff suppressed because one or more lines are too long

2
samples/xlsx/TestIssue222/xl/theme/theme1.xml Normal file
View File

File diff suppressed because one or more lines are too long

2
samples/xlsx/TestIssue222/xl/workbook.xml Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<workbook xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"><fileVersion appName="xl" lastEdited="5" lowestEdited="5" rupBuild="9302"/><workbookPr showInkAnnotation="0" codeName="ThisWorkbook"/><bookViews><workbookView xWindow="0" yWindow="0" windowWidth="23040" windowHeight="9420" tabRatio="338"/></bookViews><sheets><sheet name="1" sheetId="1" r:id="rId1"/></sheets><definedNames><definedName name="_xlnm._FilterDatabase" localSheetId="0" hidden="1">'1'!$A$1:$Q$1</definedName></definedNames><calcPr calcId="144525"/></workbook>

2
samples/xlsx/TestIssue222/xl/worksheets/_rels/sheet1.xml.rels Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/printerSettings" Target="../printerSettings/printerSettings1.bin"/></Relationships>

75
samples/xlsx/TestIssue222/xl/worksheets/sheet1.xml Normal file
View File

@ -0,0 +1,75 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main"
xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="x14ac"
xmlns:x14ac="http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac">
<sheetPr codeName="Sheet1"/>
<dimension ref="A1:B3"/>
<sheetViews>
<sheetView tabSelected="1" zoomScaleNormal="100" workbookViewId="0">
<pane xSplit="1" ySplit="1" topLeftCell="F2" activePane="bottomRight" state="frozen"/>
<selection pane="topRight"/>
<selection pane="bottomLeft"/>
<selection pane="bottomRight" activeCell="G15" sqref="G15"/>
</sheetView>
</sheetViews>
<sheetFormatPr defaultColWidth="8.69921875" defaultRowHeight="21.9" customHeight="1" x14ac:dyDescent="0.25"/>
<cols>
<col min="1" max="1" width="27.19921875" style="1" customWidth="1"/>
<col min="2" max="2" width="17.69921875" style="2" customWidth="1"/>
<col min="3" max="3" width="15.69921875" style="2" customWidth="1"/>
<col min="4" max="4" width="13.69921875" style="2" customWidth="1"/>
<col min="5" max="5" width="48.09765625" style="2" customWidth="1"/>
<col min="6" max="6" width="13.09765625" style="2" customWidth="1"/>
<col min="7" max="7" width="58.69921875" style="2" customWidth="1"/>
<col min="8" max="8" width="17.3984375" style="2" customWidth="1"/>
<col min="9" max="9" width="11" style="2" customWidth="1"/>
<col min="10" max="10" width="18.09765625" style="2" customWidth="1"/>
<col min="11" max="11" width="18.3984375" style="2" customWidth="1"/>
<col min="12" max="12" width="22.3984375" style="2" customWidth="1"/>
<col min="13" max="13" width="19.59765625" style="2" customWidth="1"/>
<col min="14" max="14" width="12.19921875" style="2" customWidth="1"/>
<col min="15" max="15" width="20.8984375" style="2" customWidth="1"/>
<col min="16" max="16" width="13" style="2" customWidth="1"/>
<col min="17" max="17" width="15.69921875" style="2" customWidth="1"/>
<col min="18" max="32" width="9" style="2" bestFit="1" customWidth="1"/>
<col min="33" max="16384" width="8.69921875" style="2"/>
</cols>
<sheetData>
<row r="1" spans="1:18" ht="21.75" customHeight="1" x14ac:dyDescent="0.25">
<c r="A1" s="5" t="s">
<v>9</v>
</c>
<c r="B1" s="5" t="s">
<v>10</v>
</c>
</row>
<row r="2" spans="1:18" ht="21.9" customHeight="1" x14ac:dyDescent="0.25">
<c r="A2" s="8">
<v>44315</v>
</c>
<c r="B2" s="8">
<v>44315</v>
</c>
</row>
<row r="3" spans="1:18" ht="21.9" customHeight="1" x14ac:dyDescent="0.25">
<c r="A3" s="8">
<v>44315</v>
</c>
<c r="B3" s="8">
<v>44315</v>
</c>
</row>
</sheetData>
<autoFilter ref="A1:Q1"/>
<phoneticPr fontId="2" type="noConversion"/>
<conditionalFormatting sqref="A1:A1048576">
<cfRule type="duplicateValues" dxfId="7" priority="1"/>
<cfRule type="duplicateValues" dxfId="6" priority="2" stopIfTrue="1"/>
<cfRule type="duplicateValues" dxfId="5" priority="8" stopIfTrue="1"/>
<cfRule type="duplicateValues" dxfId="4" priority="9" stopIfTrue="1"/>
</conditionalFormatting>
<pageMargins left="0.75" right="0.75" top="1" bottom="1" header="0.5" footer="0.5"/>
<pageSetup paperSize="9" orientation="portrait" horizontalDpi="300" verticalDpi="300" r:id="rId1"/>
<headerFooter alignWithMargins="0"/>
</worksheet>

2
src/MiniExcel/MiniExcelLibs.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net45;netstandard2.0;net5.0</TargetFrameworks>
<Version>0.14.0</Version>
<Version>0.14.1</Version>
</PropertyGroup>
<PropertyGroup>
<AssemblyName>MiniExcel</AssemblyName>

3
src/MiniExcel/OpenXml/ExcelOpenXmlStyles.cs
View File

@ -148,6 +148,9 @@
{ 47, new NumberFormatString("mm:ss.0",typeof(TimeSpan?)) },
{ 48, new NumberFormatString("##0.0E+0",typeof(string)) },
{ 49, new NumberFormatString("@",typeof(string)) },
// issue 222
{ 58, new NumberFormatString("m/d",typeof(DateTime?)) },
};
}

13
tests/MiniExcelTests/MiniExcelIssueTests.cs
View File

@ -25,6 +25,19 @@ namespace MiniExcelLibs.Tests
this.output = output;
}
/// <summary>
/// [Custom yyyy-MM-dd format not convert datetime · Issue #222]
/// (https://github.com/shps951023/MiniExcel/issues/222)
/// </summary>
[Fact]
public void Issue222()
{
var path = PathHelper.GetSamplePath("xlsx/TestIssue222.xlsx");
var rows = MiniExcel.Query(path).ToList();
Assert.Equal(typeof(DateTime), rows[1].A.GetType());
Assert.Equal(new DateTime(2021,4,29), rows[1].A);
}
/// <summary>
/// Query Support StartCell #147
/// https://github.com/shps951023/MiniExcel/issues/147