!911 优化生成代码，显示公共列，可以自定义选择显示。

Merge pull request !911 from npc6/next

Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenConfigService.cs

@@ -31,7 +31,7 @@ public class SysCodeGenConfigService : IDynamicApiController, ITransient
     public async Task<List<CodeGenConfig>> GetList([FromQuery] CodeGenConfig input)
     {
         return await _db.Queryable<SysCodeGenConfig>()
-            .Where(u => u.CodeGenId == input.CodeGenId && u.WhetherCommon != YesNoEnum.Y.ToString())
+            .Where(u => u.CodeGenId == input.CodeGenId)
             .Select<CodeGenConfig>()
             .Mapper(u =>
             {
@@ -100,7 +100,7 @@ public class SysCodeGenConfigService : IDynamicApiController, ITransient
                 YesOrNo = YesNoEnum.N.ToString();
             }
 
-            if (CodeGenUtil.IsCommonColumn(tableColumn.ColumnName))
+            if (CodeGenUtil.IsCommonColumn(tableColumn.PropertyName))
             {
                 codeGenConfig.WhetherCommon = YesNoEnum.Y.ToString();
                 YesOrNo = YesNoEnum.N.ToString();

Admin.NET/Admin.NET.Core/Util/CodeGenUtil.cs

@@ -291,6 +291,8 @@ public static class CodeGenUtil
             nameof(EntityBase.UpdateTime),
             nameof(EntityBase.CreateUserId),
             nameof(EntityBase.UpdateUserId),
+            nameof(EntityBase.CreateUserName),
+            nameof(EntityBase.UpdateUserName),
             nameof(EntityBase.IsDelete)
         };
         return columnList.Contains(columnName);

Web/src/views/system/codeGen/component/genConfigDialog.vue

@@ -174,8 +174,7 @@ const handleQuery = async (row: any) => {
 
 // 判断是否（用于是否能选择或输入等）
 function judgeColumns(data: any) {
-	var lst = ['createdUserName', 'createdTime', 'updatedUserName', 'updatedTime'];
-	return lst.indexOf(data.columnName) > -1 || data.columnKey === 'True';
+	return data.whetherCommon == true || data.columnKey === 'True';
 }
 
 function effectTypeEnable(data: any) {