Przeglądaj źródła

!637 【修复】开发工具-》库表管理-》生成实体【基类下拉框】数据赋值问题以及优化后端增加抛出异常
* 【修复】开发工具-》库表管理-》生成实体【基类下拉框】数据赋值

老李头 3 lat temu
rodzic
commit
916d86ed5a

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

@@ -197,7 +197,11 @@ public class SysDatabaseService : IDynamicApiController, ITransient
         var config = App.GetOptions<DbConnectionOptions>().ConnectionConfigs.FirstOrDefault(u => u.ConfigId == input.ConfigId);
         input.Position = string.IsNullOrWhiteSpace(input.Position) ? "Admin.NET.Application" : input.Position;
         input.EntityName = string.IsNullOrWhiteSpace(input.EntityName) ? (config.EnableUnderLine ? CodeGenUtil.CamelColumnName(input.TableName, null) : input.TableName) : input.EntityName;
-        string[] dbColumnNames = _codeGenOptions.EntityBaseColumn[input.BaseClassName];
+        
+        string[] dbColumnNames;//= _codeGenOptions.EntityBaseColumn[input.BaseClassName];
+        _codeGenOptions.EntityBaseColumn.TryGetValue(input.BaseClassName, out dbColumnNames);
+        if (dbColumnNames is null || dbColumnNames is { Length: 0 })
+            throw Oops.Oh("基类配置文件不存在此类型");
 
         var templatePath = GetEntityTemplatePath();
         var targetPath = GetEntityTargetPath(input);

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

@@ -22,7 +22,7 @@
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="基类" prop="baseClassName">
 							<el-select v-model="state.ruleForm.baseClassName" clearable class="w100">
-								<el-option v-for="item in state.codeGenBaseClassName" :key="item.value" :label="item.label" :value="item.value" />
+								<el-option v-for="item in state.codeGenBaseClassName" :key="item.code" :label="item.value" :value="item.code" />
 							</el-select>
 						</el-form-item>
 					</el-col>