lingyun/NetAdmin
lingyun/NetAdmin
Template
6
0
Fork 0
mirror of https://github.com/nsnail/NetAdmin.git synced 2025-04-19 21:02:49 +08:00
Code Issues 1 Packages Projects Releases Wiki Activity

refactor: ♻️ 框架代码同步

Browse Source 
[skip ci]
This commit is contained in:
tk 2025-04-16 15:53:47 +08:00 committed by nsnail
parent 9b6e053721
commit 7d0fcd4906
14 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/code.quality.props
View File

@ -23,7 +23,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.7.0.110445">
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.8.0.113526">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

2
src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_Api.cs
View File

@ -71,7 +71,7 @@ public record Sys_Api : ImmutableEntity<string>, IFieldSummary
[CsvIgnore]
[JsonIgnore]
[Navigate(ManyToMany = typeof(Sys_RoleApi))]
public ICollection<Sys_Role> Roles { get; init; }
public IReadOnlyCollection<Sys_Role> Roles { get; init; }
/// <summary>
/// 服务描述

4
src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_Dept.cs
View File

@ -44,7 +44,7 @@ public record Sys_Dept : VersionEntity, IFieldEnabled, IFieldSummary, IFieldSort
[CsvIgnore]
[JsonIgnore]
[Navigate(ManyToMany = typeof(Sys_RoleDept))]
public ICollection<Sys_Role> Roles { get; init; }
public IReadOnlyCollection<Sys_Role> Roles { get; init; }
/// <summary>
/// 发送给此部门的站内信集合
@ -52,7 +52,7 @@ public record Sys_Dept : VersionEntity, IFieldEnabled, IFieldSummary, IFieldSort
[CsvIgnore]
[JsonIgnore]
[Navigate(ManyToMany = typeof(Sys_SiteMsgDept))]
public ICollection<Sys_SiteMsg> SiteMsgs { get; init; }
public IReadOnlyCollection<Sys_SiteMsg> SiteMsgs { get; init; }
/// <summary>
/// 排序值，越大越前

2
src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_DicCatalog.cs
View File

@ -29,7 +29,7 @@ public record Sys_DicCatalog : VersionEntity
[CsvIgnore]
[JsonIgnore]
[Navigate(nameof(Sys_DicContent.CatalogId))]
public ICollection<Sys_DicContent> Contents { get; init; }
public IReadOnlyCollection<Sys_DicContent> Contents { get; init; }
/// <summary>
/// 字典目录名称

2
src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_DocCatalog.cs
View File

@ -29,7 +29,7 @@ public record Sys_DocCatalog : VersionEntity, IFieldOwner
[CsvIgnore]
[JsonIgnore]
[Navigate(nameof(Sys_DocContent.CatalogId))]
public ICollection<Sys_DocContent> Contents { get; init; }
public IReadOnlyCollection<Sys_DocContent> Contents { get; init; }
/// <summary>
/// 文档分类名称

2
src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_Menu.cs
View File

@ -111,7 +111,7 @@ public record Sys_Menu : VersionEntity, IFieldSort
[CsvIgnore]
[JsonIgnore]
[Navigate(ManyToMany = typeof(Sys_RoleMenu))]
public ICollection<Sys_Role> Roles { get; init; }
public IReadOnlyCollection<Sys_Role> Roles { get; init; }
/// <summary>
/// 排序值，越大越前

10
src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_Role.cs
View File

@ -16,7 +16,7 @@ public record Sys_Role : VersionEntity, IFieldSort, IFieldEnabled, IFieldSummary
[CsvIgnore]
[JsonIgnore]
[Navigate(ManyToMany = typeof(Sys_RoleApi))]
public ICollection<Sys_Api> Apis { get; init; }
public IReadOnlyCollection<Sys_Api> Apis { get; init; }
/// <summary>
/// 仪表板布局
@ -40,7 +40,7 @@ public record Sys_Role : VersionEntity, IFieldSort, IFieldEnabled, IFieldSummary
[CsvIgnore]
[JsonIgnore]
[Navigate(ManyToMany = typeof(Sys_RoleDept))]
public ICollection<Sys_Dept> Depts { get; init; }
public IReadOnlyCollection<Sys_Dept> Depts { get; init; }
/// <summary>
/// 是否显示仪表板
@ -72,7 +72,7 @@ public record Sys_Role : VersionEntity, IFieldSort, IFieldEnabled, IFieldSummary
[CsvIgnore]
[JsonIgnore]
[Navigate(ManyToMany = typeof(Sys_RoleMenu))]
public ICollection<Sys_Menu> Menus { get; init; }
public IReadOnlyCollection<Sys_Menu> Menus { get; init; }
/// <summary>
/// 角色名称
@ -88,7 +88,7 @@ public record Sys_Role : VersionEntity, IFieldSort, IFieldEnabled, IFieldSummary
[CsvIgnore]
[JsonIgnore]
[Navigate(ManyToMany = typeof(Sys_SiteMsgRole))]
public ICollection<Sys_SiteMsg> SiteMsgs { get; init; }
public IReadOnlyCollection<Sys_SiteMsg> SiteMsgs { get; init; }
/// <summary>
/// 排序值，越大越前
@ -112,7 +112,7 @@ public record Sys_Role : VersionEntity, IFieldSort, IFieldEnabled, IFieldSummary
[CsvIgnore]
[JsonIgnore]
[Navigate(ManyToMany = typeof(Sys_UserRole))]
public ICollection<Sys_User> Users { get; init; }
public IReadOnlyCollection<Sys_User> Users { get; init; }
/// <inheritdoc />
public virtual void Register(TypeAdapterConfig config)

