Ver código fonte

1、补全修正CodeGen.json,修复“生成实体”时因此产生的模板缺失、字段冗余等问题
2、SeedData增加“无基类”条目,用于“生成实体”时选择

will 2 anos atrás
pai
commit
b4f897cac3

+ 5 - 3
Admin.NET/Admin.NET.Application/Configuration/CodeGen.json

@@ -4,12 +4,14 @@
   // 代码生成配置项-程序集名称集合
   "CodeGen": {
     "EntityAssemblyNames": [ "Admin.NET.Core", "Admin.NET.Application" ],
-    "BaseEntityNames": [ "EntityTenant", "EntityBase", "EntityBaseId" ],
+    "BaseEntityNames": [ "EntityTenantId", "EntityTenant","EntityBaseData", "EntityBase", "EntityBaseId" ],
     "EntityBaseColumn": {
+      "EntityTenantId": [ "Id", "TenantId" ],
       "EntityTenant": [ "Id", "CreateTime", "UpdateTime", "CreateUserId", "UpdateUserId", "IsDelete", "TenantId" ],
+      "EntityBaseData": [ "Id", "CreateTime", "UpdateTime", "CreateUserId", "UpdateUserId", "IsDelete", "CreateOrgId" ],
       "EntityBase": [ "Id", "CreateTime", "UpdateTime", "CreateUserId", "UpdateUserId", "IsDelete" ],
-      "EntityBaseId": [ "Id", "TenantId" ],
-      "BaseId": [ "Id" ]
+      "EntityBaseId": [ "Id" ]
+      //"BaseId": [ "Id" ]
     },
     "FrontRootPath": "Web", // 前端文件根目录
     "BackendApplicationNamespace": "Admin.NET.Application" // 后端生成到的项目

+ 1 - 0
Admin.NET/Admin.NET.Core/SeedData/SysDictDataSeedData.cs

@@ -67,6 +67,7 @@ public class SysDictDataSeedData : ISqlSugarEntitySeedData<SysDictData>
             new SysDictData{ Id=1300000000503, DictTypeId=1300000000105, Value="EntityTenantId【租户实体Id】", Code="EntityTenantId", OrderNo=1, Remark="【租户实体Id】", Status=StatusEnum.Disable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysDictData{ Id=1300000000504, DictTypeId=1300000000105, Value="EntityTenant【租户实体】", Code="EntityTenant", OrderNo=1, Remark="【租户实体】", Status=StatusEnum.Disable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysDictData{ Id=1300000000505, DictTypeId=1300000000105, Value="EntityBaseData【业务实体】", Code="EntityBaseData", OrderNo=1, Remark="【业务实体】", Status=StatusEnum.Disable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=1300000000506, DictTypeId=1300000000105, Value="无基类", Code="", OrderNo=1, Remark="【无基类】", Status=StatusEnum.Disable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
 
             new SysDictData{ Id=1300000000601, DictTypeId=1300000000106, Value="集团", Code="101", OrderNo=100, Remark="集团", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
             new SysDictData{ Id=1300000000602, DictTypeId=1300000000106, Value="公司", Code="201", OrderNo=101, Remark="公司", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },

+ 1 - 1
Web/src/views/system/database/component/addTable.vue

@@ -141,7 +141,7 @@ const submit = () => {
 		if (state.tableData.length === 0) {
 			ElMessage({
 				type: 'error',
-				message: `请选择库名!`,
+				message: `请添加列!`,
 			});
 			return;
 		}