xiang.li
/
luban
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

【修复】修复了table和enum的excel表在子sheet的时候通过@定位会报错的问题。

main
Carson 2022-03-26 15:36:37 +08:00
parent 9886bd1222
commit ee6bba3414
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs
View File

@ -443,7 +443,8 @@ namespace Luban.Job.Cfg.Defs
{ {
var source = new ExcelDataSource(); var source = new ExcelDataSource();
var bytes = await this.Agent.GetFromCacheOrReadAllBytesAsync(file.ActualFile, file.MD5); var bytes = await this.Agent.GetFromCacheOrReadAllBytesAsync(file.ActualFile, file.MD5);
var records = DataLoaderUtil.LoadCfgRecords(tableRecordType, file.OriginFile, null, bytes, true); (var actualFile, var sheetName) = FileUtil.SplitFileAndSheetName(FileUtil.Standardize(file.OriginFile));
var records = DataLoaderUtil.LoadCfgRecords(tableRecordType, actualFile, sheetName, bytes, true);
foreach (var r in records) foreach (var r in records)
{ {
DBean data = r.Data; DBean data = r.Data;
@ -541,7 +542,8 @@ namespace Luban.Job.Cfg.Defs
{ {
var source = new ExcelDataSource(); var source = new ExcelDataSource();
var bytes = await this.Agent.GetFromCacheOrReadAllBytesAsync(file.ActualFile, file.MD5); var bytes = await this.Agent.GetFromCacheOrReadAllBytesAsync(file.ActualFile, file.MD5);
var records = DataLoaderUtil.LoadCfgRecords(tableRecordType, file.OriginFile, null, bytes, true); (var actualFile, var sheetName) = FileUtil.SplitFileAndSheetName(FileUtil.Standardize(file.OriginFile));
var records = DataLoaderUtil.LoadCfgRecords(tableRecordType, actualFile, sheetName, bytes, true);
foreach (var r in records) foreach (var r in records)
{ {