diff --git a/YD_Event.Core/Entities/CustomConfig.cs b/YD_Event.Core/Entities/CustomConfig.cs deleted file mode 100644 index bf38dc6..0000000 --- a/YD_Event.Core/Entities/CustomConfig.cs +++ /dev/null @@ -1,77 +0,0 @@ -using YD_Event.Core.Enum; - -namespace YD_Event.Core.Entities; -/// -/// 自定义配置 -/// -public class CustomConfig : Entity, ISoftDelete, ICreatedUserId, ICreatedTime, IUpdatedUserId, IUpdatedTime, IAvailability -{ - /// - /// 配置名称 - /// - [SugarColumn(Length = 32)] - public string Name { get; set; } - - /// - /// 配置唯一编码(类名) - /// - [SugarColumn(Length = 32)] - public string Code { get; set; } - - /// - /// 是否是多项(集合) - /// - public bool IsMultiple { get; set; } - - /// - /// 配置界面设计(json) - /// - [SugarColumn(ColumnDataType = "text")] - public string? Json { get; set; } - - /// - /// 是否允许创建实体 - /// - public bool AllowCreationEntity { get; set; } - - /// - /// 是否已生成实体 - /// - public bool IsGenerate { get; set; } - - /// - /// 可用状态 - /// - public AvailabilityStatus Status { get; set; } - - /// - /// 备注 - /// - [SugarColumn(Length = 256)] - public string? Remark { get; set; } - - /// - /// 标记删除 - /// - public bool DeleteMark { get; set; } - - /// - /// 创建人 - /// - public long CreatedUserId { get; set; } - - /// - /// 创建时间 - /// - public DateTime CreatedTime { get; set; } - - /// - /// 更新人 - /// - public long? UpdatedUserId { get; set; } - - /// - /// 更新时间 - /// - public DateTime? UpdatedTime { get; set; } -} \ No newline at end of file diff --git a/YD_Event.Core/Entities/CustomConfigItem.cs b/YD_Event.Core/Entities/CustomConfigItem.cs deleted file mode 100644 index 8f736cc..0000000 --- a/YD_Event.Core/Entities/CustomConfigItem.cs +++ /dev/null @@ -1,49 +0,0 @@ -using YD_Event.Core.Enum; - -namespace YD_Event.Core.Entities; -/// -/// 自定义配置子项 -/// -public class CustomConfigItem : Entity, ISoftDelete, ICreatedUserId, ICreatedTime, IUpdatedUserId, IUpdatedTime, IAvailability -{ - /// - /// 自定义配置Id - /// - public long ConfigId { get; set; } - - /// - /// 配置 - /// - [SugarColumn(ColumnDataType = "text")] - public string Json { get; set; } - - /// - /// 可用状态 - /// - public AvailabilityStatus Status { get; set; } - - /// - /// 标记删除 - /// - public bool DeleteMark { get; set; } - - /// - /// 创建人 - /// - public long CreatedUserId { get; set; } - - /// - /// 创建时间 - /// - public DateTime CreatedTime { get; set; } - - /// - /// 更新人 - /// - public long? UpdatedUserId { get; set; } - - /// - /// 更新时间 - /// - public DateTime? UpdatedTime { get; set; } -} \ No newline at end of file diff --git a/YD_Event.Core/Entities/Project.cs b/YD_Event.Core/Entities/Project.cs index 9cc9448..279a4fb 100644 --- a/YD_Event.Core/Entities/Project.cs +++ b/YD_Event.Core/Entities/Project.cs @@ -3,7 +3,7 @@ using YD_Event.Core.Enum; namespace YD_Event.Core.Entities; /// -/// 赛事项目表 +/// 项目表 /// [SugarTable("Project")] public class Project : Entity, ISoftDelete, ICreatedUserId, ICreatedTime, IUpdatedUserId, IUpdatedTime, IAvailability diff --git a/YD_Event.Core/Entities/ProjectGroup.cs b/YD_Event.Core/Entities/ProjectGroup.cs index e0509c1..d2cd66d 100644 --- a/YD_Event.Core/Entities/ProjectGroup.cs +++ b/YD_Event.Core/Entities/ProjectGroup.cs @@ -3,7 +3,7 @@ using YD_Event.Core.Enum; namespace YD_Event.Core.Entities; /// -/// 赛事项目组别表 +/// 项目组别表 /// [SugarTable("ProjectGroup")] public class ProjectGroup : Entity, ISoftDelete, ICreatedUserId, ICreatedTime, IUpdatedUserId, IUpdatedTime diff --git a/YD_Event.Core/Entities/ProjectType.cs b/YD_Event.Core/Entities/ProjectType.cs index 5ca2909..48cd912 100644 --- a/YD_Event.Core/Entities/ProjectType.cs +++ b/YD_Event.Core/Entities/ProjectType.cs @@ -3,7 +3,7 @@ using YD_Event.Core.Enum; namespace YD_Event.Core.Entities; /// -/// 赛事项目类型表 +/// 项目类型表 /// [SugarTable("ProjectType")] public class ProjectType : Entity, ISoftDelete, ICreatedUserId, ICreatedTime, IUpdatedUserId, IUpdatedTime, IAvailability diff --git a/YD_Event.Core/InitData/customconfig.txt b/YD_Event.Core/InitData/customconfig.txt deleted file mode 100644 index 291d014..0000000 --- a/YD_Event.Core/InitData/customconfig.txt +++ /dev/null @@ -1,16 +0,0 @@ -[ - { - "Id": 1000, - "Name": "系统安全设置", - "Code": "SysSecuritySetting", - "IsMultiple": "0", - "Json": "{\"widgetList\":[{\"key\":26683,\"type\":\"grid\",\"category\":\"container\",\"icon\":\"grid\",\"cols\":[{\"type\":\"grid-col\",\"category\":\"container\",\"icon\":\"grid-col\",\"internal\":true,\"widgetList\":[{\"key\":75430,\"type\":\"input\",\"icon\":\"text-field\",\"formItemFlag\":true,\"options\":{\"name\":\"Password\",\"label\":\"用户默认密码\",\"labelAlign\":\"label-right-align\",\"type\":\"text\",\"defaultValue\":\"\",\"placeholder\":\"添加系统用户初始密码\",\"columnWidth\":\"200px\",\"size\":\"\",\"labelWidth\":null,\"labelHidden\":false,\"readonly\":false,\"disabled\":false,\"hidden\":false,\"clearable\":true,\"showPassword\":false,\"required\":true,\"requiredHint\":\"\",\"validation\":\"noChinese\",\"validationHint\":\"\",\"customClass\":[],\"labelIconClass\":null,\"labelIconPosition\":\"rear\",\"labelTooltip\":null,\"minLength\":6,\"maxLength\":16,\"showWordLimit\":false,\"prefixIcon\":\"\",\"suffixIcon\":\"\",\"appendButton\":false,\"appendButtonDisabled\":false,\"buttonIcon\":\"custom-search\",\"onCreated\":\"\",\"onMounted\":\"\",\"onInput\":\"\",\"onChange\":\"\",\"onFocus\":\"\",\"onBlur\":\"\",\"onValidate\":\"\",\"onAppendButtonClick\":\"\"},\"id\":\"input35719\"}],\"options\":{\"name\":\"gridCol81978\",\"hidden\":false,\"span\":12,\"offset\":0,\"push\":0,\"pull\":0,\"responsive\":false,\"md\":12,\"sm\":12,\"xs\":12,\"customClass\":[]},\"id\":\"grid-col-81978\"},{\"type\":\"grid-col\",\"category\":\"container\",\"icon\":\"grid-col\",\"internal\":true,\"widgetList\":[{\"key\":8364,\"type\":\"number\",\"icon\":\"number-field\",\"formItemFlag\":true,\"options\":{\"name\":\"Times\",\"label\":\"密码错误次数\",\"labelAlign\":\"label-right-align\",\"defaultValue\":5,\"placeholder\":\"\",\"columnWidth\":\"200px\",\"size\":\"\",\"labelWidth\":null,\"labelHidden\":false,\"disabled\":false,\"hidden\":false,\"required\":true,\"requiredHint\":\"\",\"validation\":\"noChinese\",\"validationHint\":\"\",\"customClass\":[],\"labelIconClass\":null,\"labelIconPosition\":\"rear\",\"labelTooltip\":\"设置为0时代表不限制次数\",\"min\":0,\"max\":100,\"precision\":0,\"step\":1,\"controlsPosition\":\"right\",\"onCreated\":\"\",\"onMounted\":\"\",\"onChange\":\"\",\"onFocus\":\"\",\"onBlur\":\"\",\"onValidate\":\"\"},\"id\":\"number91731\"}],\"options\":{\"name\":\"gridCol87916\",\"hidden\":false,\"span\":12,\"offset\":0,\"push\":0,\"pull\":0,\"responsive\":false,\"md\":12,\"sm\":12,\"xs\":12,\"customClass\":[]},\"id\":\"grid-col-87916\"}],\"options\":{\"name\":\"grid89392\",\"hidden\":false,\"gutter\":12,\"colHeight\":\"\",\"customClass\":[]},\"id\":\"grid89392\"},{\"key\":42869,\"type\":\"grid\",\"category\":\"container\",\"icon\":\"grid\",\"cols\":[{\"type\":\"grid-col\",\"category\":\"container\",\"icon\":\"grid-col\",\"internal\":true,\"widgetList\":[{\"key\":26224,\"type\":\"input\",\"icon\":\"text-field\",\"formItemFlag\":true,\"options\":{\"name\":\"PasswordRule\",\"label\":\"密码规则\",\"labelAlign\":\"\",\"type\":\"text\",\"defaultValue\":\"\",\"placeholder\":\"密码验证正则表达式\",\"columnWidth\":\"200px\",\"size\":\"\",\"labelWidth\":null,\"labelHidden\":false,\"readonly\":false,\"disabled\":false,\"hidden\":false,\"clearable\":true,\"showPassword\":false,\"required\":false,\"requiredHint\":\"\",\"validation\":\"\",\"validationHint\":\"\",\"customClass\":[],\"labelIconClass\":null,\"labelIconPosition\":\"rear\",\"labelTooltip\":null,\"minLength\":null,\"maxLength\":null,\"showWordLimit\":false,\"prefixIcon\":\"\",\"suffixIcon\":\"\",\"appendButton\":false,\"appendButtonDisabled\":false,\"buttonIcon\":\"custom-search\",\"onCreated\":\"\",\"onMounted\":\"\",\"onInput\":\"\",\"onChange\":\"\",\"onFocus\":\"\",\"onBlur\":\"\",\"onValidate\":\"\",\"onAppendButtonClick\":\"\"},\"id\":\"input80410\"}],\"options\":{\"name\":\"gridCol60535\",\"hidden\":false,\"span\":12,\"offset\":0,\"push\":0,\"pull\":0,\"responsive\":false,\"md\":12,\"sm\":12,\"xs\":12,\"customClass\":\"\"},\"id\":\"grid-col-60535\"},{\"type\":\"grid-col\",\"category\":\"container\",\"icon\":\"grid-col\",\"internal\":true,\"widgetList\":[{\"key\":26224,\"type\":\"input\",\"icon\":\"text-field\",\"formItemFlag\":true,\"options\":{\"name\":\"RuleMessage\",\"label\":\"密码规则提示语\",\"labelAlign\":\"\",\"type\":\"text\",\"defaultValue\":\"\",\"placeholder\":\"密码与规则不匹配提示语\",\"columnWidth\":\"200px\",\"size\":\"\",\"labelWidth\":null,\"labelHidden\":false,\"readonly\":false,\"disabled\":false,\"hidden\":false,\"clearable\":true,\"showPassword\":false,\"required\":false,\"requiredHint\":\"\",\"validation\":\"\",\"validationHint\":\"\",\"customClass\":[],\"labelIconClass\":null,\"labelIconPosition\":\"rear\",\"labelTooltip\":null,\"minLength\":null,\"maxLength\":null,\"showWordLimit\":false,\"prefixIcon\":\"\",\"suffixIcon\":\"\",\"appendButton\":false,\"appendButtonDisabled\":false,\"buttonIcon\":\"custom-search\",\"onCreated\":\"\",\"onMounted\":\"\",\"onInput\":\"\",\"onChange\":\"\",\"onFocus\":\"\",\"onBlur\":\"\",\"onValidate\":\"\",\"onAppendButtonClick\":\"\"},\"id\":\"input12340\"}],\"options\":{\"name\":\"gridCol53568\",\"hidden\":false,\"span\":12,\"offset\":0,\"push\":0,\"pull\":0,\"responsive\":false,\"md\":12,\"sm\":12,\"xs\":12,\"customClass\":\"\"},\"id\":\"grid-col-53568\"}],\"options\":{\"name\":\"grid95138\",\"hidden\":false,\"gutter\":12,\"colHeight\":null,\"customClass\":\"\"},\"id\":\"grid95138\"},{\"key\":42869,\"type\":\"grid\",\"category\":\"container\",\"icon\":\"grid\",\"cols\":[{\"type\":\"grid-col\",\"category\":\"container\",\"icon\":\"grid-col\",\"internal\":true,\"widgetList\":[{\"key\":47419,\"type\":\"number\",\"icon\":\"number-field\",\"formItemFlag\":true,\"options\":{\"name\":\"TokenExpired\",\"label\":\"Token有效期(分钟)\",\"labelAlign\":\"\",\"defaultValue\":60,\"placeholder\":\"\",\"columnWidth\":\"200px\",\"size\":\"\",\"labelWidth\":null,\"labelHidden\":false,\"disabled\":false,\"hidden\":false,\"required\":false,\"requiredHint\":\"\",\"validation\":\"\",\"validationHint\":\"\",\"customClass\":[],\"labelIconClass\":null,\"labelIconPosition\":\"rear\",\"labelTooltip\":null,\"min\":-100000000000,\"max\":100000000000,\"precision\":0,\"step\":1,\"controlsPosition\":\"right\",\"onCreated\":\"\",\"onMounted\":\"\",\"onChange\":\"\",\"onFocus\":\"\",\"onBlur\":\"\",\"onValidate\":\"\"},\"id\":\"number84023\"}],\"options\":{\"name\":\"gridCol30722\",\"hidden\":false,\"span\":12,\"offset\":0,\"push\":0,\"pull\":0,\"responsive\":false,\"md\":12,\"sm\":12,\"xs\":12,\"customClass\":\"\"},\"id\":\"grid-col-30722\"},{\"type\":\"grid-col\",\"category\":\"container\",\"icon\":\"grid-col\",\"internal\":true,\"widgetList\":[],\"options\":{\"name\":\"gridCol57375\",\"hidden\":false,\"span\":12,\"offset\":0,\"push\":0,\"pull\":0,\"responsive\":false,\"md\":12,\"sm\":12,\"xs\":12,\"customClass\":[]},\"id\":\"grid-col-57375\"}],\"options\":{\"name\":\"grid33835\",\"hidden\":false,\"gutter\":12,\"colHeight\":null,\"customClass\":[]},\"id\":\"grid33835\"}],\"formConfig\":{\"modelName\":\"formData\",\"refName\":\"vForm\",\"rulesName\":\"rules\",\"labelWidth\":150,\"labelPosition\":\"left\",\"size\":\"\",\"labelAlign\":\"label-right-align\",\"cssCode\":\"\",\"customClass\":[],\"functions\":\"\",\"layoutType\":\"PC\",\"jsonVersion\":3,\"onFormCreated\":\"\",\"onFormMounted\":\"\",\"onFormDataChange\":\"\",\"onFormValidate\":\"\"}}", - "AllowCreationEntity": "1", - "IsGenerate": "1", - "Status": 0, - "Remark": "", - "DeleteMark": false, - "CreatedUserId": 1, - "CreatedTime": "2023-06-01" - } -] \ No newline at end of file diff --git a/YD_Event.Core/YD_Event.Core.xml b/YD_Event.Core/YD_Event.Core.xml index 3a98bf3..1313015 100644 --- a/YD_Event.Core/YD_Event.Core.xml +++ b/YD_Event.Core/YD_Event.Core.xml @@ -1030,121 +1030,6 @@ 更新人 - - - 自定义配置 - - - - - 配置名称 - - - - - 配置唯一编码(类名) - - - - - 是否是多项(集合) - - - - - 配置界面设计(json) - - - - - 是否允许创建实体 - - - - - 是否已生成实体 - - - - - 可用状态 - - - - - 备注 - - - - - 标记删除 - - - - - 创建人 - - - - - 创建时间 - - - - - 更新人 - - - - - 更新时间 - - - - - 自定义配置子项 - - - - - 自定义配置Id - - - - - 配置 - - - - - 可用状态 - - - - - 标记删除 - - - - - 创建人 - - - - - 创建时间 - - - - - 更新人 - - - - - 更新时间 - - 赛事证书表 @@ -2903,7 +2788,7 @@ - 赛事项目表 + 项目表 @@ -2993,7 +2878,7 @@ - 赛事项目组别表 + 项目组别表 @@ -3048,7 +2933,7 @@ - 赛事项目类型表 + 项目类型表