😉升级所有依赖及其他调整优化

Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -26,14 +26,14 @@
     <PackageReference Include="Lazy.Captcha.Core" Version="2.0.3" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.7.4.5" />
     <PackageReference Include="Magicodes.IE.Pdf" Version="2.7.4.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.18" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.19" />
     <PackageReference Include="NEST" Version="7.17.5" />
     <PackageReference Include="NewLife.Redis" Version="5.4.2023.601" />
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.9" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.30.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.19.0" />
     <PackageReference Include="SqlSugarCore" Version="5.1.4.85" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.2" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.3" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
   </ItemGroup>

Admin.NET/Admin.NET.Web.Core/Admin.NET.Web.Core.csproj

@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="IGeekFan.AspNetCore.Knife4jUI" Version="0.0.13" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.2" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.3" />
   </ItemGroup>
 
   <ItemGroup>

Admin.NET/Admin.NET.Web.Entry/Dockerfile

@@ -1,6 +1,6 @@
 FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
 WORKDIR /app
-EXPOSE 5050
+EXPOSE 5005
 
 COPY . .
 ENTRYPOINT ["dotnet", "Admin.NET.Web.Entry.dll"]

Web/src/components/cropper/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<el-dialog v-model="state.isShowDialog" width="769px">
+		<el-dialog v-model="state.isShowDialog" width="769px" :before-close="onCancel">
 			<template #header>
 				<div style="color: #fff">
 					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>

Web/src/views/system/org/component/editOrg.vue

@@ -105,7 +105,7 @@ const openDialog = (row: any) => {
 
 // 关闭弹窗
 const closeDialog = () => {
-	emits('handleQuery');
+	emits('handleQuery', true);
 	state.isShowDialog = false;
 };
 

Web/src/views/system/org/index.vue

@@ -94,13 +94,17 @@ onMounted(async () => {
 });
 
 // 查询操作
-const handleQuery = async () => {
+const handleQuery = async (updateTree: boolean = false) => {
 	state.loading = true;
 	var res = await getAPI(SysOrgApi).apiSysOrgListGet(state.queryParams.id, state.queryParams.name, state.queryParams.code, state.queryParams.orgType);
 	state.orgData = res.data.result ?? [];
 	state.loading = false;
+	// 是否更新左侧机构列表树
+	if (updateTree == true) {
+		orgTreeRef.value?.initTreeData();
+	}
 
-	// 若无选择节点并且查询条件为空时
+	// 若无选择节点并且查询条件为空时，更新编辑页面机构列表树
 	if (state.queryParams.id == -1 && state.queryParams.name == undefined && state.queryParams.code == undefined && state.queryParams.orgType == undefined) state.orgTreeData = state.orgData;
 };
 
@@ -134,10 +138,8 @@ const delOrg = (row: any) => {
 	})
 		.then(async () => {
 			await getAPI(SysOrgApi).apiSysOrgDeletePost({ id: row.id });
-			handleQuery();
-			// 编辑删除后更新机构数据
-			orgTreeRef.value?.initTreeData();
 			ElMessage.success('删除成功');
+			handleQuery(true);
 		})
 		.catch(() => {});
 };