From 512f0d6c7a1586baeb524b28620772f1845bdfda Mon Sep 17 00:00:00 2001
From: zuohuaijun <zuohuaijun@163.com>
Date: Thu, 12 Dec 2024 01:45:06 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8E1=E3=80=81=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=94=B9=E5=8F=98=E6=97=B6=E5=9B=BE=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=8D=E6=9B=B4=E6=96=B0=E7=9A=84=E9=97=AE=E9=A2=98=20=202?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E5=A4=8D=E5=88=87=E6=8D=A2=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E5=8D=A1=E6=97=B6=E5=88=B7=E6=96=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20=203=E3=80=81=E4=BF=AE=E5=A4=8D=E6=A0=87=E9=A2=98logo?=
 =?UTF-8?q?=E5=B1=85=E4=B8=AD=E9=97=AE=E9=A2=98=20=204=E3=80=81=E5=8D=87?=
 =?UTF-8?q?=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/Admin.NET.Core/Admin.NET.Core.csproj |  4 ++--
 Web/package.json                               |  6 +++---
 Web/src/components/scEcharts/index.vue         |  4 +++-
 Web/src/layout/logo/index.vue                  |  6 +++---
 Web/src/layout/routerView/parent.vue           | 13 +++++++------
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
index ff272fa8..06668aed 100644
--- a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
+++ b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Magicodes.IE.Excel" Version="2.7.5.2" />
     <PackageReference Include="Magicodes.IE.Pdf" Version="2.7.5.2" />
     <PackageReference Include="Magicodes.IE.Word" Version="2.7.5.2" />
-    <PackageReference Include="MailKit" Version="4.8.0" />
+    <PackageReference Include="MailKit" Version="4.9.0" />
     <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.6" />
     <PackageReference Include="MiniExcel" Version="1.35.0" />
     <PackageReference Include="MiniWord" Version="0.8.0" />
@@ -46,7 +46,7 @@
     <PackageReference Include="SSH.NET" Version="2024.2.0" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.5.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
-    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1138" />
+    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1139" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
   </ItemGroup>
diff --git a/Web/package.json b/Web/package.json
index f5bea69b..cd9ba179 100644
--- a/Web/package.json
+++ b/Web/package.json
@@ -2,7 +2,7 @@
 	"name": "admin.net.pro",
 	"type": "module",
 	"version": "2.4.33",
-	"lastBuildTime": "2024.12.10",
+	"lastBuildTime": "2024.12.12",
 	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
 	"author": "zuohuaijun",
 	"license": "MIT",
@@ -74,7 +74,7 @@
 		"vue-router": "^4.5.0",
 		"vue-signature-pad": "^3.0.2",
 		"vue3-tree-org": "^4.2.2",
-		"vxe-pc-ui": "^4.3.23",
+		"vxe-pc-ui": "^4.3.27",
 		"vxe-table": "^4.8.10",
 		"vxe-table-plugin-element": "^4.0.4",
 		"vxe-table-plugin-export-xlsx": "^4.0.7",
@@ -85,7 +85,7 @@
 		"@iconify/vue": "^4.2.0",
 		"@plugin-web-update-notification/vite": "^1.7.1",
 		"@types/lodash-es": "^4.17.12",
-		"@types/node": "^20.17.9",
+		"@types/node": "^20.17.10",
 		"@types/nprogress": "^0.2.3",
 		"@types/sortablejs": "^1.15.8",
 		"@typescript-eslint/eslint-plugin": "^8.18.0",
diff --git a/Web/src/components/scEcharts/index.vue b/Web/src/components/scEcharts/index.vue
index d81a7af8..6a1155d0 100644
--- a/Web/src/components/scEcharts/index.vue
+++ b/Web/src/components/scEcharts/index.vue
@@ -31,7 +31,9 @@ export default {
 		option: {
 			deep: true,
 			handler(v) {
-				unwarp(this.myChart).setOption(v);
+				this.$nextTick(() => {
+					unwarp(this.myChart).setOption(v);
+				});
 			},
 		},
 	},
diff --git a/Web/src/layout/logo/index.vue b/Web/src/layout/logo/index.vue
index 0ef28518..3dacd147 100644
--- a/Web/src/layout/logo/index.vue
+++ b/Web/src/layout/logo/index.vue
@@ -36,11 +36,11 @@ const onThemeConfigChange = () => {
 
 <style scoped lang="scss">
 .layout-logo {
-	width: 300px;
+	width: 220px;
 	height: 50px;
 	display: flex;
 	align-items: center;
-	margin-left: 15px;
+	justify-content: center;
 	box-shadow: rgb(0 21 41 / 2%) 0px 1px 4px;
 	color: var(--el-color-primary);
 	font-size: 16px;
@@ -58,7 +58,7 @@ const onThemeConfigChange = () => {
 		}
 	}
 	&-medium-img {
-		width: 12%;
+		width: 15%;
 		margin-right: 5px;
 		padding: 3px;
 	}
diff --git a/Web/src/layout/routerView/parent.vue b/Web/src/layout/routerView/parent.vue
index 404fa489..74c65d30 100644
--- a/Web/src/layout/routerView/parent.vue
+++ b/Web/src/layout/routerView/parent.vue
@@ -65,16 +65,17 @@ const getIframeListRoutes = async () => {
 onBeforeMount(() => {
 	state.keepAliveNameList = keepAliveNames.value;
 	mittBus.on('onTagsViewRefreshRouterView', (fullPath: string) => {
+		const cacheList = cachedViews.value;
+		if (route.meta.isKeepAlive) cachedViews.value = cachedViews.value?.filter((name: string) => route.name !== name);
 		state.keepAliveNameList = keepAliveNames.value.filter((name: string) => route.name !== name);
 		state.refreshRouterViewKey = '';
 		state.iframeRefreshKey = '';
-		cachedViews.value = [];
-		setTimeout(() => {
-			state.iframeRefreshKey = fullPath;
-			state.refreshRouterViewKey = fullPath;
-			cachedViews.value = [<string>route.name];
+		nextTick(() => {
+			if (route.meta.isKeepAlive) cachedViews.value = cacheList;
 			state.keepAliveNameList = keepAliveNames.value;
-		}, 10);
+			state.refreshRouterViewKey = fullPath;
+			state.iframeRefreshKey = fullPath;
+		});
 	});
 });
 // 页面加载时