From ee6bba34148c49c497584ba6cdb33f65861ca718 Mon Sep 17 00:00:00 2001
From: Carson <396098651@qq.com>
Date: Sat, 26 Mar 2022 15:36:37 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=BA=86table=E5=92=8Cenum=E7=9A=84excel=E8=A1=A8?=
 =?UTF-8?q?=E5=9C=A8=E5=AD=90sheet=E7=9A=84=E6=97=B6=E5=80=99=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87@=E5=AE=9A=E4=BD=8D=E4=BC=9A=E6=8A=A5=E9=94=99?=
 =?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

---
 src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs b/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs
index 03b3907..fd50996 100644
--- a/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs
+++ b/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs
@@ -443,7 +443,8 @@ namespace Luban.Job.Cfg.Defs
             {
                 var source = new ExcelDataSource();
                 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)
                 {
                     DBean data = r.Data;
@@ -541,7 +542,8 @@ namespace Luban.Job.Cfg.Defs
             {
                 var source = new ExcelDataSource();
                 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)
                 {