diff --git a/Admin.NET/Admin.NET.Core/Enum/CultureLevelEnum.cs b/Admin.NET/Admin.NET.Core/Enum/CultureLevelEnum.cs
index 56b325e310b34884306543ec63a6d665215d6b5d..ce54e33f00545f45c1553d20ad0ea0ed3d04d9c3 100644
--- a/Admin.NET/Admin.NET.Core/Enum/CultureLevelEnum.cs
+++ b/Admin.NET/Admin.NET.Core/Enum/CultureLevelEnum.cs
@@ -15,7 +15,7 @@ public enum CultureLevelEnum
///
/// 其他
///
- [Description("其他")]
+ [Description("其他"), Theme("info")]
Level0 = 0,
///
diff --git a/Admin.NET/Admin.NET.Core/Enum/DataOpTypeEnum.cs b/Admin.NET/Admin.NET.Core/Enum/DataOpTypeEnum.cs
index f4c04eacef59fa11580a5a167c5f6a720c7d7724..71ae9c00a58d4af0ca0ecb961db8396da1ef305a 100644
--- a/Admin.NET/Admin.NET.Core/Enum/DataOpTypeEnum.cs
+++ b/Admin.NET/Admin.NET.Core/Enum/DataOpTypeEnum.cs
@@ -15,7 +15,7 @@ public enum DataOpTypeEnum
///
/// 其它
///
- [Description("其它")]
+ [Description("其它"), Theme("info")]
Other,
///
diff --git a/Admin.NET/Admin.NET.Core/Enum/FinishStatusEnum.cs b/Admin.NET/Admin.NET.Core/Enum/FinishStatusEnum.cs
index d92aa89eb9a6623a4f2af1ed846edf237108f035..90e188faa02f64dce3b697fb28584481ceaf7073 100644
--- a/Admin.NET/Admin.NET.Core/Enum/FinishStatusEnum.cs
+++ b/Admin.NET/Admin.NET.Core/Enum/FinishStatusEnum.cs
@@ -15,12 +15,12 @@ public enum FinishStatusEnum
///
/// 已完成
///
- [Description("已完成")]
+ [Description("已完成"), Theme("success")]
Finish = 1,
///
/// 未完成
///
- [Description("未完成")]
+ [Description("未完成"), Theme("danger")]
UnFinish = 0,
}
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Core/Enum/GenderEnum.cs b/Admin.NET/Admin.NET.Core/Enum/GenderEnum.cs
index 5b5a7904a2691e7031c0b479e8c56f7e008d7ec7..587c1cb69c41851af3d298f0f693bbe5041c2d4f 100644
--- a/Admin.NET/Admin.NET.Core/Enum/GenderEnum.cs
+++ b/Admin.NET/Admin.NET.Core/Enum/GenderEnum.cs
@@ -15,7 +15,7 @@ public enum GenderEnum
///
/// 未知的性别
///
- [Description("未知的性别")]
+ [Description("未知的性别"), Theme("info")]
Unknown = 0,
///
@@ -33,6 +33,6 @@ public enum GenderEnum
///
/// 未说明的性别
///
- [Description("未说明的性别")]
+ [Description("未说明的性别"), Theme("info")]
Unspecified = 9
}
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Core/Enum/JobCreateTypeEnum.cs b/Admin.NET/Admin.NET.Core/Enum/JobCreateTypeEnum.cs
index acee68ba3430e715630127adc5df203679f9e9c9..2d90b69a6fbe8ef49cf1001c3442409dab36baf8 100644
--- a/Admin.NET/Admin.NET.Core/Enum/JobCreateTypeEnum.cs
+++ b/Admin.NET/Admin.NET.Core/Enum/JobCreateTypeEnum.cs
@@ -15,7 +15,7 @@ public enum JobCreateTypeEnum
///
/// 内置
///
- [Description("内置")]
+ [Description("内置"), Theme("info")]
BuiltIn = 0,
///
diff --git a/Admin.NET/Admin.NET.Core/Enum/MenuTypeEnum.cs b/Admin.NET/Admin.NET.Core/Enum/MenuTypeEnum.cs
index 9d32321624eb4ff834e8a32d3d7d3fd9126ef7e9..38f2a2dcdcb2d225cc2cc109375b3310cdcbd80c 100644
--- a/Admin.NET/Admin.NET.Core/Enum/MenuTypeEnum.cs
+++ b/Admin.NET/Admin.NET.Core/Enum/MenuTypeEnum.cs
@@ -15,7 +15,8 @@ public enum MenuTypeEnum
///
/// 目录
///
- [Description("目录")]
+
+ [Description("目录"), Theme("warning")]
Dir = 1,
///
@@ -27,6 +28,6 @@ public enum MenuTypeEnum
///
/// 按钮
///
- [Description("按钮")]
+ [Description("按钮"), Theme("info")]
Btn = 3
}
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Core/Enum/MessageTypeEnum.cs b/Admin.NET/Admin.NET.Core/Enum/MessageTypeEnum.cs
index cfbe3a31a253f6c3fe538c6ca067b7387c4a05ba..1ac3bfd61257efde0d56847355dd9c0aacd877e6 100644
--- a/Admin.NET/Admin.NET.Core/Enum/MessageTypeEnum.cs
+++ b/Admin.NET/Admin.NET.Core/Enum/MessageTypeEnum.cs
@@ -15,24 +15,24 @@ public enum MessageTypeEnum
///
/// 普通信息
///
- [Description("消息")]
+ [Description("消息"), Theme("info")]
Info = 0,
///
/// 成功提示
///
- [Description("成功")]
+ [Description("成功"), Theme("success")]
Success = 1,
///
/// 警告提示
///
- [Description("警告")]
+ [Description("警告"), Theme("warning")]
Warning = 2,
///
/// 错误提示
///
- [Description("错误")]
+ [Description("错误"), Theme("danger")]
Error = 3
}
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Core/Enum/NoticeStatusEnum.cs b/Admin.NET/Admin.NET.Core/Enum/NoticeStatusEnum.cs
index 16b4067a6d82ad3efac84ff0d9fa4c645a27d8b6..0bd68e89c4448fdb98586bf0767446e4c91d8d74 100644
--- a/Admin.NET/Admin.NET.Core/Enum/NoticeStatusEnum.cs
+++ b/Admin.NET/Admin.NET.Core/Enum/NoticeStatusEnum.cs
@@ -15,7 +15,7 @@ public enum NoticeStatusEnum
///
/// 草稿
///
- [Description("草稿")]
+ [Description("草稿"), Theme("info")]
DRAFT = 0,
///
diff --git a/Admin.NET/Admin.NET.Core/Enum/NoticeUserStatusEnum.cs b/Admin.NET/Admin.NET.Core/Enum/NoticeUserStatusEnum.cs
index 91998b544254cca6f9ba2d9fb5f6b1d106123935..a22fc26a75bccde23a868a6fdd3672ef201a9901 100644
--- a/Admin.NET/Admin.NET.Core/Enum/NoticeUserStatusEnum.cs
+++ b/Admin.NET/Admin.NET.Core/Enum/NoticeUserStatusEnum.cs
@@ -21,6 +21,6 @@ public enum NoticeUserStatusEnum
///
/// 已读
///
- [Description("已读")]
+ [Description("已读"), Theme("info")]
READ = 1
}
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Core/Enum/StatusEnum.cs b/Admin.NET/Admin.NET.Core/Enum/StatusEnum.cs
index c9560353c92d71ab7f0afbfb53d28d52c8dad611..246f6dc4560aefdac06736861e3fa4a18ec3144c 100644
--- a/Admin.NET/Admin.NET.Core/Enum/StatusEnum.cs
+++ b/Admin.NET/Admin.NET.Core/Enum/StatusEnum.cs
@@ -15,12 +15,12 @@ public enum StatusEnum
///
/// 启用
///
- [Description("启用")]
+ [Description("启用"), Theme("success")]
Enable = 1,
///
/// 停用
///
- [Description("停用")]
+ [Description("停用"), Theme("danger")]
Disable = 2,
}
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Core/Enum/YesNoEnum.cs b/Admin.NET/Admin.NET.Core/Enum/YesNoEnum.cs
index b241a67877913cca05811f6bb140eb4ee8d0d183..d26d141ad91d03c239f39dcdf6ae77be79916070 100644
--- a/Admin.NET/Admin.NET.Core/Enum/YesNoEnum.cs
+++ b/Admin.NET/Admin.NET.Core/Enum/YesNoEnum.cs
@@ -15,12 +15,12 @@ public enum YesNoEnum
///
/// 是
///
- [Description("是")]
+ [Description("是"), Theme("success")]
Y = 1,
///
/// 否
///
- [Description("否")]
+ [Description("否"), Theme("danger")]
N = 2
}
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Core/Job/EnumToDictJob.cs b/Admin.NET/Admin.NET.Core/Job/EnumToDictJob.cs
index 8315ea9bbfe9e5e529bf0d2b1de63990e7ef3056..56b9aa6b4001a37d707d28468d14797527d469cf 100644
--- a/Admin.NET/Admin.NET.Core/Job/EnumToDictJob.cs
+++ b/Admin.NET/Admin.NET.Core/Job/EnumToDictJob.cs
@@ -183,9 +183,9 @@ public class EnumToDictJob : IJob
{
Id = YitIdHelper.NextId(),
DictTypeId = updatedDictType.Id,
- Name = enumData.Describe,
- Value = enumData.Value.ToString(),
- Code = enumData.Name,
+ Name = enumData.Name,
+ Value = enumData.Describe,
+ Code = enumData.Value.ToString(),
Remark = updatedDictType.Remark,
OrderNo = enumData.Value + OrderOffset,
TagType = enumData.Theme != "" ? enumData.Theme : DefaultTagType,