Prechádzať zdrojové kódy

chore: 😀修复修改系统配置时,无权获取注册方案的bug

喵你个旺呀 1 rok pred
rodič
commit
597fda1e5d

+ 5 - 0
Admin.NET/Admin.NET.Core/Service/Config/SysConfigService.cs

@@ -4,6 +4,8 @@
 //
 // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
 
+using Microsoft.AspNetCore.Mvc.Rendering;
+
 namespace Admin.NET.Core.Service;
 
 /// <summary>
@@ -246,6 +248,8 @@ public class SysConfigService : IDynamicApiController, ITransient
         
         var sysSecondVer = await GetConfigValue<bool>(ConfigConst.SysSecondVer);
         var sysCaptcha = await GetConfigValue<bool>(ConfigConst.SysCaptcha);
+
+        var wayList = await _sysConfigRep.Context.Queryable<SysUserRegWay>().Select(u => new { Label = u.Name, Value = u.Id }).ToListAsunc();
         return new
         {
             SysLogo = tenant.Logo,
@@ -260,6 +264,7 @@ public class SysConfigService : IDynamicApiController, ITransient
             SysRegistration = tenant.EnableReg == YesNoEnum.Y,
             SysSecondVer = sysSecondVer,
             SysCaptcha = sysCaptcha,
+            SysUserRegWayList = wayList
         };
     }
 

+ 4 - 7
Web/src/views/system/infoSetting/index.vue

@@ -57,7 +57,7 @@
 				</el-descriptions-item>
 				<el-descriptions-item label="注册方案" v-if="state.formData.sysRegistration">
 					<el-select v-model="state.formData.regWayId" placeholder="注册方案" clearable class="w100">
-						<el-option :label="item.name" :value="item.id" v-for="(item, index) in state.regWayData" :key="index" />
+						<el-option :label="item.label" :value="item.value" v-for="(item, index) in state.regWayData" :key="index" />
 					</el-select>
 				</el-descriptions-item>
 				<template #extra>
@@ -69,12 +69,12 @@
 </template>
 
 <script setup lang="ts" name="sysInfoSetting">
-import {nextTick, onMounted, reactive, ref} from 'vue';
+import {nextTick, reactive, ref} from 'vue';
 import { ElMessage, UploadInstance } from 'element-plus';
 import { fileToBase64 } from '/@/utils/base64Conver';
 
 import { getAPI } from '/@/utils/axios-utils';
-import {SysConfigApi, SysUserRegWayApi} from '/@/api-services';
+import {SysConfigApi} from '/@/api-services';
 
 const uploadRef = ref<UploadInstance>();
 const state = reactive({
@@ -99,10 +99,6 @@ const state = reactive({
 	},
 });
 
-onMounted(async () => {
-	state.regWayData = await getAPI(SysUserRegWayApi).apiSysUserRegWayListPost({}).then((res) => res.data.result ?? []);
-});
-
 // 通过onChange方法获得文件列表
 const handleUploadChange = (file: any) => {
 	uploadRef.value!.clearFiles();
@@ -181,6 +177,7 @@ const loadData = async () => {
 			regWayId: result.sysRegWayId,
 			sysRegistration: result.sysRegistration,
 		};
+		state.regWayData = result.sysUserRegWayList ?? [];
 	} finally {
 		nextTick(() => {
 			state.isLoading = false;