模版:枚举:取消接口获取，改为字典获取

Signed-off-by: IMaster <logole@live.cn>

Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/editDialog.vue.vm

@@ -135,7 +135,7 @@
 					@:<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						@:<el-form-item label="@column.ColumnComment" prop="@(@column.LowerPropertyName)">
 							@:<el-select clearable v-model="ruleForm.@(@column.LowerPropertyName)" placeholder="请选择@(@column.ColumnComment)">
-								@:<el-option v-for="(item,index) in  getEnum@(@column.PropertyName)Data" :key="index" :value="item.value" :label="`[${item.value}] ${item.describe}`"></el-option>
+								@:<el-option v-for="(item,index) in dl('@(@column.PropertyName)Enum')" :key="index" :value="item.value" :label="`${item.name} (${item.code}) [${item.value}]`"></el-option>
 								@:
 							</el-select>
 							@:
@@ -172,14 +172,23 @@
 	import type { FormRules } from "element-plus";
 @if(@Model.TableField.Any(x=>x.EffectType == "ConstSelector")){
 	@:import { getConstType } from "/@@/utils/constHelper";
-	}
+}
+@if(@Model.TableField.Any(x=>x.EffectType == "Select")){
+	@:import { getDictDataItem as di, getDictDataList as dl } from '/@@/utils/dict-utils';
+}
+@if(@Model.TableField.Any(x=>x.EffectType == "EnumSelector")){
+	@:import { getDictLabelByVal as dv } from '/@@/utils/dict-utils';
+}
+@if(@Model.TableField.Any(x=>x.EffectType == "DatePicker")){
+  	@:import { formatDate } from '/@@/utils/formatTime';
+}
 @if(@Model.TableField.Any(x=>x.EffectType == "Upload")){
     @:import { Plus } from "@@element-plus/icons-vue";
     @:import { UploadRequestOptions } from "element-plus";
     @:import {@string.Join(",",Model.TableField.Where(x=>x.EffectType == "Upload").Select(x=>"upload"+x.PropertyName).ToList())} from '/@@/api/@(@Model.PagePath)/@(@Model.LowerClassName)';
 }
 	import { add@(@Model.ClassName), update@(@Model.ClassName), detail@(@Model.ClassName) } from "/@@/api/@(@Model.PagePath)/@(@Model.LowerClassName)";
-	@foreach (var column in Model.TableField){
+@foreach (var column in Model.TableField){
 	if(@column.EffectType == "ApiTreeSelect" && !definedObjects.ContainsKey("import__@(@column.FkEntityName)Tree")){
 	@{definedObjects.Add("import__@(@column.FkEntityName)Tree", 1);}
 	@:import { get@(@column.FkEntityName)Tree } from '/@@/api/@(@Model.PagePath)/@(@Model.LowerClassName)';
@@ -187,17 +196,12 @@
 	if(@column.EffectType == "fk" && @column.WhetherAddUpdate == "Y"){
 	@:import { get@(@column.FkEntityName)@(@column.PropertyName)Dropdown } from '/@@/api/@(@Model.PagePath)/@(@Model.LowerClassName)';
 	}
-	}
-	@if(@Model.TableField.Any(x=>x.EffectType == "EnumSelector")){
+}
+@if(@Model.TableField.Any(x=>x.EffectType == "EnumSelector")){
 	@:import { getAPI } from '/@@/utils/axios-utils';
 	@:import { SysEnumApi } from '/@@/api-services/api';
-	}
+}
 
-	@foreach (var column in Model.TableField){
-	if(@column.EffectType == "EnumSelector"){
-	@:const getEnum@(@column.PropertyName)Data = ref<any>([]);
-	}
-	}
 	//父级传递来的参数
 	var props = defineProps({
 		title: {
@@ -220,7 +224,12 @@
 		@:@column.LowerPropertyName: [{required: true, message: '请选择@(@column.ColumnComment)！', trigger: 'change',},],
 		}
     }
-  }
+}
+	});
+
+	// 页面加载时
+	onMounted(() => {
+
 	});
 
 	// 打开弹窗
@@ -312,16 +321,6 @@
 		}
 	}
 
-
-	// 页面加载时
-	onMounted(async () => {
-		@foreach (var column in Model.TableField){
-		if(@column.EffectType == "EnumSelector"){
-			@:getEnum@(@column.PropertyName)Data.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('@(@column.DictTypeCode)')).data.result ?? [];
-		}
-		}
-	});
-
 	//将属性或者函数暴露给父组件
 	defineExpose({ openDialog });
 </script>

Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm

