diff --git a/Dockerfile b/Dockerfile index c232ab15..f3aadf66 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0.4 AS base WORKDIR /app EXPOSE 8080 RUN apt update diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Attributes/IndicatorAttribute.cs b/src/backend/NetAdmin/NetAdmin.Domain/Attributes/EnumDecorationAttribute.cs similarity index 59% rename from src/backend/NetAdmin/NetAdmin.Domain/Attributes/IndicatorAttribute.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Attributes/EnumDecorationAttribute.cs index e3332ea7..43091818 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Attributes/IndicatorAttribute.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Attributes/EnumDecorationAttribute.cs @@ -1,11 +1,11 @@ namespace NetAdmin.Domain.Attributes; /// -/// 标记一个枚举的状态指示 +/// 枚举装饰 /// /// [AttributeUsage(AttributeTargets.Field | AttributeTargets.Enum)] -public sealed class IndicatorAttribute(string indicate, bool pulse) : Attribute +public sealed class EnumDecorationAttribute(string indicate = nameof(Indicates.None), bool pulse = false, int sort = 0) : Attribute { /// /// 状态指示 @@ -16,4 +16,9 @@ public sealed class IndicatorAttribute(string indicate, bool pulse) : Attribute /// 脉动 /// public bool Pulse { get; } = pulse; + + /// + /// 排序值 + /// + public int Sort { get; } = sort; } \ No newline at end of file diff --git a/src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/JobStatues.cs b/src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/JobStatues.cs index bbe63a28..8834371c 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/JobStatues.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/JobStatues.cs @@ -9,7 +9,7 @@ public enum JobStatues /// /// 空闲 /// - [Indicator(nameof(Indicates.Success), false)] + [EnumDecoration(nameof(Indicates.Success), false)] [ResourceDescription(nameof(Ln.空闲))] Idle = 1 @@ -18,7 +18,7 @@ public enum JobStatues /// /// 运行 /// - [Indicator(nameof(Indicates.Warning), true)] + [EnumDecoration(nameof(Indicates.Warning), true)] [ResourceDescription(nameof(Ln.运行))] Running = 2 } \ No newline at end of file diff --git a/src/backend/NetAdmin/NetAdmin.Infrastructure/Enums/Indicates.cs b/src/backend/NetAdmin/NetAdmin.Infrastructure/Enums/Indicates.cs index 0eecef3f..e9fe4e61 100644 --- a/src/backend/NetAdmin/NetAdmin.Infrastructure/Enums/Indicates.cs +++ b/src/backend/NetAdmin/NetAdmin.Infrastructure/Enums/Indicates.cs @@ -38,4 +38,11 @@ public enum Indicates /// 危险 /// Danger = 5 + + , + + /// + /// 无 + /// + None = 6 } \ No newline at end of file diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/ConstantService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/ConstantService.cs index e2d3c0bc..1a84c2e7 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/ConstantService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/ConstantService.cs @@ -35,8 +35,11 @@ public sealed class ConstantService : ServiceBase, IConstantSe return [..ret, z.GetCallingCode().ToInvString()]; } - var indicate = y.Attr(); - return indicate == null ? ret : [..ret, indicate.Indicate.ToLowerInvariant(), indicate.Pulse.ToString().ToLowerInvariant()]; + var decorationAttribute = y.Attr() ?? new EnumDecorationAttribute(); + return [ + ..ret, decorationAttribute.Indicate.ToLowerInvariant(), decorationAttribute.Pulse.ToString().ToLowerInvariant() + , decorationAttribute.Sort.ToInvString() + ]; } static string[] GetHttpStatusCodeDicValue(string name) diff --git a/src/frontend/admin/package.json b/src/frontend/admin/package.json index ce7a253c..8dd1f4df 100644 --- a/src/frontend/admin/package.json +++ b/src/frontend/admin/package.json @@ -26,7 +26,7 @@ "vue-i18n": "11.1.3", "vue-router": "4.5.0", "vue3-ace-editor": "2.2.4", - "vue3-json-viewer": "2.2.2", + "vue3-json-viewer": "2.3.0", "vuedraggable": "4.0.3", "vuex": "4.1.0" }, diff --git a/src/frontend/admin/src/components/naIndicator/index.vue b/src/frontend/admin/src/components/naIndicator/index.vue index 21b36040..62a9ba6f 100644 --- a/src/frontend/admin/src/components/naIndicator/index.vue +++ b/src/frontend/admin/src/components/naIndicator/index.vue @@ -3,7 +3,11 @@
 {{ item.text }}