😎代码整理及升级依赖

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

@@ -36,10 +36,10 @@
     <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.8" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.5.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.7.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.4.167" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.4.169" />
     <PackageReference Include="SSH.NET" Version="2024.1.0" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.5" />
-    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1084" />
+    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1088" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
   </ItemGroup>
@@ -55,8 +55,8 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
-    <PackageReference Include="AspNet.Security.OAuth.Gitee" Version="8.1.0" />
-    <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="8.1.0" />
+    <PackageReference Include="AspNet.Security.OAuth.Gitee" Version="8.2.0" />
+    <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="8.2.0" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.0.7" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.8" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="8.0.8" />

Admin.NET/Admin.NET.Core/Service/DataBase/SysDatabaseService.cs

@@ -4,11 +4,9 @@
 //
 // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
 
-using Mapster.Adapters;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Npgsql;
-using System.Linq;
 
 namespace Admin.NET.Core.Service;
 
@@ -355,17 +353,16 @@ public class SysDatabaseService : IDynamicApiController, ITransient
             query.OrderBy(orderField.DbColumnName);
         IEnumerable recordsTmp = (IEnumerable)query.ToList();
         List<dynamic> records = recordsTmp.ToDynamicList();
-        //这里要过滤已存在的数据
+        // 过滤已存在的数据
         if (input.FilterExistingData && records.Count() > 0)
         {
-            //获取实体类型
-            //获取所有种数据数据类型
+            // 获取实体类型-所有种数据数据类型
             var entityTypes = App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.IsDefined(typeof(SugarTable), false) && u.FullName.EndsWith("." + input.EntityName))
                 .Where(u => !u.GetCustomAttributes<IgnoreTableAttribute>().Any())
                 .ToList();
-            if (entityTypes.Count == 1) //只有一个实体匹配才能过滤
+            if (entityTypes.Count == 1) // 只有一个实体匹配才能过滤
             {
-                //获取实体的主键对应的属性名称
+                // 获取实体的主键对应的属性名称
                 var pkInfo = entityTypes[0].GetProperties().Where(u => u.GetCustomAttribute<SugarColumn>() != null && u.GetCustomAttribute<SugarColumn>().IsPrimaryKey).First();
                 if (pkInfo != null)
                 {
@@ -375,9 +372,9 @@ public class SysDatabaseService : IDynamicApiController, ITransient
                             )
                         )
                         .ToList();
-                    //可能会重名的种子数据不作为过滤项
+                    // 可能会重名的种子数据不作为过滤项
                     string doNotFilterfullName1 = $"{input.Position}.SeedData.{input.SeedDataName}";
-                    string doNotFilterfullName2 = $"{input.Position}.{input.SeedDataName}"; //Core中的命名空间没有SeedData
+                    string doNotFilterfullName2 = $"{input.Position}.{input.SeedDataName}"; // Core中的命名空间没有SeedData
 
                     PropertyInfo idPropertySeedData = records[0].GetType().GetProperty("Id");
 
@@ -386,7 +383,7 @@ public class SysDatabaseService : IDynamicApiController, ITransient
                         string fullName = seedDataTypes[i].FullName;
                         if ((fullName == doNotFilterfullName1) || (fullName == doNotFilterfullName2))
                             continue;
-                        //开始删除重复数据
+                        // 删除重复数据
                         var instance = Activator.CreateInstance(seedDataTypes[i]);
                         var hasDataMethod = seedDataTypes[i].GetMethod("HasData");
                         var seedData = ((IEnumerable)hasDataMethod?.Invoke(instance, null))?.Cast<object>();

Web/package.json

@@ -2,7 +2,7 @@
 	"name": "admin.net",
 	"type": "module",
 	"version": "2.4.33",
-	"lastBuildTime": "2024.09.08",
+	"lastBuildTime": "2024.09.17",
 	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
 	"author": "zuohuaijun",
 	"license": "MIT",
@@ -21,7 +21,7 @@
 		"@vue-office/docx": "^1.6.2",
 		"@vue-office/excel": "^1.7.11",
 		"@vue-office/pdf": "^2.0.2",
