ソースを参照

fix: 修复登录验证配置已知的部分bug

喵你个旺呀 1 年間 前
コミット
88287199de

+ 2 - 2
Web/src/App.vue

@@ -134,8 +134,8 @@ const loadSysInfo = () => {
 			// 版权说明
 			themeConfig.value.copyright = data.copyright;
 			// 登录验证
-			themeConfig.value.secondVer = data.secondVer;
-			themeConfig.value.captcha = data.captcha;
+			themeConfig.value.secondVer = data.secondVer == 1;
+			themeConfig.value.captcha = data.captcha == 1;
 			// 注册功能
 			themeConfig.value.registration = data.registration;
 			// 更新配置加载状态

+ 1 - 1
Web/src/views/system/infoSetting/index.vue

@@ -103,7 +103,7 @@ const onSave = async () => {
 
 	try {
 		state.isLoading = true;
-		if (!state.formData.enableReg) {
+		if (state.formData.enableReg == 2) {
 			state.formData.regWayId = undefined;
 		} else if (!state.formData.regWayId) {
 			ElMessage.error('注册方案不能为空');

+ 11 - 12
Web/src/views/system/tenant/component/editTenant.vue

@@ -153,11 +153,8 @@
 								<el-form-item label="启用验证码" prop="captcha">
 									<el-switch
 											v-model="state.ruleForm.captcha"
-											inline-prompt
 											:active-value="1"
 											:inactive-value="2"
-											active-text="开启"
-											inactive-text="关闭"
 									/>
 								</el-form-item>
 							</el-col>
@@ -165,11 +162,8 @@
 								<el-form-item label="启用二次验证" prop="secondVer">
 									<el-switch
 											v-model="state.ruleForm.secondVer"
-											inline-prompt
 											:active-value="1"
 											:inactive-value="2"
-											active-text="开启"
-											inactive-text="关闭"
 									/>
 								</el-form-item>
 							</el-col>
@@ -250,13 +244,18 @@ const submit = async () => {
 	}
 	ruleFormRef.value.validate(async (valid: boolean) => {
 		if (!valid) return;
-		if (state.ruleForm.enableReg != 1) state.ruleForm.regWayId = undefined;
-		if (state.ruleForm.id != undefined && state.ruleForm.id > 0) {
-			await getAPI(SysTenantApi).apiSysTenantUpdatePost(state.ruleForm);
-		} else {
-			await getAPI(SysTenantApi).apiSysTenantAddPost(state.ruleForm);
+		state.loading = true;
+		try {
+			if (state.ruleForm.enableReg != 1) state.ruleForm.regWayId = undefined;
+			if (state.ruleForm.id != undefined && state.ruleForm.id > 0) {
+				await getAPI(SysTenantApi).apiSysTenantUpdatePost(state.ruleForm);
+			} else {
+				await getAPI(SysTenantApi).apiSysTenantAddPost(state.ruleForm);
+			}
+			closeDialog();
+		} finally {
+			state.loading = false;
 		}
-		closeDialog();
 	});
 };