Revert "完成 API 帳號系統與初步 Restful API 嘗試"

This reverts commit 8eb67b4.
maxzh1999tw · Feb 12, 2024 · 2299f49 · 2299f49
1 parent 8eb67b4
commit 2299f49
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 59 deletions.
diff --git a/Excely.EPPlus.LGPL/Plugins/ErrorRecordPluginExtention.cs b/Excely.EPPlus.LGPL/Plugins/ErrorRecordPluginExtention.cs
diff --git a/Excely.sln b/Excely.sln
@@ -15,8 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Excely.ClosedXML.UnitTests"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UnitTests", "UnitTests", "{05E1BF0C-B2F1-41C1-B5AB-52C001A3D557}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Debug", "Debug\Debug.csproj", "{7BCFF4FE-F23D-4BDC-8D32-E22148C29F08}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -43,10 +41,6 @@ Global
 		{075DACAA-3E1D-46E6-B094-0E119B56673B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{075DACAA-3E1D-46E6-B094-0E119B56673B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{075DACAA-3E1D-46E6-B094-0E119B56673B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7BCFF4FE-F23D-4BDC-8D32-E22148C29F08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7BCFF4FE-F23D-4BDC-8D32-E22148C29F08}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7BCFF4FE-F23D-4BDC-8D32-E22148C29F08}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7BCFF4FE-F23D-4BDC-8D32-E22148C29F08}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Excely/Plugins/ErrorRecordPlugin.cs b/Excely/Plugins/ErrorRecordPlugin.cs
diff --git a/Excely/TableConverters/ClassListTableConverter.cs b/Excely/TableConverters/ClassListTableConverter.cs
@@ -92,11 +92,11 @@ private IEnumerable<TClass> ImportInternal(ExcelyTable table, Func<PropertyInfo,
                         continue;
                     }
 
+                    // 取得欄位解析結果
+                    var value = Options.PropertyValueSettingPolicy(property, table.Data[rowIndex][columnIndex]);
+
                     try
                     {
-                        // 取得欄位解析結果
-                        var value = Options.PropertyValueSettingPolicy(property, table.Data[rowIndex][columnIndex]);
-
                         // 嘗試自動轉型
                         if (value != null && Options.EnableAutoTypeConversion)
                         {
@@ -131,7 +131,7 @@ private IEnumerable<TClass> ImportInternal(ExcelyTable table, Func<PropertyInfo,
                     catch (Exception ex)
                     {
                         // 執行錯誤處理
-                        var errorFixed = Options.ErrorHandlingPolicy(new CellLocation(rowIndex, columnIndex), obj, property, table.Data[rowIndex][columnIndex], ex);
+                        var errorFixed = Options.ErrorHandlingPolicy(new CellLocation(rowIndex, columnIndex), obj, property, value, ex);
 
                         // 錯誤處理失敗，且要求停止
                         if (!errorFixed && Options.ThrowWhenError)

diff --git a/Excely/Workflows/ExcelyImporterBase.cs b/Excely/Workflows/ExcelyImporterBase.cs
@@ -10,8 +10,6 @@ public abstract class ExcelyImporterBase<TInput>
     {
         protected abstract ExcelyTable GetTable(TInput input);
 
-        public List<Action<ExcelyTable>> DoAfterGetTableCallbackList { get; set; } = new List<Action<ExcelyTable>>();
-
         /// <summary>
         /// 將資料匯入為物件列表。
         /// </summary>
@@ -25,7 +23,6 @@ public IEnumerable<TClass> ToClassList<TClass>(
             where TClass : class, new()
         {
             var table = GetTable(dataSource);
-            DoAfterGetTableCallbackList.ForEach(x => x.Invoke(table));
             var converter = options == null ? new ClassListTableConverter<TClass>() : new ClassListTableConverter<TClass>(options);
             return converter.ConvertFrom(table);
         }
@@ -41,7 +38,6 @@ public IEnumerable<TClass> ToClassList<TClass>(
             DictionaryListTableConverterOptions? options = null)
         {
             var table = GetTable(dataSource);
-            DoAfterGetTableCallbackList.ForEach(x => x.Invoke(table));
             var converter = options == null ? new DictionaryListTableConverter() : new DictionaryListTableConverter(options);
             return converter.ConvertFrom(table);
         }