@@ -47,7 +47,7 @@
             }else if(@column.EffectType == "fk"){
             @:<el-form-item label="@column.ColumnComment">
               @:<el-select clearable="" filterable="" v-model="queryParams.@(@column.LowerPropertyName)" placeholder="请选择@(@column.ColumnComment)">
-                @:<el-option v-for="(item,index) in  @LowerFirstLetter(@column.FkEntityName)@(@column.PropertyName)DropdownList" :key="index" :value="item.value" :label="item.label" />
+                @:<el-option v-for="(item,index) in @LowerFirstLetter(@column.FkEntityName)@(@column.PropertyName)DropdownList" :key="index" :value="item.value" :label="item.label" />
                 @:
               </el-select>
               @:
@@ -63,7 +63,7 @@
             }else if(@column.EffectType == "EnumSelector"){
             @:<el-form-item label="@column.ColumnComment">
               @:<el-select clearable="" v-model="queryParams.@(@column.LowerPropertyName)" placeholder="请选择@(@column.ColumnComment)">
-                @:<el-option v-for="(item,index) in getEnum@(@column.PropertyName)Data_Index" :key="index" :value="item.value" :label="`[${item.value}] ${item.describe}`" />
+                @:<el-option v-for="(item,index) in dl('@(@column.PropertyName)Enum')" :key="index" :value="item.value" :label="`${item.name} (${item.code}) [${item.value}] `" />
                 @:
               </el-select>
               @:
@@ -165,7 +165,7 @@
         else if(@column.EffectType == "EnumSelector"){
           @:<el-table-column prop="@column.LowerPropertyName" label="@column.ColumnComment" @(column.WhetherSortable == "Y" ? "sortable='custom'" : "") show-overflow-tooltip="" >
             @:<template #default="scope">
-              @:<el-tag>{{ getEnumDesc(scope.row.@column.LowerPropertyName, getEnum@(@column.PropertyName)Data_Index)}}</el-tag>
+              @:<el-tag :type="dv('@(@column.PropertyName)Enum', scope.row.@(@column.LowerPropertyName))?.tagType"> {{dv('@(@column.PropertyName)Enum', scope.row.@column.LowerPropertyName)?.name}}</el-tag>
             @:</template>
           @:</el-table-column>
         }
@@ -215,11 +215,19 @@
   import { ref } from "vue";
   import { ElMessageBox, ElMessage } from "element-plus";
   import { auth } from '/@@/utils/authFunction';
+
   @if(@Model.TableField.Any(x=>x.EffectType == "ConstSelector")){
   @:import { codeToName, getConstType } from "/@@/utils/constHelper";
   } 
-  import { getDictDataItem as di, getDictDataList as dl } from '/@@/utils/dict-utils';
-  import { formatDate } from '/@@/utils/formatTime';
+  @if(@Model.TableField.Any(x=>x.EffectType == "Select")){
+  @:import { getDictDataItem as di, getDictDataList as dl } from '/@@/utils/dict-utils';
+  }
+  @if(@Model.TableField.Any(x=>x.EffectType == "EnumSelector")){
+  @:import { getDictLabelByVal as dv } from '/@@/utils/dict-utils';
+  }
+  @if(@Model.TableField.Any(x=>x.EffectType == "DatePicker")){
+  @:import { formatDate } from '/@@/utils/formatTime';
+  }
 
   @if(@Model.PrintType == "custom"){
   @:// 推荐设置操作 width 为 200
@@ -248,9 +256,6 @@
   }
   }
 
-  @if(@Model.QueryWhetherList.Any(x=>x.EffectType == "EnumSelector")){
-	@:const { getEnumDesc } = commonFunction();
-	}
   @if(haveLikeCdt){
   @:const showAdvanceQueryUI = ref(false);
   }else {
@@ -274,7 +279,6 @@
   const changeAdvanceQueryUI = () => {
     showAdvanceQueryUI.value = !showAdvanceQueryUI.value;
   }
-  
 
   // 查询操作
   const handleQuery = async () => {
@@ -283,11 +287,6 @@
     tableData.value = res.data.result?.items ?? [];
     tableParams.value.total = res.data.result?.total;
     loading.value = false;
-  @foreach (var column in Model.QueryWhetherList){
-  if(@column.EffectType == "EnumSelector"){
-    @:getEnum@(@column.PropertyName)Data_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('@(@column.DictTypeCode)')).data.result ?? [];
-  }
-  }
   };
 
   // 列排序