From 707e44ee1af578b0c3486ca723991f1378510583 Mon Sep 17 00:00:00 2001 From: zuohuaijun Date: Wed, 8 Oct 2025 03:11:42 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8E1=E3=80=81=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=8A=A0=E8=BD=BD=E7=B3=BB=E7=BB=9F=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=80=BB=E8=BE=91=EF=BC=88=E6=B8=85=E7=A9=BA=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E7=BC=93=E5=AD=98=E6=97=B6=EF=BC=89=20=20=202?= =?UTF-8?q?=E3=80=81=E5=8D=87=E7=BA=A7=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 | 4 ++-- .../Admin.NET.Test/Admin.NET.Test.csproj | 2 +- Web/package.json | 22 +++++++++---------- Web/src/layout/navBars/topBar/settings.vue | 2 +- Web/src/layout/navBars/topBar/user.vue | 2 +- Web/src/views/login/component/account.vue | 10 +++++---- 6 files changed, 22 insertions(+), 20 deletions(-) diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj index b6cfd5c5..b00156b0 100644 --- a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj +++ b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj @@ -44,7 +44,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/Admin.NET/Admin.NET.Test/Admin.NET.Test.csproj b/Admin.NET/Admin.NET.Test/Admin.NET.Test.csproj index 41935c8a..1652a4c1 100644 --- a/Admin.NET/Admin.NET.Test/Admin.NET.Test.csproj +++ b/Admin.NET/Admin.NET.Test/Admin.NET.Test.csproj @@ -13,7 +13,7 @@ - + compile diff --git a/Web/package.json b/Web/package.json index 9ee6d5f5..5f8e4962 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.10.01", + "lastBuildTime": "2025.10.08", "description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架", "author": "zuohuaijun", "license": "MIT", @@ -51,7 +51,7 @@ "magic-string": "^0.30.19", "md-editor-v3": "^6.0.1", "mitt": "^3.0.1", - "monaco-editor": "^0.53.0", + "monaco-editor": "^0.54.0", "mqtt": "^5.14.0", "nprogress": "^0.2.0", "ol": "^10.6.1", @@ -65,7 +65,7 @@ "sm-crypto-v2": "^1.14.0", "sortablejs": "^1.15.6", "splitpanes": "^4.0.4", - "sql-formatter": "^15.6.9", + "sql-formatter": "^15.6.10", "uuid": "^13.0.0", "vcrontab-3": "^3.3.22", "vform3-builds": "^3.0.10", @@ -90,11 +90,11 @@ "@iconify/vue": "^5.0.0", "@plugin-web-update-notification/vite": "^2.0.2", "@types/lodash-es": "^4.17.12", - "@types/node": "^22.18.7", + "@types/node": "^22.18.8", "@types/nprogress": "^0.2.3", "@types/sortablejs": "^1.15.8", - "@typescript-eslint/eslint-plugin": "^8.45.0", - "@typescript-eslint/parser": "^8.45.0", + "@typescript-eslint/eslint-plugin": "^8.46.0", + "@typescript-eslint/parser": "^8.46.0", "@vitejs/plugin-vue": "^6.0.1", "@vitejs/plugin-vue-jsx": "^5.1.1", "@vue/compiler-sfc": "^3.5.22", @@ -102,16 +102,16 @@ "code-inspector-plugin": "^1.2.10", "colors": "^1.4.0", "dotenv": "^17.2.3", - "eslint": "^9.36.0", + "eslint": "^9.37.0", "eslint-plugin-vue": "^10.5.0", "globals": "^16.4.0", - "less": "^4.4.1", + "less": "^4.4.2", "prettier": "^3.6.2", - "rollup-plugin-visualizer": "^6.0.3", + "rollup-plugin-visualizer": "^6.0.4", "sass": "^1.93.2", "terser": "^5.44.0", - "typescript": "^5.9.2", - "vite": "^7.1.7", + "typescript": "^5.9.3", + "vite": "^7.1.9", "vite-auto-i18n-plugin": "^1.1.9", "vite-plugin-cdn-import": "^1.0.1", "vite-plugin-compression2": "^2.2.1", diff --git a/Web/src/layout/navBars/topBar/settings.vue b/Web/src/layout/navBars/topBar/settings.vue index b82c6bcd..2d8333ea 100644 --- a/Web/src/layout/navBars/topBar/settings.vue +++ b/Web/src/layout/navBars/topBar/settings.vue @@ -706,8 +706,8 @@ const onCopyConfigClick = () => { }; // 一键恢复默认 const onResetConfigClick = () => { - Local.clear(); Session.clear(); + Local.clear(); window.location.reload(); // @ts-ignore Local.set('version', __NEXT_VERSION__); diff --git a/Web/src/layout/navBars/topBar/user.vue b/Web/src/layout/navBars/topBar/user.vue index ee09448f..2c9a435f 100644 --- a/Web/src/layout/navBars/topBar/user.vue +++ b/Web/src/layout/navBars/topBar/user.vue @@ -186,8 +186,8 @@ const onLayoutSetingClick = () => { // 下拉菜单点击时 const onHandleCommandClick = (path: string) => { if (path === 'clearCache') { - Local.clear(); Session.clear(); + Local.clear(); window.location.reload(); } else if (path === 'lockScreen') { Local.remove('themeConfig'); diff --git a/Web/src/views/login/component/account.vue b/Web/src/views/login/component/account.vue index 8fb513d9..fb2c6e05 100644 --- a/Web/src/views/login/component/account.vue +++ b/Web/src/views/login/component/account.vue @@ -161,10 +161,12 @@ onMounted(async () => { const accessToken = route.query.token; if (accessToken) await saveTokenAndInitRoutes(accessToken); - // // 若公钥为空则刷新页面 - // if (window.__env__.VITE_SM_PUBLIC_KEY == '' || window.__env__.VITE_SM_PUBLIC_KEY == undefined) { - // window.location.reload(); - // } + // 若系统配置为空则刷新页面 + if (themeConfig.value.captcha == undefined) { + setTimeout(() => { + window.location.reload(); + }, 1000); + } // 获取登录配置 state.secondVerEnabled = themeConfig.value.secondVer ?? false;