8
src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsg.cs
View File

@ -31,7 +31,7 @@ public record Sys_SiteMsg : VersionEntity, IRegister, IFieldSummary
[CsvIgnore]
[JsonIgnore]
[Navigate(ManyToMany = typeof(Sys_SiteMsgDept))]
public ICollection<Sys_Dept> Depts { get; init; }
public IReadOnlyCollection<Sys_Dept> Depts { get; init; }
/// <summary>
/// 消息-标记映射
@ -39,7 +39,7 @@ public record Sys_SiteMsg : VersionEntity, IRegister, IFieldSummary
[CsvIgnore]
[JsonIgnore]
[Navigate(nameof(Sys_SiteMsgFlag.SiteMsgId))]
public ICollection<Sys_SiteMsgFlag> Flags { get; init; }
public IReadOnlyCollection<Sys_SiteMsgFlag> Flags { get; init; }
/// <summary>
/// 消息类型
@ -54,7 +54,7 @@ public record Sys_SiteMsg : VersionEntity, IRegister, IFieldSummary
[CsvIgnore]
[JsonIgnore]
[Navigate(ManyToMany = typeof(Sys_SiteMsgRole))]
public ICollection<Sys_Role> Roles { get; init; }
public IReadOnlyCollection<Sys_Role> Roles { get; init; }
/// <summary>
/// 消息摘要
@ -78,7 +78,7 @@ public record Sys_SiteMsg : VersionEntity, IRegister, IFieldSummary
[CsvIgnore]
[JsonIgnore]
[Navigate(ManyToMany = typeof(Sys_SiteMsgUser))]
public ICollection<Sys_User> Users { get; init; }
public IReadOnlyCollection<Sys_User> Users { get; init; }
/// <inheritdoc />
public void Register(TypeAdapterConfig config)

2
src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_User.cs
View File

@ -97,7 +97,7 @@ public record Sys_User : VersionEntity, IFieldSummary, IFieldEnabled, IRegister
[CsvIgnore]
[JsonIgnore]
[Navigate(ManyToMany = typeof(Sys_SiteMsgUser))]
public ICollection<Sys_SiteMsg> SiteMsgs { get; init; }
public IReadOnlyCollection<Sys_SiteMsg> SiteMsgs { get; init; }
/// <summary>
/// 备注

4
src/backend/NetAdmin/NetAdmin.Domain/NetAdmin.Domain.csproj
View File

@ -4,8 +4,8 @@
<ProjectReference Include="../NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="CronExpressionDescriptor" Version="2.39.0"/>
<PackageReference Include="Cronos" Version="0.9.0"/>
<PackageReference Include="CronExpressionDescriptor" Version="2.40.0"/>
<PackageReference Include="Cronos" Version="0.10.0"/>
<PackageReference Include="NetAdmin.CsvHelper" Version="1.0.0"/>
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14"/>
</ItemGroup>

2
src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj
View File

@ -6,7 +6,7 @@
<PackageReference Include="NetAdmin.FreeSql.DbContext" Version="1.1.3" Label="refs"/>
<PackageReference Include="NetAdmin.FreeSql.Provider.Sqlite" Version="1.1.3" Label="refs"/>
<PackageReference Include="Gurion" Version="1.2.13" Label="refs"/>
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.2"/>
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.4"/>
<PackageReference Include="Minio" Version="6.0.4"/>
<PackageReference Include="NSExt" Version="2.3.5"/>
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.5"/>

2
src/backend/NetAdmin/NetAdmin.Tests/NetAdmin.Tests.csproj
View File

@ -3,7 +3,7 @@
<ProjectReference Include="../NetAdmin.Host/NetAdmin.Host.csproj"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.3"/>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.4"/>
<PackageReference Include="xunit" Version="2.9.3"/>
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

6
src/frontend/admin/package.json
View File

@ -23,7 +23,7 @@
"sortablejs": "1.15.6",
"vkbeautify": "0.99.3",
"vue": "3.5.13",
"vue-i18n": "11.1.2",
"vue-i18n": "11.1.3",
"vue-router": "4.5.0",
"vue3-ace-editor": "2.2.4",
"vue3-json-viewer": "2.2.2",
@ -34,9 +34,9 @@
"@vitejs/plugin-vue": "5.2.3",
"prettier": "3.5.3",
"prettier-plugin-organize-attributes": "1.0.0",
"sass": "1.86.0",
"sass": "1.86.3",
"terser": "5.39.0",
"vite": "6.2.2"
"vite": "6.2.5"
},
"browserslist": [
"> 1%",

2
src/frontend/admin/src/components/scUpload/multiple.vue
View File

@ -8,6 +8,7 @@
:before-upload="before"
:data="data"
:disabled="disabled"
:drag="drag"
:http-request="request"
:limit="limit"
:multiple="multiple"
@ -70,6 +71,7 @@ export default {
type: Object,
default: () => {},
},
drag: { type: Boolean, default: false },
name: { type: String, default: config.filename },
data: {
type: Object,