- 优化 支持动态操作 .IncludeByPropertyName 之后的 then.WhereDynamicFilter 操作；

Examples/base_entity/AspNetRoleClaims/AspNetRoleClaims.cs

@@ -0,0 +1,36 @@
+using FreeSql.DataAnnotations;
+using Newtonsoft.Json;
+using System.ComponentModel;
+#nullable disable
+
+namespace Densen.Models.ids
+{
+
+    /// <summary>
+    /// 角色声明
+    /// </summary>
+    [JsonObject(MemberSerialization.OptIn), Table(DisableSyncStructure = true)]
+    public partial class AspNetRoleClaims
+    {
+
+        [DisplayName("ID")]
+        [JsonProperty, Column(IsPrimary = true, IsIdentity = true)]
+        public int Id { get; set; }
+
+        [DisplayName("角色ID")]
+        [JsonProperty, Column(StringLength = -2, IsNullable = false)]
+        public string RoleId { get; set; }
+
+        [DisplayName("角色声明")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string ClaimType { get; set; }
+
+        [DisplayName("值")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string ClaimValue { get; set; }
+
+        [Navigate(nameof(RoleId))]
+        public virtual AspNetRoles AspNetRoles { get; set; }
+
+    }
+}

Examples/base_entity/AspNetRoleClaims/AspNetRoles.cs

@@ -0,0 +1,39 @@
+using FreeSql.DataAnnotations;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using System.ComponentModel;
+#nullable disable
+
+namespace Densen.Models.ids
+{
+
+    /// <summary>
+    /// 角色定义
+    /// </summary>
+    [JsonObject(MemberSerialization.OptIn), Table(DisableSyncStructure = true)]
+    public partial class AspNetRoles
+    {
+
+        [DisplayName("ID")]
+        [JsonProperty, Column(StringLength = -2, IsPrimary = true, IsNullable = false)]
+        public string Id { get; set; }
+
+        [DisplayName("角色")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string Name { get; set; }
+
+        [DisplayName("标准化名称")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string NormalizedName { get; set; }
+
+        [DisplayName("并发票据")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string ConcurrencyStamp { get; set; }
+
+        //导航属性
+        [Navigate(nameof(AspNetUserRoles.RoleId))]
+        [DisplayName("角色表")]
+        public virtual List<AspNetUserRoles> AspNetUserRoless { get; set; }
+
+    }
+}

Examples/base_entity/AspNetRoleClaims/AspNetUserClaims.cs

@@ -0,0 +1,39 @@
+using FreeSql.DataAnnotations;
+using Newtonsoft.Json;
+using System.ComponentModel;
+#nullable disable
+
+namespace Densen.Models.ids
+{
+
+    /// <summary>
+    /// 用户声明
+    /// </summary>
+    [JsonObject(MemberSerialization.OptIn), Table(DisableSyncStructure = true)]
+    public partial class AspNetUserClaims
+    {
+
+        [DisplayName("ID")]
+        [JsonProperty, Column(IsPrimary = true, IsIdentity = true)]
+        public int Id { get; set; }
+
+        [DisplayName("用户ID")]
+        [JsonProperty, Column(StringLength = -2, IsNullable = false)]
+        public string UserId { get; set; }
+
+        [DisplayName("声明类型")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string ClaimType { get; set; }
+
+        [DisplayName("值")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string ClaimValue { get; set; }
+
+        /// <summary>
+        /// 用户
+        /// </summary>
+        [Navigate(nameof(UserId))]
+        public virtual AspNetUsers AspNetUsers { get; set; }
+
+    }
+}

Examples/base_entity/AspNetRoleClaims/AspNetUserLogins.cs

@@ -0,0 +1,39 @@
+using FreeSql.DataAnnotations;
+using Newtonsoft.Json;
+using System.ComponentModel;
+#nullable disable
+
+namespace Densen.Models.ids
+{
+
+    /// <summary>
+    /// 用户登录
+    /// </summary>
+    [JsonObject(MemberSerialization.OptIn), Table(DisableSyncStructure = true)]
+    public partial class AspNetUserLogins
+    {
+
+        [DisplayName("外联登录")]
+        [JsonProperty, Column(StringLength = -2, IsPrimary = true, IsNullable = false)]
+        public string LoginProvider { get; set; }
+
+        [DisplayName("用户ID")]
+        [JsonProperty, Column(StringLength = -2, IsNullable = false)]
+        public string UserId { get; set; }
+
+        [DisplayName("外联Key")]
+        [JsonProperty, Column(StringLength = -2, IsNullable = false)]
+        public string ProviderKey { get; set; }
+
+        [DisplayName("外联名称")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string ProviderDisplayName { get; set; }
+
+        /// <summary>
+        /// 用户
+        /// </summary>
+        [Navigate(nameof(UserId))]
+        public virtual AspNetUsers AspNetUsers { get; set; }
+
+    }
+}

Examples/base_entity/AspNetRoleClaims/AspNetUserRoles.cs

@@ -0,0 +1,45 @@
+using FreeSql.DataAnnotations;
+using Newtonsoft.Json;
+using System.ComponentModel;
+#nullable disable
+
+namespace Densen.Models.ids
+{
+
+    /// <summary>
+    /// 角色表
+    /// <para>存储向哪些用户分配哪些角色</para>
+    /// </summary>
+    [JsonObject(MemberSerialization.OptIn), Table(DisableSyncStructure = true)]
+    public partial class AspNetUserRoles
+    {
+
+        [DisplayName("用户ID")]
+        [JsonProperty, Column(StringLength = -2, IsPrimary = true, IsNullable = false)]
+        public string UserId { get; set; }
+
+        [JsonProperty, Column(IsIgnore = true)]
+        [DisplayName("用户")]
+        public string UserName { get => roleName ?? (AspNetUserss?.UserName); set => userName = value; }
+        string userName;
+
+        [DisplayName("角色ID")]
+        [JsonProperty, Column(StringLength = -2, IsNullable = false)]
+        public string RoleId { get; set; }
+
+        [JsonProperty, Column(IsIgnore = true)]
+        [DisplayName("角色名称")]
+        public string RoleName { get => roleName ?? (AspNetRoless?.Name); set => roleName = value; }
+        string roleName;
+
+        [DisplayName("角色定义")]
+        [Navigate(nameof(RoleId))]
+        public virtual AspNetRoles AspNetRoless { get; set; }
+
+        [DisplayName("用户表")]
+        [Navigate(nameof(UserId))]
+        public virtual AspNetUsers AspNetUserss { get; set; }
+
+    }
+
+}

Examples/base_entity/AspNetRoleClaims/AspNetUserTokens.cs

@@ -0,0 +1,36 @@
+using FreeSql.DataAnnotations;
+using Newtonsoft.Json;
+using System.ComponentModel;
+#nullable disable
+
+namespace Densen.Models.ids
+{
+
+    /// <summary>
+    /// 用户令牌
+    /// </summary>
+    [JsonObject(MemberSerialization.OptIn), Table(DisableSyncStructure = true)]
+    public partial class AspNetUserTokens
+    {
+
+        [DisplayName("用户ID")]
+        [JsonProperty, Column(StringLength = -2, IsPrimary = true, IsNullable = false)]
+        public string UserId { get; set; }
+
+        [DisplayName("名称")]
+        [JsonProperty, Column(StringLength = -2, IsNullable = false)]
+        public string Name { get; set; }
+
+        [DisplayName("外部登录提供程序")]
+        [JsonProperty, Column(StringLength = -2, IsNullable = false)]
+        public string LoginProvider { get; set; }
+
+        [DisplayName("值")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string Value { get; set; }
+
+        [Navigate(nameof(UserId))]
+        public virtual AspNetUsers AspNetUsers { get; set; }
+
+    }
+}

Examples/base_entity/AspNetRoleClaims/AspNetUsers.cs

@@ -0,0 +1,149 @@
+using FreeSql.DataAnnotations;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+#nullable disable
+
+namespace Densen.Models.ids
+{
+
+    /// <summary>
+    /// 用户表
+    /// </summary>
+    [JsonObject(MemberSerialization.OptIn), Table(DisableSyncStructure = true)]
+    public partial class AspNetUsers
+    {
+
+        [DisplayName("用户ID")]
+        [JsonProperty, Column(StringLength = -2, IsPrimary = true, IsNullable = false)]
+        public string Id { get; set; }
+
+        [JsonProperty, Column(StringLength = -2)]
+        [DisplayName("用户名")]
+        public string UserName { get; set; }
+
+        [JsonProperty, Column(IsIgnore = true)]
+        [DisplayName("角色")]
+        public string RoleName { get => roleName ?? (AspNetUserRoless != null ? string.Join(",", AspNetUserRoless?.Select(a => a.RoleName ?? a.RoleId).ToList()) : ""); set => roleName = value; }
+        string roleName;
+
+        [JsonProperty, Column(StringLength = -2)]
+        public string Email { get; set; }
+
+        [DisplayName("电话")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string PhoneNumber { get; set; }
+
+        [DisplayName("自定义名称")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string Name { get; set; }
+
+        [DisplayName("自定义角色")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string UserRole { get; set; }
+
+        [DisplayName("密码哈希")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string PasswordHash { get; set; }
+
+        [DisplayName("电子邮件已确认")]
+        [JsonProperty]
+        public int EmailConfirmed { get; set; }
+
+        [DisplayName("电话号码已确认")]
+        [JsonProperty]
+        public int PhoneNumberConfirmed { get; set; }
+
+        [DisplayName("锁定结束")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string LockoutEnd { get; set; }
+
+        [DisplayName("启用双因素登录")]
+        [JsonProperty]
+        public int TwoFactorEnabled { get; set; }
+
+        [DisplayName("并发票据")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string ConcurrencyStamp { get; set; }
+
+        [DisplayName("防伪印章")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string SecurityStamp { get; set; }
+
+        [DisplayName("标准化电子邮件")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string NormalizedEmail { get; set; }
+
+        [DisplayName("标准化用户名")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string NormalizedUserName { get; set; }
+
+        [DisplayName("启用锁定")]
+        [JsonProperty]
+        public int LockoutEnabled { get; set; }
+
+        [DisplayName("国家")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string Country { get; set; }
+
+        [DisplayName("省")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string Province { get; set; }
+
+        [DisplayName("城市")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string City { get; set; }
+
+        [DisplayName("县")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string County { get; set; }
+
+        [DisplayName("邮编")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string Zip { get; set; }
+
+        [DisplayName("街道")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string Street { get; set; }
+
+        [DisplayName("税号")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string TaxNumber { get; set; }
+
+        [DisplayName("提供者")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string provider { get; set; }
+
+        [DisplayName("UUID")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string UUID { get; set; }
+
+        [DisplayName("生日")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string DOB { get; set; }
+
+        [DisplayName("访问失败次数")]
+        [JsonProperty]
+        public int AccessFailedCount { get; set; }
+
+        //导航属性
+        [Navigate(nameof(AspNetUserRoles.UserId))]
+        [DisplayName("角色表")]
+        public virtual List<AspNetUserRoles> AspNetUserRoless { get; set; }
+
+        [Navigate(nameof(AspNetUserClaims.UserId))]
+        [DisplayName("用户声明")]
+        public virtual List<AspNetUserClaims> AspNetUserClaimss { get; set; }
+
+        [Navigate(nameof(AspNetUserLogins.UserId))]
+        [DisplayName("用户登录")]
+        public virtual List<AspNetUserLogins> AspNetUserLoginss { get; set; }
+
+        [JsonProperty, Column(IsIgnore = true)]
+        [DisplayName("1st角色")]
+        public string RoleName1st { get => roleName1st ?? ((AspNetUserRoless != null && AspNetUserRoless.Any()) ? AspNetUserRoless?.Select(a => a.RoleName ?? a.RoleId ?? "").First() : ""); set => roleName1st = value; }
+        string roleName1st;
+
+    }
+}

Examples/base_entity/AspNetRoleClaims/DeviceCodes.cs

@@ -0,0 +1,53 @@
+using FreeSql.DataAnnotations;
+using Newtonsoft.Json;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+#nullable disable
+
+namespace Densen.Models.ids
+{
+    /// <summary>
+    /// 设备代码
+    /// </summary>
+    [JsonObject(MemberSerialization.OptIn), Table(DisableSyncStructure = true)]
+    public partial class DeviceCodes
+    {
+
+        [Display(Name = "用户代码")]
+        [JsonProperty, Column(StringLength = -2, IsPrimary = true, IsNullable = false)]
+        public string UserCode { get; set; }
+
+        [Display(Name = "设备代码")]
+        [JsonProperty, Column(StringLength = -2, IsNullable = false)]
+        public string DeviceCode { get; set; }
+
+        [Display(Name = "主题编号")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string SubjectId { get; set; }
+
+        [Display(Name = "会话编号")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string SessionId { get; set; }
+
+        [Display(Name = "客户编号")]
+        [JsonProperty, Column(StringLength = -2, IsNullable = false)]
+        public string ClientId { get; set; }
+
+        [Display(Name = "描述")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string Description { get; set; }
+
+        [Display(Name = "创建时间")]
+        [JsonProperty, Column(StringLength = -2, IsNullable = false)]
+        public string CreationTime { get; set; }
+
+        [Display(Name = "到期")]
+        [JsonProperty, Column(StringLength = -2, IsNullable = false)]
+        public string Expiration { get; set; }
+
+        [DisplayName("数据")]
+        [JsonProperty, Column(StringLength = -2, IsNullable = false)]
+        public string Data { get; set; }
+
+    }
+}

Examples/base_entity/AspNetRoleClaims/Keys.cs

@@ -0,0 +1,49 @@
+using FreeSql.DataAnnotations;
+using Newtonsoft.Json;
+using System.ComponentModel;
+#nullable disable
+
+namespace Densen.Models.ids
+{
+
+    /// <summary>
+    /// 密钥
+    /// </summary>
+    [JsonObject(MemberSerialization.OptIn), Table(DisableSyncStructure = true)]
+    public partial class Keys
+    {
+
+        [DisplayName("ID")]
+        [JsonProperty, Column(StringLength = -2, IsPrimary = true, IsNullable = false)]
+        public string Id { get; set; }
+
+        [DisplayName("版本")]
+        [JsonProperty]
+        public int Version { get; set; }
+
+        [DisplayName("创建")]
+        [JsonProperty, Column(StringLength = -2, IsNullable = false)]
+        public string Created { get; set; }
+
+        [DisplayName("使用")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string Use { get; set; }
+
+        [DisplayName("算法")]
+        [JsonProperty, Column(StringLength = -2, IsNullable = false)]
+        public string Algorithm { get; set; }
+
+        [DisplayName("是X509证书")]
+        [JsonProperty]
+        public int IsX509Certificate { get; set; }
+
+        [DisplayName("数据保护")]
+        [JsonProperty]
+        public int DataProtected { get; set; }
+
+        [DisplayName("数据")]
+        [JsonProperty, Column(StringLength = -2, IsNullable = false)]
+        public string Data { get; set; }
+
+    }
+}

Examples/base_entity/AspNetRoleClaims/PersistedGrants.cs

@@ -0,0 +1,57 @@
+using FreeSql.DataAnnotations;
+using Newtonsoft.Json;
+using System.ComponentModel;
+#nullable disable
+
+namespace Densen.Models.ids
+{
+
+    /// <summary>
+    /// 持久化保存
+    /// </summary>
+    [JsonObject(MemberSerialization.OptIn), Table(DisableSyncStructure = true)]
+    public partial class PersistedGrants
+    {
+
+        [DisplayName("键值")]
+        [JsonProperty, Column(StringLength = -2, IsPrimary = true, IsNullable = false)]
+        public string Key { get; set; }
+
+        [DisplayName("类型")]
+        [JsonProperty, Column(StringLength = -2, IsNullable = false)]
+        public string Type { get; set; }
+
+        [DisplayName("主题编号")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string SubjectId { get; set; }
+
+        [DisplayName("会话编号")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string SessionId { get; set; }
+
+        [DisplayName("客户编号")]
+        [JsonProperty, Column(StringLength = -2, IsNullable = false)]
+        public string ClientId { get; set; }
+
+        [DisplayName("描述")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string Description { get; set; }
+
+        [DisplayName("创建时间")]
+        [JsonProperty, Column(StringLength = -2, IsNullable = false)]
+        public string CreationTime { get; set; }
+
+        [DisplayName("到期")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string Expiration { get; set; }
+
+        [DisplayName("消耗时间")]
+        [JsonProperty, Column(StringLength = -2)]
+        public string ConsumedTime { get; set; }
+
+        [DisplayName("数据")]
+        [JsonProperty, Column(StringLength = -2, IsNullable = false)]
+        public string Data { get; set; }
+
+    }
+}

Examples/base_entity/AspNetRoleClaims/WebAppIdentityUser.cs

@@ -0,0 +1,53 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace Densen.Identity.Models
+{
+
+    public class WebAppIdentityUser
+    {
+
+
+        /// <summary>
+        /// Full name
+        /// </summary>
+        [Display(Name = "全名")]
+        public string? Name { get; set; }
+
+        /// <summary>
+        /// Birth Date
+        /// </summary>
+        [Display(Name = "生日")]
+        public DateTime? DOB { get; set; }
+
+        [Display(Name = "识别码")]
+        public string? UUID { get; set; }
+
+        [Display(Name = "外联")]
+        public string? provider { get; set; }
+
+        [Display(Name = "税号")]
+        public string? TaxNumber { get; set; }
+
+        [Display(Name = "街道地址")]
+        public string? Street { get; set; }
+
+        [Display(Name = "邮编")]
+        public string? Zip { get; set; }
+
+        [Display(Name = "县")]
+        public string? County { get; set; }
+
+        [Display(Name = "城市")]
+        public string? City { get; set; }
+
+        [Display(Name = "省份")]
+        public string? Province { get; set; }
+
+        [Display(Name = "国家")]
+        public string? Country { get; set; }
+
+        [Display(Name = "类型")]
+        public string? UserRole { get; set; }
+    }
+}