fix: 修正HasDataTable方法不存在的问题

Author: 0x5143

src/DataTables.GeneratorCore/DataMatrixTemplate.cs

@@ -17,338 +17,271 @@ namespace DataTables.GeneratorCore
     /// <summary>
     /// Class to produce the template output
     /// </summary>
-    
-    #line 1 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class DataMatrixTemplate : DataMatrixTemplateBase
     {
-#line hidden
         /// <summary>
         /// Create the template output
         /// </summary>
         public virtual string TransformText()
         {
             this.Write("// <auto-generated />\r\n#pragma warning disable CS0105\r\n#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.\r\n#pragma warning disable CS8602 // Dereference of a possibly null reference.\r\nusing System;\r\nusing System.IO;\r\nusing System.Collections.Generic;\r\nusing System.Runtime.CompilerServices;\r\nusing DataTables;\r\n\r\n#nullable enable\r\n\r\n");
-            
-            #line 18 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
  if (!string.IsNullOrEmpty(GenerationContext.Namespace)) { 
-            
-            #line default
-            #line hidden
             this.Write("namespace ");
 
-            #line 19 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(GenerationContext.Namespace));
 
             #line default
             #line hidden
             this.Write("\r\n{\r\n");
-            
-            #line 21 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
  } 
-            
-            #line default
-            #line hidden
             this.Write("\r\npublic sealed partial class DT");
 
-            #line 23 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(GenerationContext.ClassName));
 
             #line default
             #line hidden
             this.Write(" : DataMatrixBase<");
 
-            #line 23 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(BuildTypeString(kKey1)));
 
             #line default
             #line hidden
             this.Write(", ");
 
-            #line 23 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(BuildTypeString(kKey2)));
 
             #line default
             #line hidden
             this.Write(", ");
 
-            #line 23 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(BuildTypeString(kValue)));
 
             #line default
             #line hidden
             this.Write(">\r\n{\r\n    ");
 
-            #line 25 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(string.IsNullOrEmpty(GenerationContext.MatrixDefaultValue) ? string.Empty : "protected override " + BuildTypeString(kValue) + " DefaultValue => " + BuildTypeValueString(kValue, GenerationContext.MatrixDefaultValue) + ";" + Environment.NewLine));
 
             #line default
             #line hidden
             this.Write("\r\n    public DT");
 
-            #line 26 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(GenerationContext.ClassName));
 
             #line default
             #line hidden
             this.Write("(string name, int capacity) : base(name, capacity)\r\n    { }\r\n\r\n    public override bool ParseDataRow(int index, BinaryReader reader)\r\n    {\r\n        ");
 
-            #line 31 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(BuildTypeString(kKey1)));
 
             #line default
             #line hidden
             this.Write(" ");
 
-            #line 31 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(kKey1));
 
             #line default
             #line hidden
             this.Write(";\r\n        ");
 
-            #line 32 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(BuildDeserializeMethodString(kKey1)));
 
             #line default
             #line hidden
             this.Write("\r\n\r\n        ");
 
-            #line 34 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(BuildTypeString(kKey2)));
 
             #line default
             #line hidden
             this.Write(" ");
 
-            #line 34 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(kKey2));
 
             #line default
             #line hidden
             this.Write(";\r\n        ");
 
-            #line 35 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(BuildDeserializeMethodString(kKey2)));
 
             #line default
             #line hidden
             this.Write("\r\n\r\n        ");
 
-            #line 37 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(BuildTypeString(kValue)));
 
             #line default
             #line hidden
             this.Write(" ");
 
-            #line 37 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(kValue));
 
             #line default
             #line hidden
             this.Write(";\r\n        ");
 
-            #line 38 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(BuildDeserializeMethodString(kValue)));
 
             #line default
             #line hidden
             this.Write("\r\n\r\n        SetDataRow(index, ");
 
-            #line 40 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(kKey1));
 
             #line default
             #line hidden
             this.Write(", ");
 
-            #line 40 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(kKey2));
 
             #line default
             #line hidden
             this.Write(", ");
 
-            #line 40 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(kValue));
 
             #line default
             #line hidden
             this.Write(");\r\n        return true;\r\n    }\r\n\r\n    #region Instance API\r\n\r\n    /// <summary>\r\n    /// 根据Key1和Key2获取数据值 (实例方法)\r\n    /// </summary>\r\n    [MethodImpl(MethodImplOptions.AggressiveInlining)]\r\n    public ");
 
-            #line 50 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(BuildTypeString(kValue)));
 
             #line default
             #line hidden
             this.Write("? GetDataRow(");
 
-            #line 50 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(BuildTypeString(kKey1)));
 
             #line default
             #line hidden
             this.Write(" key1, ");
 
-            #line 50 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(BuildTypeString(kKey2)));
 
             #line default
             #line hidden
             this.Write(" key2)\r\n    {\r\n        return Get(key1, key2);\r\n    }\r\n\r\n    /// <summary>\r\n    /// 根据Key1和Key2获取数据值，如果不存在则返回默认值 (实例方法)\r\n    /// </summary>\r\n    [MethodImpl(MethodImplOptions.AggressiveInlining)]\r\n    public ");
 
-            #line 59 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(BuildTypeString(kValue)));
 
             #line default
             #line hidden
             this.Write(" GetDataRowOrDefault(");
 
-            #line 59 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(BuildTypeString(kKey1)));
 
             #line default
             #line hidden
             this.Write(" key1, ");
 
-            #line 59 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(BuildTypeString(kKey2)));
 
             #line default
             #line hidden
             this.Write(" key2)\r\n    {\r\n        var result = Get(key1, key2);\r\n        return result != null ? result : DefaultValue;\r\n    }\r\n\r\n    #endregion\r\n\r\n    #region Static API\r\n\r\n    /// <summary>\r\n    /// 获取数据矩阵实例 - 便于访问基类方法 (静态方法)\r\n    /// </summary>\r\n    public static DT");
 
-            #line 72 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(GenerationContext.ClassName));
 
             #line default
             #line hidden
             this.Write(" Table\r\n    {\r\n        get\r\n        {\r\n            var table = DataTableManager.GetDataTableInternal<DT");
 
-            #line 76 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(GenerationContext.ClassName));
 
             #line default
             #line hidden
             this.Write(">();\r\n            if (table == null)\r\n            {\r\n                throw new InvalidOperationException(\"DT");
 
-            #line 79 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(GenerationContext.ClassName));
 
             #line default
             #line hidden
             this.Write(" not loaded. Call DataTableManager.CreateDataTable<DT");
 
-            #line 79 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(GenerationContext.ClassName));
 
             #line default
             #line hidden
             this.Write(">() first.\");\r\n            }\r\n            return table;\r\n        }\r\n    }\r\n\r\n    /// <summary>\r\n    /// 安全获取数据矩阵实例 - 返回null如果未加载 (静态方法)\r\n    /// </summary>\r\n    public static DT");
 
-            #line 88 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(GenerationContext.ClassName));
 
             #line default
             #line hidden
             this.Write("? TableOrNull => DataTableManager.GetDataTableInternal<DT");
 
-            #line 88 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(GenerationContext.ClassName));
 
             #line default
             #line hidden
-            this.Write(">();\r\n\r\n    /// <summary>\r\n    /// 检查数据矩阵是否已加载 (静态方法)\r\n    /// </summary>\r\n    public static bool IsLoaded => DataTableManager.HasDataTable<DT");
+            this.Write(">();\r\n\r\n    /// <summary>\r\n    /// 检查数据矩阵是否已加载 (静态方法)\r\n    /// </summary>\r\n    public static bool IsLoaded => DataTableManager.IsLoaded<DT");
 
-            #line 93 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(GenerationContext.ClassName));
 
             #line default
             #line hidden
             this.Write(">();\r\n\r\n    /// <summary>\r\n    /// 根据Key1和Key2获取数据值 (静态方法)\r\n    /// </summary>\r\n    [MethodImpl(MethodImplOptions.AggressiveInlining)]\r\n    public static ");
 
-            #line 99 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(BuildTypeString(kValue)));
 
             #line default
             #line hidden
             this.Write("? GetRow(");
 
-            #line 99 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(BuildTypeString(kKey1)));
 
             #line default
             #line hidden
             this.Write(" key1, ");
 
-            #line 99 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(BuildTypeString(kKey2)));
 
             #line default
             #line hidden
             this.Write(" key2)\r\n    {\r\n        var table = DataTableManager.GetDataTableInternal<DT");
 
-            #line 101 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(GenerationContext.ClassName));
 
             #line default
             #line hidden
             this.Write(">();\r\n        return table?.Get(key1, key2);\r\n    }\r\n\r\n    /// <summary>\r\n    /// 根据Key1和Key2获取数据值，如果不存在则返回默认值 (静态方法)\r\n    /// </summary>\r\n    [MethodImpl(MethodImplOptions.AggressiveInlining)]\r\n    public static ");
 
-            #line 109 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(BuildTypeString(kValue)));
 
             #line default
             #line hidden
             this.Write(" GetRowOrDefault(");
 
-            #line 109 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(BuildTypeString(kKey1)));
 
             #line default
             #line hidden
             this.Write(" key1, ");
 
-            #line 109 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(BuildTypeString(kKey2)));
 
             #line default
             #line hidden
             this.Write(" key2)\r\n    {\r\n        var table = DataTableManager.GetDataTableInternal<DT");
 
-            #line 111 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(GenerationContext.ClassName));
 
             #line default
             #line hidden
             this.Write(">();\r\n        if (table != null)\r\n        {\r\n            var result = table.Get(key1, key2);\r\n            return result != null ? result : table.DefaultValue;\r\n        }\r\n        return default(");
 
-            #line 117 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(BuildTypeString(kValue)));
 
             #line default
             #line hidden
             this.Write(");\r\n    }\r\n\r\n    #endregion\r\n}\r\n\r\n");
-            
-            #line 123 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
  if (!string.IsNullOrEmpty(GenerationContext.Namespace)) { 
-            
-            #line default
-            #line hidden
             this.Write("}\r\n");
-            
-            #line 125 "D:\Projects\ChronosGames\DataTables\src\DataTables.GeneratorCore\DataMatrixTemplate.tt"
  } 
-            
-            #line default
-            #line hidden
             return this.GenerationEnvironment.ToString();
         }
     }
-    
-    #line default
-    #line hidden
     #region Base class
     /// <summary>
     /// Base class for this transformation

src/DataTables.GeneratorCore/DataMatrixTemplate.tt

@@ -90,7 +90,7 @@ public sealed partial class DT<#= GenerationContext.ClassName #> : DataMatrixBas
     /// <summary>
     /// 检查数据矩阵是否已加载 (静态方法)
     /// </summary>
-    public static bool IsLoaded => DataTableManager.HasDataTable<DT<#= GenerationContext.ClassName #>>();
+    public static bool IsLoaded => DataTableManager.IsLoaded<DT<#= GenerationContext.ClassName #>>();
 
     /// <summary>
     /// 根据Key1和Key2获取数据值 (静态方法)