From 6d4ccf344595e128a445f1cb7596a7a1c28fd4cd Mon Sep 17 00:00:00 2001
From: nsnail <taokeu@gmail.com>
Date: Tue, 9 Jul 2024 14:17:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E2=9C=A8=20cron=E8=A1=A8=E8=BE=BE?=
 =?UTF-8?q?=E5=BC=8F=E7=9A=84=E8=87=AA=E7=84=B6=E8=AF=AD=E8=A8=80=E8=A1=A8?=
 =?UTF-8?q?=E8=BE=BE=20(#156)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: tk <fiyne1a@dingtalk.com>
---
 src/backend/NetAdmin.Domain/Dto/Sys/Job/QueryJobRsp.cs |  9 +++++++++
 src/backend/NetAdmin.Domain/NetAdmin.Domain.csproj     |  4 ++++
 .../NetAdmin.Infrastructure.csproj                     |  3 ---
 src/backend/NetAdmin.Tests/NetAdmin.Tests.csproj       |  4 ++--
 src/frontend/admin/src/components/naColTags/index.vue  |  5 ++++-
 src/frontend/admin/src/directives/time.js              | 10 +++++-----
 src/frontend/admin/src/layout/components/tasks.vue     |  2 +-
 src/frontend/admin/src/views/home/widgets/index.vue    |  4 ++++
 .../src/views/profile/message/components/list.vue      |  2 +-
 src/frontend/admin/src/views/sys/dic/index.vue         |  1 -
 src/frontend/admin/src/views/sys/job/all/index.vue     |  9 +++++++--
 11 files changed, 37 insertions(+), 16 deletions(-)

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;
 /// </summary>
 public record QueryJobRsp : Sys_Job
 {
+    /// <summary>
+    ///     Cron 表达式描述
+    /// </summary>
+    [JsonInclude]
+    public string CronDescription =>
+        ExpressionDescriptor.GetDescription(ExecutionCron, new Options { Locale = "zh-CN" });
+
     /// <inheritdoc cref="Sys_Job.LastStatusCode" />
     [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 @@
         <ProjectReference Include="../NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj"/>
     </ItemGroup>
     <ItemGroup>
+        <PackageReference Include="CronExpressionDescriptor" Version="2.33.0"/>
+        <PackageReference Include="Cronos" Version="0.8.4"/>
         <PackageReference Include="CsvHelper.NS" Version="33.0.2-ns2"/>
+        <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.6"/>
+        <PackageReference Include="Yitter.IdGenerator" Version="1.0.14"/>
     </ItemGroup>
 </Project>
\ 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 @@
     <Import Project="$(SolutionDir)/build/copy.pkg.xml.comment.files.targets"/>
     <Import Project="$(SolutionDir)/build/prebuild.targets"/>
     <ItemGroup>
-        <PackageReference Include="Cronos" Version="0.8.4"/>
         <PackageReference Include="FreeSql.DbContext.NS" Version="3.2.821-ns1"/>
         <PackageReference Include="FreeSql.Provider.Sqlite.NS" Version="3.2.821-ns1"/>
         <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.4"/>
         <PackageReference Include="Furion.Extras.ObjectMapper.Mapster.NS" Version="4.9.4-ns1"/>
         <PackageReference Include="Furion.Pure.NS" Version="4.9.4-ns1"/>
-        <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0-preview.5.24306.11"/>
         <PackageReference Include="Minio" Version="6.0.3"/>
         <PackageReference Include="NSExt" Version="2.2.0"/>
         <PackageReference Include="RedLock.net" Version="2.3.2"/>
         <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0"/>
-        <PackageReference Include="Yitter.IdGenerator" Version="1.0.14"/>
     </ItemGroup>
     <ItemGroup>
         <None Update="*.json">
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 @@
         <ProjectReference Include="../NetAdmin.Host/NetAdmin.Host.csproj"/>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="xunit" Version="2.8.1"/>
+        <PackageReference Include="xunit" Version="2.9.0"/>
         <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-preview.5.24306.11"/>
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
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 @@
         <template #default="{ row }">
             <div class="flex">
                 <template v-for="(item, i) in Array.isArray(row[prop]) ? row[prop] : [row[prop]]" :key="i">
-                    <el-tag v-if="item" @click="$emit('click', item)">
+                    <el-tag
+                        v-if="item"
+                        :type="['success', 'danger', 'info', 'primary', 'warning'][$TOOL.crypto.hashCode(item[field]) % 5]"
+                        @click="$emit('click', item)">
                         {{ item ? item[field] : '' }}
                     </el-tag>
                 </template>
diff --git a/src/frontend/admin/src/directives/time.js b/src/frontend/admin/src/directives/time.js
index 7b84738c..4bc66e5f 100644
--- a/src/frontend/admin/src/directives/time.js
+++ b/src/frontend/admin/src/directives/time.js
@@ -34,7 +34,7 @@ const Time = {
         return date.getFullYear() + '-' + month + '-' + day
     },
     //转换时间
-    getFormateTime: function (timestamp) {
+    getFormatTime: function (timestamp) {
         timestamp = new Date(timestamp)
         const now = this.getUnix()
         const today = this.getTodayUnix()
@@ -48,10 +48,10 @@ const Time = {
             tip = '刚刚'
         } else if (timer < 3600) {
             tip = Math.floor(timer / 60) + '分钟前'
-        } else if (timer >= 3600 && timestamp - today >= 0) {
+        } else if (timer >= 3600 && (timestamp - today >= 0 || Math.floor(timer / 86400) <= 0)) {
             tip = Math.floor(timer / 3600) + '小时前'
         } else if (timer / 86400 <= 31) {
-            tip = Math.ceil(timer / 86400) + '天前'
+            tip = Math.floor(timer / 86400) + '天前'
         } else {
             tip = this.getLastDate(timestamp)
         }
@@ -68,9 +68,9 @@ export default (el, binding) => {
         value = value * 1000
     }
     if (modifiers.tip) {
-        el.innerHTML = Time.getFormateTime(value)
+        el.innerHTML = Time.getFormatTime(value)
         el.__timeout__ = setInterval(() => {
-            el.innerHTML = Time.getFormateTime(value)
+            el.innerHTML = Time.getFormatTime(value)
         }, 60000)
     } else {
         const format = el.getAttribute('format') || undefined
diff --git a/src/frontend/admin/src/layout/components/tasks.vue b/src/frontend/admin/src/layout/components/tasks.vue
index 32c2e2ac..71409f1a 100644
--- a/src/frontend/admin/src/layout/components/tasks.vue
+++ b/src/frontend/admin/src/layout/components/tasks.vue
@@ -17,7 +17,7 @@
                     <div class="jobMain">
                         <div class="title">
                             <h2>{{ job.jobName }}</h2>
-                            <p>{{ $t('上次执行：') }}<span v-time.tip="job.lastExecTime"></span></p>
+                            <p>{{ $t('上次执行：') }}<span v-time.tip="job.lastExecTime" :title="job.lastExecTime"></span></p>
                             <p>
                                 下次执行：<span>{{ job.nextExecTime }}</span>
                             </p>
diff --git a/src/frontend/admin/src/views/home/widgets/index.vue b/src/frontend/admin/src/views/home/widgets/index.vue
index 582f7124..9ae86258 100644
--- a/src/frontend/admin/src/views/home/widgets/index.vue
+++ b/src/frontend/admin/src/views/home/widgets/index.vue
@@ -151,6 +151,10 @@ export default {
         }
     },
     created() {
+        const roleDefaultGrid = this.$GLOBAL.user.roles.filter((x) => x.displayDashboard).sort((x, y) => y.id - x.id)[0].dashboardLayout
+        if (roleDefaultGrid) {
+            this.defaultGrid = JSON.parse(roleDefaultGrid)
+        }
         this.loadGrid()
     },
     mounted() {
diff --git a/src/frontend/admin/src/views/profile/message/components/list.vue b/src/frontend/admin/src/views/profile/message/components/list.vue
index 6e8ed557..7535ffc1 100644
--- a/src/frontend/admin/src/views/profile/message/components/list.vue
+++ b/src/frontend/admin/src/views/profile/message/components/list.vue
@@ -49,7 +49,7 @@
                                     </div>
                                     <div>
                                         <p>{{ msg.sender.userName }}</p>
-                                        <p v-time.tip="msg.createdTime"></p>
+                                        <p v-time.tip="msg.createdTime" :title="msg.createdTime"></p>
                                     </div>
                                 </div>
                             </template>
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">
                         <template #default="{ _, data }">
diff --git a/src/frontend/admin/src/views/sys/job/all/index.vue b/src/frontend/admin/src/views/sys/job/all/index.vue
index 2e683826..ba6454ae 100644
--- a/src/frontend/admin/src/views/sys/job/all/index.vue
+++ b/src/frontend/admin/src/views/sys/job/all/index.vue
@@ -113,7 +113,12 @@
                 <el-table-column type="selection" />
                 <na-col-id :label="$t('作业编号')" prop="id" sortable="custom" width="170" />
                 <el-table-column :label="$t('作业名称')" prop="jobName" show-overflow-tooltip sortable="custom" />
-                <el-table-column :label="$t('执行计划')" align="right" prop="executionCron" sortable="custom" width="150" />
+                <el-table-column :label="$t('执行计划')" align="right" prop="executionCron" sortable="custom" width="150">
+                    <template #default="{ row }">
+                        <p>{{ row.cronDescription }}</p>
+                        <p>{{ row.executionCron }}</p>
+                    </template>
+                </el-table-column>
                 <na-col-indicator
                     :label="$t('作业状态')"
                     :options="
@@ -151,7 +156,7 @@
                     </el-table-column>
                     <el-table-column :label="$t('时间')" align="right" prop="lastExecTime" sortable="custom" width="100">
                         <template #default="{ row }">
-                            <span v-if="row.lastExecTime" v-time.tip="row.lastExecTime"></span>
+                            <span v-if="row.lastExecTime" v-time.tip="row.lastExecTime" :title="row.lastExecTime"></span>
                         </template>
                     </el-table-column>
                     <el-table-column