gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

😎1、调整枚举属性可空模式 2、升级依赖

Browse Source
This commit is contained in:
zuohuaijun 2025-05-27 17:17:25 +08:00
parent fac3727006
commit 0c657282d0
10 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
View File

@ -28,9 +28,9 @@
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" /> <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
<PackageReference Include="BouncyCastle.Cryptography" Version="2.6.1" Aliases="BouncyCastleV2" /> <PackageReference Include="BouncyCastle.Cryptography" Version="2.6.1" Aliases="BouncyCastleV2" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.0.4" /> <PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.0.4" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.75" /> <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.76" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.75" /> <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.76" />
<PackageReference Include="Furion.Pure" Version="4.9.7.75" /> <PackageReference Include="Furion.Pure" Version="4.9.7.76" />
<PackageReference Include="Hardware.Info" Version="101.0.1" /> <PackageReference Include="Hardware.Info" Version="101.0.1" />
<PackageReference Include="Hashids.net" Version="1.7.0" /> <PackageReference Include="Hashids.net" Version="1.7.0" />
<PackageReference Include="IPTools.China" Version="1.6.0" /> <PackageReference Include="IPTools.China" Version="1.6.0" />
@ -56,7 +56,7 @@
<PackageReference Include="SSH.NET" Version="2025.0.0" /> <PackageReference Include="SSH.NET" Version="2025.0.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.4" /> <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.4" />
<PackageReference Include="System.Net.Http" Version="4.3.4" /> <PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1246" /> <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1248" />
<PackageReference Include="UAParser" Version="3.1.47" /> <PackageReference Include="UAParser" Version="3.1.47" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" /> <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
</ItemGroup> </ItemGroup>

2
Admin.NET/Admin.NET.Core/Entity/SysLogVis.cs
View File

@ -98,7 +98,7 @@ public partial class SysLogVis : EntityTenant
/// 日志级别 /// 日志级别
/// </summary> /// </summary>
[SugarColumn(ColumnDescription = "日志级别")] [SugarColumn(ColumnDescription = "日志级别")]
public LogLevel? LogLevel { get; set; } public LogLevel LogLevel { get; set; }
/// <summary> /// <summary>
/// 账号 /// 账号

2
Admin.NET/Admin.NET.Core/Entity/SysOnlineUser.cs
View File

@ -70,7 +70,7 @@ public partial class SysOnlineUser : EntityTenantId
/// 登录模式 /// 登录模式
/// </summary> /// </summary>
[SugarColumn(ColumnDescription = "登录模式", DefaultValue = "1")] [SugarColumn(ColumnDescription = "登录模式", DefaultValue = "1")]
public LoginModeEnum? LoginMode { get; set; } = LoginModeEnum.PC; public LoginModeEnum LoginMode { get; set; } = LoginModeEnum.PC;
/// <summary> /// <summary>
/// 登录设备 /// 登录设备

2
Admin.NET/Admin.NET.Core/Entity/SysPrint.cs
View File

@ -33,7 +33,7 @@ public partial class SysPrint : EntityTenant
/// </summary> /// </summary>
[SugarColumn(ColumnDescription = "打印类型", DefaultValue = "1")] [SugarColumn(ColumnDescription = "打印类型", DefaultValue = "1")]
[Required] [Required]
public virtual PrintTypeEnum? PrintType { get; set; } = PrintTypeEnum.Browser; public virtual PrintTypeEnum PrintType { get; set; } = PrintTypeEnum.Browser;
/// <summary> /// <summary>
/// 客户端服务地址 /// 客户端服务地址

2
Admin.NET/Admin.NET.Core/Service/Menu/Dto/MenuInput.cs
View File

@ -16,7 +16,7 @@ public class MenuInput
/// <summary> /// <summary>
/// 菜单类型（1目录 2菜单 3按钮） /// 菜单类型（1目录 2菜单 3按钮）
/// </summary> /// </summary>
public MenuTypeEnum? Type { get; set; } public MenuTypeEnum Type { get; set; }
/// <summary> /// <summary>
/// 获取所有菜单 /// 获取所有菜单

2
Admin.NET/Admin.NET.Core/Service/Notice/Dto/NoticeInput.cs
View File

@ -16,7 +16,7 @@ public class PageNoticeInput : BasePageInput
/// <summary> /// <summary>
/// 类型（1通知 2公告） /// 类型（1通知 2公告）
/// </summary> /// </summary>
public virtual NoticeTypeEnum? Type { get; set; } public virtual NoticeTypeEnum Type { get; set; }
} }
public class AddNoticeInput : SysNotice public class AddNoticeInput : SysNotice

12
Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarExtension.cs
View File