-		"@vueuse/core": "^11.0.3",
+		"@vueuse/core": "^11.1.0",
 		"@wangeditor/editor": "^5.1.23",
 		"@wangeditor/editor-for-vue": "^5.1.12",
 		"animate.css": "^4.1.1",
@@ -32,14 +32,13 @@
 		"echarts": "^5.5.1",
 		"echarts-gl": "^2.0.9",
 		"echarts-wordcloud": "^2.1.0",
-		"element-plus": "^2.8.2",
-		"ezuikit": "^1.0.0",
-		"ezuikit-js": "^8.0.11",
+		"element-plus": "^2.8.3",
+		"ezuikit-js": "^8.0.12-alpha.2",
 		"js-cookie": "^3.0.5",
 		"js-table2excel": "^1.1.2",
 		"jsplumb": "^2.15.6",
 		"lodash-es": "^4.17.21",
-		"md-editor-v3": "^4.20.0",
+		"md-editor-v3": "^4.20.1",
 		"mitt": "^3.0.1",
 		"monaco-editor": "^0.51.0",
 		"mqtt": "^4.3.8",
@@ -49,22 +48,22 @@
 		"push.js": "^1.0.12",
 		"qrcodejs2-fixes": "^0.0.2",
 		"qs": "^6.13.0",
-		"relation-graph": "^2.2.4",
+		"relation-graph": "^2.2.6",
 		"screenfull": "^6.0.2",
 		"sm-crypto-v2": "^1.9.2",
 		"sortablejs": "^1.15.3",
 		"splitpanes": "^3.1.5",
 		"vcrontab-3": "^3.3.22",
 		"vform3-builds": "^3.0.10",
-		"vue": "^3.5.3",
+		"vue": "^3.5.6",
 		"vue-clipboard3": "^2.0.0",
 		"vue-demi": "^0.14.6",
 		"vue-draggable-plus": "^0.5.3",
 		"vue-grid-layout": "3.0.0-beta1",
-		"vue-i18n": "^9.14.0",
+		"vue-i18n": "^10.0.1",
 		"vue-json-pretty": "^2.4.0",
 		"vue-plugin-hiprint": "0.0.57-beta27",
-		"vue-router": "^4.4.3",
+		"vue-router": "^4.4.5",
 		"vue-signature-pad": "^3.0.2",
 		"vue3-tree-org": "^4.2.2",
 		"xlsx-js-style": "^1.2.0"
@@ -75,11 +74,11 @@
 		"@types/node": "^20.14.15",
 		"@types/nprogress": "^0.2.3",
 		"@types/sortablejs": "^1.15.8",
-		"@typescript-eslint/eslint-plugin": "^8.4.0",
-		"@typescript-eslint/parser": "^8.4.0",
+		"@typescript-eslint/eslint-plugin": "^8.6.0",
+		"@typescript-eslint/parser": "^8.6.0",
 		"@vitejs/plugin-vue": "^5.1.3",
 		"@vitejs/plugin-vue-jsx": "^4.0.1",
-		"@vue/compiler-sfc": "^3.5.3",
+		"@vue/compiler-sfc": "^3.5.6",
 		"code-inspector-plugin": "^0.16.1",
 		"eslint": "^9.10.0",
 		"eslint-plugin-vue": "^9.28.0",
@@ -88,11 +87,11 @@
 		"prettier": "^3.3.3",
 		"rollup-plugin-visualizer": "^5.12.0",
 		"sass": "^1.78.0",
-		"terser": "^5.31.6",
-		"typescript": "^5.5.4",
-		"vite": "^5.4.3",
+		"terser": "^5.32.0",
+		"typescript": "^5.6.2",
+		"vite": "^5.4.6",
 		"vite-plugin-cdn-import": "^1.0.1",
-		"vite-plugin-compression2": "^1.2.0",
+		"vite-plugin-compression2": "^1.3.0",
 		"vite-plugin-vue-setup-extend": "^0.4.0",
 		"vue-eslint-parser": "^9.4.3"
 	},