diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Job/QueryJobRsp.cs b/src/backend/NetAdmin.Domain/Dto/Sys/Job/QueryJobRsp.cs index 6846012d..b8026dd6 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Job/QueryJobRsp.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/Job/QueryJobRsp.cs @@ -1,6 +1,8 @@ +using CronExpressionDescriptor; using NetAdmin.Domain.Dto.Sys.User; using NetAdmin.Domain.Enums.Sys; using HttpMethods = NetAdmin.Domain.Enums.HttpMethods; +using Options = CronExpressionDescriptor.Options; namespace NetAdmin.Domain.Dto.Sys.Job; @@ -9,6 +11,13 @@ namespace NetAdmin.Domain.Dto.Sys.Job; /// public record QueryJobRsp : Sys_Job { + /// + /// Cron 表达式描述 + /// + [JsonInclude] + public string CronDescription => + ExpressionDescriptor.GetDescription(ExecutionCron, new Options { Locale = "zh-CN" }); + /// [JsonInclude] public new virtual string LastStatusCode => diff --git a/src/backend/NetAdmin.Domain/NetAdmin.Domain.csproj b/src/backend/NetAdmin.Domain/NetAdmin.Domain.csproj index 65d44c2e..3908de65 100644 --- a/src/backend/NetAdmin.Domain/NetAdmin.Domain.csproj +++ b/src/backend/NetAdmin.Domain/NetAdmin.Domain.csproj @@ -10,6 +10,10 @@ + + + + \ No newline at end of file diff --git a/src/backend/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj b/src/backend/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj index 0c7da1c9..91d5392e 100644 --- a/src/backend/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj +++ b/src/backend/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj @@ -6,18 +6,15 @@ - - - diff --git a/src/backend/NetAdmin.Tests/NetAdmin.Tests.csproj b/src/backend/NetAdmin.Tests/NetAdmin.Tests.csproj index 806d5908..11dde67b 100644 --- a/src/backend/NetAdmin.Tests/NetAdmin.Tests.csproj +++ b/src/backend/NetAdmin.Tests/NetAdmin.Tests.csproj @@ -3,9 +3,9 @@ - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/frontend/admin/src/components/naColTags/index.vue b/src/frontend/admin/src/components/naColTags/index.vue index 67949db4..684875cd 100644 --- a/src/frontend/admin/src/components/naColTags/index.vue +++ b/src/frontend/admin/src/components/naColTags/index.vue @@ -3,7 +3,10 @@ diff --git a/src/frontend/admin/src/views/sys/dic/index.vue b/src/frontend/admin/src/views/sys/dic/index.vue index c82f09cd..9635014e 100644 --- a/src/frontend/admin/src/views/sys/dic/index.vue +++ b/src/frontend/admin/src/views/sys/dic/index.vue @@ -15,7 +15,6 @@ label: 'name', }" @node-click="click" - default-expand-all node-key="id" ref="dic">