瀏覽代碼

!591 代码生成异常处理
Merge pull request !591 from Flyash/N/A

zuohuaijun 3 年之前
父節點
當前提交
e1952b5d34

+ 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>