Merge branch 'next' of https://gitee.com/zuohuaijun/Admin.NET into next

Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenConfigService.cs

@@ -36,8 +36,9 @@ public class SysCodeGenConfigService : IDynamicApiController, ITransient
             .Select<CodeGenConfig>()
             .Mapper(u =>
             {
-                u.NetType = (u.EffectType == "EnumSelector" ? u.DictTypeCode : u.NetType);
+                u.NetType = (u.EffectType == "EnumSelector" || u.EffectType == "ConstSelector" ? u.DictTypeCode : u.NetType);
             })
+
             .OrderBy(u => u.OrderNo)
             .ToListAsync();
     }

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

@@ -93,7 +93,7 @@
             @:<el-tag v-if="scope.row.@(@column.LowerColumnName)"> 是 </el-tag>
             @:<el-tag type="danger" v-else=""> 否 </el-tag>
             }else if(@column.EffectType == "ConstSelector"){
-            @:<span>{{codeToName(scope.row.@(@column.LowerColumnName), '@(@column.DictTypeCode)')}</span>
+            @:<span>{{codeToName(scope.row.@(@column.LowerColumnName), '@(@column.DictTypeCode)')}}</span>
             }
             @:
           </template>

Web/src/utils/constHelper.ts

@@ -1,5 +1,6 @@
 import type { App } from 'vue';
 import { useUserInfo } from '/@/stores/userInfo';
+import request from '/@/utils/request';
 
 export function setupConstFilter(app: App) {
 	// 全局过滤器  在vue文件中调用  $filters.codeToName(code,type)
@@ -30,3 +31,10 @@ export function getConstType(type: any) {
 	const constType = userStore.constList.filter((x: any) => x.code === type)[0].data;
 	return constType;
 }
+
+export function getConstSelectorList(typeName: string) {
+	return request({
+		url: `/api/sysConst/data/${typeName}`,
+		method: 'get',
+	});
+}