Просмотр исходного кода

1、修复代码生成设置作用类型为select时,index.vue.vm模板中select处代码使用的是外键(fk)模板导致的空指针异常;
2、修复代码生成单表存在多个select时,editDialog.vue.vm模板使用foreach处里导致生成多个import { getDictDataList } from '/@/api/system/admin';的异常

Signed-off-by: Flyash <860070066@qq.com>

Flyash 3 лет назад
Родитель
Сommit
7ba4493969

+ 1 - 3
Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/editDialog.vue.vm

@@ -135,11 +135,9 @@
 	@:import { get@(@column.FkEntityName)Dropdown } from '/@@/api/main/@(@Model.LowerClassName)';
 	}
 	}
-	@foreach (var column in Model.TableField){
-	if(@column.EffectType == "Select"){
+	@if(@Model.TableField.Any(x=>x.EffectType == "Select")){
 	@:import { getDictDataList } from '/@@/api/system/admin';
 
-	}
 	}
 	@foreach (var column in Model.TableField){
 	if(@column.EffectType == "Select"){

+ 1 - 1
Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm

@@ -35,7 +35,7 @@
               @:<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6" >
               @:<el-form-item label="@column.ColumnComment">				  
 				  @:<el-select clearable v-model="queryParams.@(@column.LowerColumnName)" placeholder="请选择@(@column.ColumnComment)">
-              @:<el-option v-for="(item,index) in @LowerFirstLetter(@column.FkEntityName)DropdownList" :key="index" :value="item.value" :label="item.label" >{{ item.label }}</el-option>
+              @:<el-option v-for="(item,index) in get@(@column.LowerColumnName)Data" :key="index" :value="item.value" :label="item.label" >{{ item.label }}</el-option>
               @:</el-select>
               @:</el-form-item>
               @:</el-col>