Преглед изворни кода

表创建实体转下划线后的列名 需要转回来,创建的实体的字段补充SugarColumn标注

Signed-off-by: 清子 <261617183@qq.com>
清子 пре 3 година
родитељ
комит
64db047ed0

+ 3 - 1
Admin.NET/Admin.NET.Core/Service/DataBase/SysDatabaseService.cs

@@ -204,10 +204,12 @@ public class SysDatabaseService : IDynamicApiController, ITransient
         DbTableInfo dbTableInfo = db.DbMaintenance.GetTableInfoList(false).FirstOrDefault(m => m.Name == input.TableName || m.Name == input.TableName.ToLower());
         if (dbTableInfo == null)
             throw Oops.Oh(ErrorCodeEnum.db1001);
-
+        
+        var config = App.GetOptions<DbConnectionOptions>().ConnectionConfigs.FirstOrDefault(u => u.ConfigId == input.ConfigId);
         List<DbColumnInfo> dbColumnInfos = db.DbMaintenance.GetColumnInfosByTableName(input.TableName, false);
         dbColumnInfos.ForEach(m =>
         {
+            m.DbColumnName = config.EnableUnderLine ? CodeGenUtil.CamelColumnName(m.DbColumnName, dbColumnNames) : m.DbColumnName;//转下划线后的列名 需要转回来
             m.DataType = CodeGenUtil.ConvertDataType(m);
         });
         if (_codeGenOptions.BaseEntityNames.Contains(input.BaseClassName, StringComparer.OrdinalIgnoreCase))

+ 28 - 26
Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/Entity.cs.vm

@@ -4,40 +4,42 @@ using System.ComponentModel;
 using Admin.NET.Core;
 namespace @Model.NameSpace
 {
-     /// <summary>
-     /// @(@Model.Description)
-     /// </summary>
-      [SugarTable("@(@Model.TableName)","@(@Model.Description)")]
-      [Tenant("@(@Model.ConfigId)")]
-      public class @(@Model.EntityName) @Model.BaseClassName
-      {
+    /// <summary>
+    /// @(@Model.Description)
+    /// </summary>
+    [SugarTable("@(@Model.TableName)","@(@Model.Description)")]
+    [Tenant("@(@Model.ConfigId)")]
+    public class @(@Model.EntityName) @Model.BaseClassName
+    {
 @foreach (var column in Model.TableField){
 if(@Model.BaseClassName=="" && @column.IsPrimarykey){
-          @:/// <summary>
-          @:/// @column.ColumnDescription
-          @:/// </summary>
-          @:[SugarColumn(IsIdentity = @column.IsIdentity.ToString().ToLower(), ColumnDescription = "@column.ColumnDescription", IsPrimaryKey = true)]
-          @:public @column.DataType @column.DbColumnName { get; set; }
+        @:/// <summary>
+        @:/// @column.ColumnDescription
+        @:/// </summary>
+        @:[SugarColumn(IsIdentity = @column.IsIdentity.ToString().ToLower(), ColumnDescription = "@column.ColumnDescription", IsPrimaryKey = true)]
+        @:public @column.DataType @column.DbColumnName { get; set; }
 }
 else if(@Model.BaseClassName=="" && !@column.IsPrimarykey){
-          @:/// <summary>
-          @:/// @column.ColumnDescription
-          @:/// </summary>
-          @:public @column.DataType @column.DbColumnName { get; set; }
+        @:/// <summary>
+        @:/// @column.ColumnDescription
+        @:/// </summary>
+        @:[SugarColumn(ColumnDescription = "@column.ColumnDescription")]
+        @:public @column.DataType @column.DbColumnName { get; set; }
 }
 else if(@Model.BaseClassName!="" && @column.IsPrimarykey && @column.DbColumnName.ToLower()!="id"){
-          @:/// <summary>
-          @:/// @column.ColumnDescription
-          @:/// </summary>
-          @:[SugarColumn(IsIdentity = @column.IsIdentity.ToString().ToLower(), ColumnDescription = "@column.ColumnDescription", IsPrimaryKey = true)]
-          @:public @column.DataType @column.DbColumnName { get; set; }
+        @:/// <summary>
+        @:/// @column.ColumnDescription
+        @:/// </summary>
+        @:[SugarColumn(IsIdentity = @column.IsIdentity.ToString().ToLower(), ColumnDescription = "@column.ColumnDescription", IsPrimaryKey = true)]
+        @:public @column.DataType @column.DbColumnName { get; set; }
 }
 else if(@Model.BaseClassName!="" && !@column.IsPrimarykey && @column.DbColumnName.ToLower()!="id"){
-          @:/// <summary>
-          @:/// @column.ColumnDescription
-          @:/// </summary>
-          @:public @column.DataType @column.DbColumnName { get; set; }
+        @:/// <summary>
+        @:/// @column.ColumnDescription
+        @:/// </summary>
+        @:[SugarColumn(ColumnDescription = "@column.ColumnDescription")]
+        @:public @column.DataType @column.DbColumnName { get; set; }
 }
 }
-}	
+    }
 }