From be0e711b8caf4085bd8b427fc200875893aa7de9 Mon Sep 17 00:00:00 2001 From: zuohuaijun Date: Mon, 24 Mar 2025 14:26:43 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8E1=E3=80=81=E7=99=BB=E9=99=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=A4=9A=E8=AF=AD=E8=A8=80?= =?UTF-8?q?=E9=80=89=E6=8B=A9=20=20=202=E3=80=81=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin.NET.Core/Admin.NET.Core.csproj | 8 +-- .../Admin.NET.Plugin.ReZero.csproj | 2 +- Web/package.json | 8 +-- Web/src/i18n/pages/login/en.ts | 6 +- Web/src/i18n/pages/login/zh-CN.ts | 3 +- Web/src/layout/navBars/topBar/user.vue | 9 +-- Web/src/views/login/component/account.vue | 55 --------------- Web/src/views/login/index.vue | 69 +++++++++++++++++-- 8 files changed, 81 insertions(+), 79 deletions(-) diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj index 3d3c6e48..d8f09480 100644 --- a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj +++ b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj @@ -28,9 +28,9 @@ - - - + + + @@ -56,7 +56,7 @@ - + diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.ReZero/Admin.NET.Plugin.ReZero.csproj b/Admin.NET/Plugins/Admin.NET.Plugin.ReZero/Admin.NET.Plugin.ReZero.csproj index 73c1b833..99d21411 100644 --- a/Admin.NET/Plugins/Admin.NET.Plugin.ReZero/Admin.NET.Plugin.ReZero.csproj +++ b/Admin.NET/Plugins/Admin.NET.Plugin.ReZero/Admin.NET.Plugin.ReZero.csproj @@ -26,7 +26,7 @@ - + diff --git a/Web/package.json b/Web/package.json index 9c5760ce..a7eea3d6 100644 --- a/Web/package.json +++ b/Web/package.json @@ -2,7 +2,7 @@ "name": "admin.net.pro", "type": "module", "version": "2.4.33", - "lastBuildTime": "2025.03.23", + "lastBuildTime": "2025.03.24", "description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架", "author": "zuohuaijun", "license": "MIT", @@ -77,8 +77,8 @@ "vue-signature-pad": "^3.0.2", "vue3-flag-icons": "^0.0.3", "vue3-tree-org": "^4.2.2", - "vxe-pc-ui": "^4.4.22", - "vxe-table": "^4.11.28", + "vxe-pc-ui": "^4.4.23", + "vxe-table": "^4.11.29", "vxe-table-plugin-element": "^4.0.4", "vxe-table-plugin-export-xlsx": "^4.0.7", "xe-utils": "^3.7.4", @@ -101,7 +101,7 @@ "eslint-plugin-vue": "^10.0.0", "globals": "^16.0.0", "less": "^4.2.2", - "openapi-ts-request": "^1.2.0", + "openapi-ts-request": "^1.3.0", "prettier": "^3.5.3", "rollup-plugin-visualizer": "^5.14.0", "sass": "^1.86.0", diff --git a/Web/src/i18n/pages/login/en.ts b/Web/src/i18n/pages/login/en.ts index c20727cc..9db083d3 100644 --- a/Web/src/i18n/pages/login/en.ts +++ b/Web/src/i18n/pages/login/en.ts @@ -31,8 +31,7 @@ export default { btnText: 'Sign in', loginfail: 'Login failed, please check your account!', retry: '{duration} seconds after the code is requested again', - msgText: - 'Warm tip: it is recommended to use Google, Microsoft edge, version 79.0.1072.62 and above browsers, and 360 browser, please use speed mode', + msgText: 'Warm tip: it is recommended to use Google, Microsoft edge, version 79.0.1072.62 and above browsers, and 360 browser, please use speed mode', }, scan: { text: 'Open the mobile phone to scan and quickly log in / register', @@ -40,5 +39,6 @@ export default { signInText: 'welcome back!', email: { emailPlaceholder: 'Please enter the email', - } + }, + viceDesc: 'Standing on the shoulders of giants NET Universal Permission Development Framework', }; diff --git a/Web/src/i18n/pages/login/zh-CN.ts b/Web/src/i18n/pages/login/zh-CN.ts index 5e58b1a7..14331886 100644 --- a/Web/src/i18n/pages/login/zh-CN.ts +++ b/Web/src/i18n/pages/login/zh-CN.ts @@ -39,5 +39,6 @@ export default { signInText: '欢迎回来！', email: { emailPlaceholder: '请输入邮箱', - } + }, + viceDesc: '站在巨人肩膀上的 .NET 通用权限开发框架', }; diff --git a/Web/src/layout/navBars/topBar/user.vue b/Web/src/layout/navBars/topBar/user.vue index 1a4cdf9f..7f628eb7 100644 --- a/Web/src/layout/navBars/topBar/user.vue +++ b/Web/src/layout/navBars/topBar/user.vue @@ -148,7 +148,6 @@ const state = reactive({ tagsViewList: [], tagsViewRoutesList: [], }); -const emit = defineEmits(['currentContextmenuClick']); // 设置分割样式 const layoutUserFlexNum = computed(() => { let num: string | number = ''; @@ -250,12 +249,8 @@ const onLanguageChange = (lang: string) => { other.useTitle(); initI18nOrSize('globalI18n', 'disabledI18n'); // window.location.reload(); - // 关闭全部tabpage. - closeAllTagsView(); -}; - -const closeAllTagsView = () => { - + // 关闭全部标签页 + // mittBus.emit('onCurrentContextmenuClick', { contextMenuClickId: 3 }); }; // 初始化组件大小/i18n diff --git a/Web/src/views/login/component/account.vue b/Web/src/views/login/component/account.vue index 6efca4ba..d1375666 100644 --- a/Web/src/views/login/component/account.vue +++ b/Web/src/views/login/component/account.vue @@ -67,30 +67,6 @@ -
-
{{ $t('message.account.changeLanguage') }}:
-
- -
- -
- - -
-
@@ -126,9 +102,6 @@ import { storeToRefs } from 'pinia'; import { accessTokenKey, clearTokens, feature, getAPI } from '/@/utils/axios-utils'; import { SysAuthApi } from '/@/api-services/api'; -import { languageList, getCountryCode } from '/@/i18n'; -import FlagIcon from 'vue3-flag-icons'; -import type { CountryCode } from 'vue3-flag-icons'; // 旋转图片滑块组件 // import verifyImg from '/@/assets/logo-mini.svg'; @@ -152,7 +125,6 @@ const loginFail = t('message.account.loginfail'); const notPrivilege = t('message.account.notprivilege'); const dragRef: any = ref(null); -const currentCountryCode = ref(getCountryCode(themeConfig.value.globalI18n)); const state = reactive({ isShowPassword: false, ruleForm: { @@ -178,23 +150,8 @@ const state = reactive({ isPassRotate: false, capsLockVisible: false, expirySeconds: 60 as any, // 验证码过期时间 - disabledI18n: 'zh-CN', }); -const onLanguageChange = (lang: string) => { - Local.remove('themeConfig'); - themeConfig.value.globalI18n = lang; - Local.set('themeConfig', themeConfig.value); - currentCountryCode.value = getCountryCode(lang); - locale.value = lang; - initI18nOrSize('globalI18n', 'disabledI18n'); -}; - -// 初始化组件大小/i18n -const initI18nOrSize = (value: string, attr: string) => { - (state)[attr] = Local.get('themeConfig')[value]; -}; - // 验证码过期计时器 let timer: any = null; @@ -473,17 +430,5 @@ defineExpose({ saveTokenAndInitRoutes }); .login-msg { color: var(--el-text-color-placeholder); } - .change-language { - display: flex; - justify-content: flex-end; - align-items: center; - margin-top: 5px; - margin-right: 20px; - - .change-language-title { - font-size: 12px; - color: var(--el-text-color-placeholder); - } - } } diff --git a/Web/src/views/login/index.vue b/Web/src/views/login/index.vue index e5e13782..908e1d4b 100644 --- a/Web/src/views/login/index.vue +++ b/Web/src/views/login/index.vue @@ -5,7 +5,8 @@