From 04f16ec6f5055940ea798ddb96595d9dcedffc7e Mon Sep 17 00:00:00 2001 From: zuohuaijun Date: Wed, 16 Apr 2025 21:05:15 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8E1=E3=80=81=E6=9A=82=E6=97=B6?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=9E=9A=E4=B8=BE=E8=BD=AC=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=85=A5=E5=BA=93=20=202=E3=80=81=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E4=BE=9D=E8=B5=96=E5=8F=8A=E5=85=B6=E4=BB=96=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Config/SysConfigService.cs | 1 + .../Admin.NET.Core/Service/Enum/SysEnumService.cs | 12 ++++++------ .../Admin.NET.Plugin.ReZero.csproj | 2 +- Web/index.html | 3 ++- Web/package.json | 10 +++++----- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Admin.NET/Admin.NET.Core/Service/Config/SysConfigService.cs b/Admin.NET/Admin.NET.Core/Service/Config/SysConfigService.cs index 9f78f3fc..32afdf46 100644 --- a/Admin.NET/Admin.NET.Core/Service/Config/SysConfigService.cs +++ b/Admin.NET/Admin.NET.Core/Service/Config/SysConfigService.cs @@ -265,6 +265,7 @@ public class SysConfigService : IDynamicApiController, ITransient /// 获取密码加解密公钥 /// /// + [DisplayName("获取密码加解密公钥")] public string GetSmPublicKey() { return App.GetConfig("Cryptogram:PublicKey", true); diff --git a/Admin.NET/Admin.NET.Core/Service/Enum/SysEnumService.cs b/Admin.NET/Admin.NET.Core/Service/Enum/SysEnumService.cs index e7566f47..526f70ff 100644 --- a/Admin.NET/Admin.NET.Core/Service/Enum/SysEnumService.cs +++ b/Admin.NET/Admin.NET.Core/Service/Enum/SysEnumService.cs @@ -123,14 +123,14 @@ public class SysEnumService : IDynamicApiController, ITransient var newEnumType = enumTypeList.Where(u => !updatedEnumCodes.Contains(u.TypeName)).ToList(); var (newDictTypes, newDictDatas) = GetNewSysDicts(newEnumType); - // 若是Sqlite、PostgreSQL、MySql、SqlServer、GaussDB、Kdbndp则采用批量处理 + // 若是Sqlite、PostgreSQL、SqlServer、MySql、GaussDB、Kdbndp则采用批量处理 bool enableBulk = _db.CurrentConnectionConfig.DbType == SqlSugar.DbType.Sqlite || _db.CurrentConnectionConfig.DbType == SqlSugar.DbType.PostgreSQL - || _db.CurrentConnectionConfig.DbType == SqlSugar.DbType.MySql - || _db.CurrentConnectionConfig.DbType == SqlSugar.DbType.MySqlConnector - || _db.CurrentConnectionConfig.DbType == SqlSugar.DbType.SqlServer - || _db.CurrentConnectionConfig.DbType == SqlSugar.DbType.GaussDB - || _db.CurrentConnectionConfig.DbType == SqlSugar.DbType.Kdbndp; + || _db.CurrentConnectionConfig.DbType == SqlSugar.DbType.SqlServer; + //|| _db.CurrentConnectionConfig.DbType == SqlSugar.DbType.MySql + //|| _db.CurrentConnectionConfig.DbType == SqlSugar.DbType.MySqlConnector + //|| _db.CurrentConnectionConfig.DbType == SqlSugar.DbType.GaussDB + //|| _db.CurrentConnectionConfig.DbType == SqlSugar.DbType.Kdbndp; // 执行数据库操作 if (updatedDictTypes.Count > 0) 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 1c792dc6..b9c9b875 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/index.html b/Web/index.html index b613c58f..8378c221 100644 --- a/Web/index.html +++ b/Web/index.html @@ -20,6 +20,7 @@ justify-content: center; align-items: center; z-index: 9999; + color: #0f59a4; } .loading-wrapper.hide { @@ -29,7 +30,7 @@ .loader { width: 15px; aspect-ratio: 1; - background: #000; + background: #0f59a4; border-radius: 50%; animation: l6 1s infinite linear alternate; } diff --git a/Web/package.json b/Web/package.json index 774e4724..38f2106b 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.04.15", + "lastBuildTime": "2025.04.16", "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.5.23", - "vxe-table": "^4.13.3", + "vxe-pc-ui": "^4.5.24", + "vxe-table": "^4.13.4", "vxe-table-plugin-element": "^4.0.4", "vxe-table-plugin-export-xlsx": "^4.0.7", "xe-utils": "^3.7.4", @@ -101,13 +101,13 @@ "eslint-plugin-vue": "^10.0.0", "globals": "^16.0.0", "less": "^4.3.0", - "openapi-ts-request": "^1.3.1", + "openapi-ts-request": "^1.3.2", "prettier": "^3.5.3", "rollup-plugin-visualizer": "^5.14.0", "sass": "^1.86.3", "terser": "^5.39.0", "typescript": "^5.8.3", - "vite": "^6.2.6", + "vite": "^6.3.0", "vite-plugin-cdn-import": "^1.0.1", "vite-plugin-compression2": "^1.3.3", "vite-plugin-vue-setup-extend": "^0.4.0",