mirror of
https://github.com/nsnail/NetAdmin.git
synced 2025-04-23 14:42:51 +08:00
refactor: ♻️ 框架代码同步
[skip ci]
This commit is contained in:
parent
9b6e053721
commit
7d0fcd4906
@ -23,7 +23,7 @@
|
|||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.7.0.110445">
|
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.8.0.113526">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
|
@ -71,7 +71,7 @@ public record Sys_Api : ImmutableEntity<string>, IFieldSummary
|
|||||||
[CsvIgnore]
|
[CsvIgnore]
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
[Navigate(ManyToMany = typeof(Sys_RoleApi))]
|
[Navigate(ManyToMany = typeof(Sys_RoleApi))]
|
||||||
public ICollection<Sys_Role> Roles { get; init; }
|
public IReadOnlyCollection<Sys_Role> Roles { get; init; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 服务描述
|
/// 服务描述
|
||||||
|
@ -44,7 +44,7 @@ public record Sys_Dept : VersionEntity, IFieldEnabled, IFieldSummary, IFieldSort
|
|||||||
[CsvIgnore]
|
[CsvIgnore]
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
[Navigate(ManyToMany = typeof(Sys_RoleDept))]
|
[Navigate(ManyToMany = typeof(Sys_RoleDept))]
|
||||||
public ICollection<Sys_Role> Roles { get; init; }
|
public IReadOnlyCollection<Sys_Role> Roles { get; init; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 发送给此部门的站内信集合
|
/// 发送给此部门的站内信集合
|
||||||
@ -52,7 +52,7 @@ public record Sys_Dept : VersionEntity, IFieldEnabled, IFieldSummary, IFieldSort
|
|||||||
[CsvIgnore]
|
[CsvIgnore]
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
[Navigate(ManyToMany = typeof(Sys_SiteMsgDept))]
|
[Navigate(ManyToMany = typeof(Sys_SiteMsgDept))]
|
||||||
public ICollection<Sys_SiteMsg> SiteMsgs { get; init; }
|
public IReadOnlyCollection<Sys_SiteMsg> SiteMsgs { get; init; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 排序值,越大越前
|
/// 排序值,越大越前
|
||||||
|
@ -29,7 +29,7 @@ public record Sys_DicCatalog : VersionEntity
|
|||||||
[CsvIgnore]
|
[CsvIgnore]
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
[Navigate(nameof(Sys_DicContent.CatalogId))]
|
[Navigate(nameof(Sys_DicContent.CatalogId))]
|
||||||
public ICollection<Sys_DicContent> Contents { get; init; }
|
public IReadOnlyCollection<Sys_DicContent> Contents { get; init; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 字典目录名称
|
/// 字典目录名称
|
||||||
|
@ -29,7 +29,7 @@ public record Sys_DocCatalog : VersionEntity, IFieldOwner
|
|||||||
[CsvIgnore]
|
[CsvIgnore]
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
[Navigate(nameof(Sys_DocContent.CatalogId))]
|
[Navigate(nameof(Sys_DocContent.CatalogId))]
|
||||||
public ICollection<Sys_DocContent> Contents { get; init; }
|
public IReadOnlyCollection<Sys_DocContent> Contents { get; init; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 文档分类名称
|
/// 文档分类名称
|
||||||
|
@ -111,7 +111,7 @@ public record Sys_Menu : VersionEntity, IFieldSort
|
|||||||
[CsvIgnore]
|
[CsvIgnore]
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
[Navigate(ManyToMany = typeof(Sys_RoleMenu))]
|
[Navigate(ManyToMany = typeof(Sys_RoleMenu))]
|
||||||
public ICollection<Sys_Role> Roles { get; init; }
|
public IReadOnlyCollection<Sys_Role> Roles { get; init; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 排序值,越大越前
|
/// 排序值,越大越前
|
||||||
|
@ -16,7 +16,7 @@ public record Sys_Role : VersionEntity, IFieldSort, IFieldEnabled, IFieldSummary
|
|||||||
[CsvIgnore]
|
[CsvIgnore]
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
[Navigate(ManyToMany = typeof(Sys_RoleApi))]
|
[Navigate(ManyToMany = typeof(Sys_RoleApi))]
|
||||||
public ICollection<Sys_Api> Apis { get; init; }
|
public IReadOnlyCollection<Sys_Api> Apis { get; init; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 仪表板布局
|
/// 仪表板布局
|
||||||
@ -40,7 +40,7 @@ public record Sys_Role : VersionEntity, IFieldSort, IFieldEnabled, IFieldSummary
|
|||||||
[CsvIgnore]
|
[CsvIgnore]
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
[Navigate(ManyToMany = typeof(Sys_RoleDept))]
|
[Navigate(ManyToMany = typeof(Sys_RoleDept))]
|
||||||
public ICollection<Sys_Dept> Depts { get; init; }
|
public IReadOnlyCollection<Sys_Dept> Depts { get; init; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 是否显示仪表板
|
/// 是否显示仪表板
|
||||||
@ -72,7 +72,7 @@ public record Sys_Role : VersionEntity, IFieldSort, IFieldEnabled, IFieldSummary
|
|||||||
[CsvIgnore]
|
[CsvIgnore]
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
[Navigate(ManyToMany = typeof(Sys_RoleMenu))]
|
[Navigate(ManyToMany = typeof(Sys_RoleMenu))]
|
||||||
public ICollection<Sys_Menu> Menus { get; init; }
|
public IReadOnlyCollection<Sys_Menu> Menus { get; init; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 角色名称
|
/// 角色名称
|
||||||
@ -88,7 +88,7 @@ public record Sys_Role : VersionEntity, IFieldSort, IFieldEnabled, IFieldSummary
|
|||||||
[CsvIgnore]
|
[CsvIgnore]
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
[Navigate(ManyToMany = typeof(Sys_SiteMsgRole))]
|
[Navigate(ManyToMany = typeof(Sys_SiteMsgRole))]
|
||||||
public ICollection<Sys_SiteMsg> SiteMsgs { get; init; }
|
public IReadOnlyCollection<Sys_SiteMsg> SiteMsgs { get; init; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 排序值,越大越前
|
/// 排序值,越大越前
|
||||||
@ -112,7 +112,7 @@ public record Sys_Role : VersionEntity, IFieldSort, IFieldEnabled, IFieldSummary
|
|||||||
[CsvIgnore]
|
[CsvIgnore]
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
[Navigate(ManyToMany = typeof(Sys_UserRole))]
|
[Navigate(ManyToMany = typeof(Sys_UserRole))]
|
||||||
public ICollection<Sys_User> Users { get; init; }
|
public IReadOnlyCollection<Sys_User> Users { get; init; }
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public virtual void Register(TypeAdapterConfig config)
|
public virtual void Register(TypeAdapterConfig config)
|
||||||
|
@ -31,7 +31,7 @@ public record Sys_SiteMsg : VersionEntity, IRegister, IFieldSummary
|
|||||||
[CsvIgnore]
|
[CsvIgnore]
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
[Navigate(ManyToMany = typeof(Sys_SiteMsgDept))]
|
[Navigate(ManyToMany = typeof(Sys_SiteMsgDept))]
|
||||||
public ICollection<Sys_Dept> Depts { get; init; }
|
public IReadOnlyCollection<Sys_Dept> Depts { get; init; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 消息-标记映射
|
/// 消息-标记映射
|
||||||
@ -39,7 +39,7 @@ public record Sys_SiteMsg : VersionEntity, IRegister, IFieldSummary
|
|||||||
[CsvIgnore]
|
[CsvIgnore]
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
[Navigate(nameof(Sys_SiteMsgFlag.SiteMsgId))]
|
[Navigate(nameof(Sys_SiteMsgFlag.SiteMsgId))]
|
||||||
public ICollection<Sys_SiteMsgFlag> Flags { get; init; }
|
public IReadOnlyCollection<Sys_SiteMsgFlag> Flags { get; init; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 消息类型
|
/// 消息类型
|
||||||
@ -54,7 +54,7 @@ public record Sys_SiteMsg : VersionEntity, IRegister, IFieldSummary
|
|||||||
[CsvIgnore]
|
[CsvIgnore]
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
[Navigate(ManyToMany = typeof(Sys_SiteMsgRole))]
|
[Navigate(ManyToMany = typeof(Sys_SiteMsgRole))]
|
||||||
public ICollection<Sys_Role> Roles { get; init; }
|
public IReadOnlyCollection<Sys_Role> Roles { get; init; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 消息摘要
|
/// 消息摘要
|
||||||
@ -78,7 +78,7 @@ public record Sys_SiteMsg : VersionEntity, IRegister, IFieldSummary
|
|||||||
[CsvIgnore]
|
[CsvIgnore]
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
[Navigate(ManyToMany = typeof(Sys_SiteMsgUser))]
|
[Navigate(ManyToMany = typeof(Sys_SiteMsgUser))]
|
||||||
public ICollection<Sys_User> Users { get; init; }
|
public IReadOnlyCollection<Sys_User> Users { get; init; }
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public void Register(TypeAdapterConfig config)
|
public void Register(TypeAdapterConfig config)
|
||||||
|
@ -97,7 +97,7 @@ public record Sys_User : VersionEntity, IFieldSummary, IFieldEnabled, IRegister
|
|||||||
[CsvIgnore]
|
[CsvIgnore]
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
[Navigate(ManyToMany = typeof(Sys_SiteMsgUser))]
|
[Navigate(ManyToMany = typeof(Sys_SiteMsgUser))]
|
||||||
public ICollection<Sys_SiteMsg> SiteMsgs { get; init; }
|
public IReadOnlyCollection<Sys_SiteMsg> SiteMsgs { get; init; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 备注
|
/// 备注
|
||||||
|
@ -4,8 +4,8 @@
|
|||||||
<ProjectReference Include="../NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj"/>
|
<ProjectReference Include="../NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="CronExpressionDescriptor" Version="2.39.0"/>
|
<PackageReference Include="CronExpressionDescriptor" Version="2.40.0"/>
|
||||||
<PackageReference Include="Cronos" Version="0.9.0"/>
|
<PackageReference Include="Cronos" Version="0.10.0"/>
|
||||||
<PackageReference Include="NetAdmin.CsvHelper" Version="1.0.0"/>
|
<PackageReference Include="NetAdmin.CsvHelper" Version="1.0.0"/>
|
||||||
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14"/>
|
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<PackageReference Include="NetAdmin.FreeSql.DbContext" Version="1.1.3" Label="refs"/>
|
<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="NetAdmin.FreeSql.Provider.Sqlite" Version="1.1.3" Label="refs"/>
|
||||||
<PackageReference Include="Gurion" Version="1.2.13" 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="Minio" Version="6.0.4"/>
|
||||||
<PackageReference Include="NSExt" Version="2.3.5"/>
|
<PackageReference Include="NSExt" Version="2.3.5"/>
|
||||||
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.5"/>
|
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.5"/>
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
<ProjectReference Include="../NetAdmin.Host/NetAdmin.Host.csproj"/>
|
<ProjectReference Include="../NetAdmin.Host/NetAdmin.Host.csproj"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<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" Version="2.9.3"/>
|
||||||
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
|
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
"sortablejs": "1.15.6",
|
"sortablejs": "1.15.6",
|
||||||
"vkbeautify": "0.99.3",
|
"vkbeautify": "0.99.3",
|
||||||
"vue": "3.5.13",
|
"vue": "3.5.13",
|
||||||
"vue-i18n": "11.1.2",
|
"vue-i18n": "11.1.3",
|
||||||
"vue-router": "4.5.0",
|
"vue-router": "4.5.0",
|
||||||
"vue3-ace-editor": "2.2.4",
|
"vue3-ace-editor": "2.2.4",
|
||||||
"vue3-json-viewer": "2.2.2",
|
"vue3-json-viewer": "2.2.2",
|
||||||
@ -34,9 +34,9 @@
|
|||||||
"@vitejs/plugin-vue": "5.2.3",
|
"@vitejs/plugin-vue": "5.2.3",
|
||||||
"prettier": "3.5.3",
|
"prettier": "3.5.3",
|
||||||
"prettier-plugin-organize-attributes": "1.0.0",
|
"prettier-plugin-organize-attributes": "1.0.0",
|
||||||
"sass": "1.86.0",
|
"sass": "1.86.3",
|
||||||
"terser": "5.39.0",
|
"terser": "5.39.0",
|
||||||
"vite": "6.2.2"
|
"vite": "6.2.5"
|
||||||
},
|
},
|
||||||
"browserslist": [
|
"browserslist": [
|
||||||
"> 1%",
|
"> 1%",
|
||||||
|
@ -8,6 +8,7 @@
|
|||||||
:before-upload="before"
|
:before-upload="before"
|
||||||
:data="data"
|
:data="data"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
|
:drag="drag"
|
||||||
:http-request="request"
|
:http-request="request"
|
||||||
:limit="limit"
|
:limit="limit"
|
||||||
:multiple="multiple"
|
:multiple="multiple"
|
||||||
@ -70,6 +71,7 @@ export default {
|
|||||||
type: Object,
|
type: Object,
|
||||||
default: () => {},
|
default: () => {},
|
||||||
},
|
},
|
||||||
|
drag: { type: Boolean, default: false },
|
||||||
name: { type: String, default: config.filename },
|
name: { type: String, default: config.filename },
|
||||||
data: {
|
data: {
|
||||||
type: Object,
|
type: Object,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user