@ -131,15 +131,15 @@ public static class SqlSugarExtension
Expression binaryExpresioFilter; Expression binaryExpresioFilter;
if (filter.Logic.HasValue) if (Enum.IsDefined(typeof(FilterLogicEnum), filter.Logic))
{ {
if (filter.Filters is null) throw new ArgumentException("The Filters attribute is required when declaring a logic"); if (filter.Filters is null) throw new ArgumentException("The Filters attribute is required when declaring a logic");
binaryExpresioFilter = CreateFilterExpression(filter.Logic.Value, filter.Filters, parameter); binaryExpresioFilter = CreateFilterExpression(filter.Logic, filter.Filters, parameter);
} }
else else
{ {
var filterValid = GetValidFilter(filter); var filterValid = GetValidFilter(filter);
binaryExpresioFilter = CreateFilterExpression(filterValid.Field!, filterValid.Operator.Value, filterValid.Value, parameter); binaryExpresioFilter = CreateFilterExpression(filterValid.Field!, filterValid.Operator, filterValid.Value, parameter);
} }
var lambda = Expression.Lambda<Func<T, bool>>(binaryExpresioFilter, parameter); var lambda = Expression.Lambda<Func<T, bool>>(binaryExpresioFilter, parameter);
@ -175,15 +175,15 @@ public static class SqlSugarExtension
{ {
Expression bExpresionFilter; Expression bExpresionFilter;
if (filter.Logic.HasValue) if (Enum.IsDefined(typeof(FilterLogicEnum), filter.Logic))
{ {
if (filter.Filters is null) throw new ArgumentException("The Filters attribute is required when declaring a logic"); if (filter.Filters is null) throw new ArgumentException("The Filters attribute is required when declaring a logic");
bExpresionFilter = CreateFilterExpression(filter.Logic.Value, filter.Filters, parameter); bExpresionFilter = CreateFilterExpression(filter.Logic, filter.Filters, parameter);
} }
else else
{ {
var filterValid = GetValidFilter(filter); var filterValid = GetValidFilter(filter);
bExpresionFilter = CreateFilterExpression(filterValid.Field!, filterValid.Operator.Value, filterValid.Value, parameter); bExpresionFilter = CreateFilterExpression(filterValid.Field!, filterValid.Operator, filterValid.Value, parameter);
} }
filterExpression = filterExpression is null ? bExpresionFilter : CombineFilter(filterLogic, filterExpression, bExpresionFilter); filterExpression = filterExpression is null ? bExpresionFilter : CombineFilter(filterLogic, filterExpression, bExpresionFilter);

4
Admin.NET/Admin.NET.Core/Utils/BaseFilter.cs
View File

@ -31,7 +31,7 @@ public class Filter
/// <summary> /// <summary>
/// 过滤条件 /// 过滤条件
/// </summary> /// </summary>
public FilterLogicEnum? Logic { get; set; } public FilterLogicEnum Logic { get; set; }
/// <summary> /// <summary>
/// 筛选过滤条件子项 /// 筛选过滤条件子项
@ -47,7 +47,7 @@ public class Filter
/// <summary> /// <summary>
/// 逻辑运算符 /// 逻辑运算符
/// </summary> /// </summary>
public FilterOperatorEnum? Operator { get; set; } public FilterOperatorEnum Operator { get; set; }
/// <summary> /// <summary>
/// 字段值 /// 字段值

2
Admin.NET/Plugins/Admin.NET.Plugin.ReZero/Admin.NET.Plugin.ReZero.csproj
View File

@ -26,7 +26,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="DocumentFormat.OpenXml" Version="3.3.0" /> <PackageReference Include="DocumentFormat.OpenXml" Version="3.3.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" /> <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
<PackageReference Include="Rezero.Api" Version="1.8.20" /> <PackageReference Include="Rezero.Api" Version="1.8.21" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

8
Web/package.json
View File

@ -2,7 +2,7 @@
"name": "admin.net.pro", "name": "admin.net.pro",
"type": "module", "type": "module",
"version": "2.4.33", "version": "2.4.33",
"lastBuildTime": "2025.05.25", "lastBuildTime": "2025.05.27",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架", "description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun", "author": "zuohuaijun",
"license": "MIT", "license": "MIT",
@ -41,7 +41,7 @@
"echarts-wordcloud": "^2.1.0", "echarts-wordcloud": "^2.1.0",
"element-plus": "^2.9.11", "element-plus": "^2.9.11",
"exceljs": "^4.4.0", "exceljs": "^4.4.0",
"ezuikit-js": "^8.1.9-beta.3", "ezuikit-js": "^8.1.10",
"gcoord": "^1.0.7", "gcoord": "^1.0.7",
"install": "^0.13.0", "install": "^0.13.0",
"js-cookie": "^3.0.5", "js-cookie": "^3.0.5",
@ -68,7 +68,7 @@
"splitpanes": "^4.0.4", "splitpanes": "^4.0.4",
"vcrontab-3": "^3.3.22", "vcrontab-3": "^3.3.22",
"vform3-builds": "^3.0.10", "vform3-builds": "^3.0.10",
"vue": "^3.5.14", "vue": "^3.5.15",
"vue-clipboard3": "^2.0.0", "vue-clipboard3": "^2.0.0",
"vue-demi": "0.14.10", "vue-demi": "0.14.10",
"vue-draggable-plus": "^0.6.0", "vue-draggable-plus": "^0.6.0",
@ -96,7 +96,7 @@
"@typescript-eslint/parser": "^8.32.1", "@typescript-eslint/parser": "^8.32.1",
"@vitejs/plugin-vue": "^5.2.4", "@vitejs/plugin-vue": "^5.2.4",
"@vitejs/plugin-vue-jsx": "^4.2.0", "@vitejs/plugin-vue-jsx": "^4.2.0",
"@vue/compiler-sfc": "^3.5.14", "@vue/compiler-sfc": "^3.5.15",
"code-inspector-plugin": "^0.20.10", "code-inspector-plugin": "^0.20.10",
"eslint": "^9.27.0", "eslint": "^9.27.0",
"eslint-plugin-vue": "^10.1.0", "eslint-plugin-vue": "^10.1.0",