!1634 revert: 恢复验证码输入框的提示词和调整代码格式 fix: 移除普通租户的清空日志权限，防止普通租户清空全部系统日志

Merge pull request !1634 from ir0nmax/next

Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs

@@ -331,6 +331,8 @@ public class SysTenantService : IDynamicApiController, ITransient
         var logMenu = allMenuList.First(u => u.Type == MenuTypeEnum.Dir && u.Title == "日志管理");
         menuList.Add(logMenu);
         menuList.AddRange(allMenuList.ToChildList(u => u.Id, u => u.Pid, u => u.Pid == logMenu.Id && new[] { "访问日志", "操作日志" }.Contains(u.Title)));
+        var logMenuIds = menuList.Where(u => u.Type == MenuTypeEnum.Menu && new[] { "访问日志", "操作日志" }.Contains(u.Title)).Select(u => u.Id).ToList();
+        menuList = menuList.Where(u => !logMenuIds.Contains(u.Pid) || !new[] { "清空" }.Contains(u.Title)).ToList();
 
         var flow = _sysTenantRep.Context.Queryable<SysMenu>().First(u => u.Type == MenuTypeEnum.Menu && u.Title == "审批流程");
         menuList.Add(allMenuList.First(u => u.Type == MenuTypeEnum.Dir && u.Title == "帮助文档"));

Web/src/views/login/component/account.vue

@@ -37,7 +37,7 @@
 						ref="codeRef"
 						text
 						maxlength="4"
-						:placeholder="$t('message.account.accountPlaceholder3')"
+						:placeholder="$t('message.account.accountPlaceholder4')"
 						v-model="state.ruleForm.code"
 						clearable
 						autocomplete="off"
@@ -83,7 +83,7 @@
 </template>
 
 <script lang="ts" setup name="loginAccount">
-import {reactive, computed, ref, onMounted, defineAsyncComponent, onUnmounted, watch } from 'vue';
+import { reactive, computed, ref, onMounted, defineAsyncComponent, onUnmounted, watch } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { ElMessage, InputInstance } from 'element-plus';
 import { useI18n } from 'vue-i18n';
@@ -208,7 +208,7 @@ const getCaptcha = async () => {
 	const res = await getAPI(SysAuthApi).apiSysAuthCaptchaGet().then(res => res.data.result);
 	state.captchaImage = 'data:text/html;base64,' + res?.img;
 	state.expirySeconds = res?.expirySeconds;
-  state.ruleForm.codeId = res?.id;
+	state.ruleForm.codeId = res?.id;
 };
 
 // 获取时间
@@ -230,7 +230,7 @@ const onSignIn = async () => {
 			const password = sm2.doEncrypt(state.ruleForm.password, publicKey, 1);
 
 			state.ruleForm.tenantId ??= props.tenantInfo.id ?? props.tenantInfo.list[0]?.value ?? -1;
-			console.log(state.ruleForm.tenantId)
+			// console.log(state.ruleForm.tenantId);
 			const [err, res] = await feature(getAPI(SysAuthApi).apiSysAuthLoginPost({ ...state.ruleForm, password: password } as any));
 			if (err) {
 				getCaptcha(); // 重新获取验证码