From 194eb89d31ec12eaed2f8477f47728b122a0d9d4 Mon Sep 17 00:00:00 2001
From: nsnail <taokeu@gmail.com>
Date: Fri, 6 Dec 2024 21:45:40 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=94=A8=20=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=AB=AF=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[skip ci]
---
 .../Extensions/ServiceCollectionExtensions.cs      | 14 +++++++++-----
 src/frontend/admin/src/style/app.scss              |  4 ++++
 src/frontend/admin/src/utils/tool.js               |  6 ------
 src/frontend/admin/src/views/sys/api/index.vue     |  6 +++---
 src/frontend/admin/src/views/sys/cache/index.vue   |  2 +-
 src/frontend/admin/src/views/sys/config/index.vue  |  5 +++--
 src/frontend/admin/src/views/sys/dept/index.vue    |  8 ++++----
 .../admin/src/views/sys/dic/list/index.vue         |  8 ++++----
 .../admin/src/views/sys/doc/list/index.vue         |  2 +-
 src/frontend/admin/src/views/sys/job/all/index.vue |  2 +-
 .../admin/src/views/sys/job/record/index.vue       |  4 ++--
 .../admin/src/views/sys/log/login/index.vue        |  2 +-
 src/frontend/admin/src/views/sys/msg/index.vue     |  8 ++++----
 src/frontend/admin/src/views/sys/role/index.vue    |  8 ++++----
 src/frontend/admin/src/views/sys/user/index.vue    |  1 +
 15 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Extensions/ServiceCollectionExtensions.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Extensions/ServiceCollectionExtensions.cs
index 030b3e43..48713245 100644
--- a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Extensions/ServiceCollectionExtensions.cs
+++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Extensions/ServiceCollectionExtensions.cs
@@ -62,13 +62,17 @@ public static class ServiceCollectionExtensions
     /// <summary>
     ///     添加定时任务
     /// </summary>
-    public static IServiceCollection AddSchedules(this IServiceCollection me, bool force = false)
+    public static IServiceCollection AddSchedules(this IServiceCollection me, bool force = false, Action<ScheduleOptionsBuilder> optionsAction = null)
     {
         return App.WebHostEnvironment.IsProduction() || force
-            ? me.AddSchedule(      //
-                builder => builder //
-                           .AddJob<ScheduledJob>(true,     Triggers.PeriodSeconds(1).SetRunOnStart(true))
-                           .AddJob<FreeScheduledJob>(true, Triggers.PeriodMinutes(1).SetRunOnStart(true)))
+            ? me.AddSchedule( //
+                builder => {
+                    _ = builder //
+                        .AddJob<ScheduledJob>(true,     Triggers.PeriodSeconds(1).SetRunOnStart(true))
+                        .AddJob<FreeScheduledJob>(true, Triggers.PeriodMinutes(1).SetRunOnStart(true));
+
+                    optionsAction?.Invoke(builder);
+                })
             : me;
     }
 }
\ No newline at end of file
diff --git a/src/frontend/admin/src/style/app.scss b/src/frontend/admin/src/style/app.scss
index 05c598a4..d00bcc7d 100644
--- a/src/frontend/admin/src/style/app.scss
+++ b/src/frontend/admin/src/style/app.scss
@@ -529,6 +529,10 @@ textarea {
     gap: 0.5rem;
 }
 
+.gap10 {
+    gap: 1rem;
+}
+
 .items-center {
     align-items: center;
 }
diff --git a/src/frontend/admin/src/utils/tool.js b/src/frontend/admin/src/utils/tool.js
index 74c1a135..aaf16cb5 100644
--- a/src/frontend/admin/src/utils/tool.js
+++ b/src/frontend/admin/src/utils/tool.js
@@ -251,12 +251,6 @@ tool.groupSeparator = function (num) {
 tool.unicodeDecode = function (str) {
     return str.replace(/\\u([0-9a-fA-F]{4})/g, (match, grp) => String.fromCharCode(parseInt(grp, 16)))
 }
-// 高亮关键词
-tool.highLightKeywords = function (str) {
-    return str
-        .replace(new RegExp('(Body)', 'gi'), '<span class=keywords-highlight>$1</span>')
-        .replace(new RegExp('(http://cloud_code_adm_api.*?),', 'gi'), '<span class=keywords-highlight>$1</span>')
-}
 // 属性排序
 tool.sortProperties = function (obj) {
     const sortedKeys = Object.keys(obj).sort()
diff --git a/src/frontend/admin/src/views/sys/api/index.vue b/src/frontend/admin/src/views/sys/api/index.vue
index bda38d84..6ad62149 100644
--- a/src/frontend/admin/src/views/sys/api/index.vue
+++ b/src/frontend/admin/src/views/sys/api/index.vue
@@ -17,8 +17,8 @@
                 row-key="id"
                 show-summary
                 stripe>
-                <el-table-column :label="$t('接口路径')" prop="id" />
-                <el-table-column :label="$t('接口名称')" prop="name" />
+                <el-table-column :label="$t('接口路径')" min-width="400" prop="id" />
+                <el-table-column :label="$t('接口名称')" min-width="200" prop="name" />
                 <na-col-indicator
                     :label="$t('请求方式')"
                     :options="
@@ -30,7 +30,7 @@
                     prop="method"
                     sortable="custom"
                     width="150" />
-                <el-table-column :label="$t('接口描述')" prop="summary" />
+                <el-table-column :label="$t('接口描述')" min-width="200" prop="summary" />
             </sc-table>
         </el-main>
     </el-container>
diff --git a/src/frontend/admin/src/views/sys/cache/index.vue b/src/frontend/admin/src/views/sys/cache/index.vue
index 73b231f9..b594aeb8 100644
--- a/src/frontend/admin/src/views/sys/cache/index.vue
+++ b/src/frontend/admin/src/views/sys/cache/index.vue
@@ -80,7 +80,7 @@
                 pagination-layout="total"
                 stripe>
                 <el-table-column type="selection" />
-                <el-table-column :label="$t('键名')" prop="key" />
+                <el-table-column :label="$t('键名')" min-width="400" prop="key" />
                 <el-table-column :label="$t('数据类型')" align="center" prop="type" width="100" />
                 <el-table-column :label="$t('过期时间')" align="right" prop="expireTime" width="200" />
                 <na-col-operation
diff --git a/src/frontend/admin/src/views/sys/config/index.vue b/src/frontend/admin/src/views/sys/config/index.vue
index f768c009..54fd755e 100644
--- a/src/frontend/admin/src/views/sys/config/index.vue
+++ b/src/frontend/admin/src/views/sys/config/index.vue
@@ -74,7 +74,7 @@
                 row-key="id"
                 stripe>
                 <el-table-column type="selection" />
-                <na-col-id :label="$t('配置编号')" prop="id" width="170" />
+                <na-col-id :label="$t('配置编号')" min-width="170" prop="id" />
                 <el-table-column :label="$t('用户注册')" align="center">
                     <el-table-column :label="$t('默认部门')" align="center" prop="userRegisterDept.name" width="150" />
                     <el-table-column :label="$t('默认角色')" align="center" prop="userRegisterRole.name" width="150" />
@@ -99,7 +99,8 @@
                             type: 'danger',
                         })
                     "
-                    :vue="this" />
+                    :vue="this"
+                    width="150" />
             </sc-table>
         </el-main>
     </el-container>
diff --git a/src/frontend/admin/src/views/sys/dept/index.vue b/src/frontend/admin/src/views/sys/dept/index.vue
index e8dedc63..c7b3b692 100644
--- a/src/frontend/admin/src/views/sys/dept/index.vue
+++ b/src/frontend/admin/src/views/sys/dept/index.vue
@@ -87,9 +87,9 @@
                 stripe>
                 <el-table-column type="selection" />
                 <na-col-id :label="$t('部门编号')" prop="id" sortable="custom" width="170" />
-                <el-table-column :label="$t('部门名称')" prop="name" sortable="custom" />
-                <el-table-column :label="$t('排序')" align="right" prop="sort" sortable="custom" />
-                <el-table-column label="备注" prop="summary" sortable="custom" />
+                <el-table-column :label="$t('部门名称')" min-width="150" prop="name" sortable="custom" />
+                <el-table-column :label="$t('排序')" align="right" prop="sort" sortable="custom" width="100" />
+                <el-table-column label="备注" min-width="100" prop="summary" sortable="custom" />
                 <el-table-column :label="$t('启用')" align="center" prop="enabled" sortable="custom" width="100">
                     <template #default="{ row }">
                         <el-switch v-model="row.enabled" @change="changeSwitch($event, row)"></el-switch>
@@ -106,7 +106,7 @@
                         })
                     "
                     :vue="this"
-                    width="150" />
+                    width="120" />
             </sc-table>
         </el-main>
     </el-container>
diff --git a/src/frontend/admin/src/views/sys/dic/list/index.vue b/src/frontend/admin/src/views/sys/dic/list/index.vue
index fbe14636..def2add1 100644
--- a/src/frontend/admin/src/views/sys/dic/list/index.vue
+++ b/src/frontend/admin/src/views/sys/dic/list/index.vue
@@ -81,9 +81,9 @@
                 stripe>
                 <el-table-column type="selection" width="50" />
                 <na-col-id :label="$t('唯一编码')" prop="id" sortable="custom" width="170" />
-                <el-table-column :label="$t('项名')" prop="key" sortable="custom" />
-                <el-table-column :label="$t('项值')" prop="value" sortable="custom" />
-                <el-table-column :label="$t('备注')" prop="summary" sortable="custom" />
+                <el-table-column :label="$t('项名')" min-width="150" prop="key" sortable="custom" />
+                <el-table-column :label="$t('项值')" min-width="150" prop="value" sortable="custom" />
+                <el-table-column :label="$t('备注')" min-width="150" prop="summary" sortable="custom" />
                 <el-table-column :label="$t('启用')" align="center" prop="enabled" sortable="custom" width="100">
                     <template #default="{ row }">
                         <el-switch v-model="row.enabled" @change="changeSwitch($event, row)"></el-switch>
@@ -100,7 +100,7 @@
                         })
                     "
                     :vue="this"
-                    width="150" />
+                    width="120" />
             </sc-table>
         </el-main>
     </el-container>
diff --git a/src/frontend/admin/src/views/sys/doc/list/index.vue b/src/frontend/admin/src/views/sys/doc/list/index.vue
index a48696ba..a1585d82 100644
--- a/src/frontend/admin/src/views/sys/doc/list/index.vue
+++ b/src/frontend/admin/src/views/sys/doc/list/index.vue
@@ -88,7 +88,7 @@
                 stripe>
                 <el-table-column type="selection" width="50" />
                 <na-col-id :label="$t('唯一编码')" prop="id" sortable="custom" width="170" />
-                <el-table-column :label="$t('文档标题')" prop="title" sortable="custom" />
+                <el-table-column :label="$t('文档标题')" min-width="200" prop="title" sortable="custom" />
                 <na-col-indicator
                     :label="$t('档案可见性')"
                     :options="
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 b3f299e4..cf6b9dce 100644
--- a/src/frontend/admin/src/views/sys/job/all/index.vue
+++ b/src/frontend/admin/src/views/sys/job/all/index.vue
@@ -131,7 +131,7 @@
                 stripe>
                 <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('作业名称')" min-width="150" prop="jobName" show-overflow-tooltip sortable="custom" />
                 <el-table-column :label="$t('执行计划')" align="right" prop="executionCron" sortable="custom" width="150">
                     <template #default="{ row }">
                         <p>{{ row.cronDescription }}</p>
diff --git a/src/frontend/admin/src/views/sys/job/record/index.vue b/src/frontend/admin/src/views/sys/job/record/index.vue
index 4f9058c4..5b88ae0b 100644
--- a/src/frontend/admin/src/views/sys/job/record/index.vue
+++ b/src/frontend/admin/src/views/sys/job/record/index.vue
@@ -115,7 +115,7 @@
                     prop="duration"
                     sortable="custom"
                     width="100" />
-                <el-table-column :label="$t('作业信息')" min-width="150" prop="jobId" show-overflow-tooltip sortable="custom">
+                <el-table-column :label="$t('作业信息')" min-width="200" prop="jobId" show-overflow-tooltip sortable="custom">
                     <template #default="{ row }">
                         <p>
                             <el-link @click="jobClick(row.job)">
@@ -128,7 +128,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column :label="$t('响应体')" min-width="300" prop="responseBody" show-overflow-tooltip sortable="custom" />
-                <na-col-operation :buttons="[naColOperation.buttons[0]]" :vue="this" width="100" />
+                <na-col-operation :buttons="[naColOperation.buttons[0]]" :vue="this" width="50" />
             </sc-table>
         </el-main>
     </el-container>
diff --git a/src/frontend/admin/src/views/sys/log/login/index.vue b/src/frontend/admin/src/views/sys/log/login/index.vue
index c68266fb..fb1d37e1 100644
--- a/src/frontend/admin/src/views/sys/log/login/index.vue
+++ b/src/frontend/admin/src/views/sys/log/login/index.vue
@@ -81,7 +81,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column :label="$t('操作系统')" align="center" prop="os" width="150" />
-                <el-table-column :label="$t('用户代理')" prop="createdUserAgent" show-overflow-tooltip sortable="custom" />
+                <el-table-column :label="$t('用户代理')" min-width="150" prop="createdUserAgent" show-overflow-tooltip sortable="custom" />
                 <na-col-operation
                     :buttons="[
                         {
diff --git a/src/frontend/admin/src/views/sys/msg/index.vue b/src/frontend/admin/src/views/sys/msg/index.vue
index b077921d..c5fac2a2 100644
--- a/src/frontend/admin/src/views/sys/msg/index.vue
+++ b/src/frontend/admin/src/views/sys/msg/index.vue
@@ -72,7 +72,7 @@
                 stripe>
                 <el-table-column type="selection" />
                 <na-col-id :label="$t('消息编号')" prop="id" sortable="custom" width="170" />
-                <na-col-avatar :label="$t('用户名')" prop="createdUserName" />
+                <na-col-avatar :label="$t('用户名')" min-width="100" prop="createdUserName" />
                 <na-col-indicator
                     :label="$t('消息类型')"
                     :options="
@@ -84,8 +84,8 @@
                     prop="msgType"
                     sortable="custom"
                     width="150" />
-                <el-table-column :label="$t('消息主题')" prop="title" show-overflow-tooltip sortable="custom" />
-                <el-table-column :label="$t('消息摘要')" prop="summary" show-overflow-tooltip sortable="custom" />
+                <el-table-column :label="$t('消息主题')" min-width="200" prop="title" show-overflow-tooltip sortable="custom" />
+                <el-table-column :label="$t('消息摘要')" min-width="400" prop="summary" show-overflow-tooltip sortable="custom" />
 
                 <na-col-operation
                     :buttons="
@@ -98,7 +98,7 @@
                         })
                     "
                     :vue="this"
-                    width="150" />
+                    width="120" />
             </sc-table>
         </el-main>
     </el-container>
diff --git a/src/frontend/admin/src/views/sys/role/index.vue b/src/frontend/admin/src/views/sys/role/index.vue
index 5e2ab06a..5ebecd25 100644
--- a/src/frontend/admin/src/views/sys/role/index.vue
+++ b/src/frontend/admin/src/views/sys/role/index.vue
@@ -103,9 +103,9 @@
                 stripe>
                 <el-table-column type="selection" />
                 <na-col-id :label="$t('角色编号')" prop="id" sortable="custom" width="170" />
-                <el-table-column :label="$t('角色名称')" prop="name" sortable="custom" />
-                <el-table-column :label="$t('排序')" align="right" prop="sort" sortable="custom" />
-                <el-table-column :label="$t('无限权限')" align="center" prop="ignorePermissionControl" sortable="custom">
+                <el-table-column :label="$t('角色名称')" min-width="150" prop="name" sortable="custom" />
+                <el-table-column :label="$t('排序')" align="right" prop="sort" sortable="custom" width="100" />
+                <el-table-column :label="$t('无限权限')" align="center" prop="ignorePermissionControl" sortable="custom" width="100">
                     <template #default="{ row }">
                         <el-switch v-model="row.ignorePermissionControl" @change="changeIgnorePermissionControl($event, row)"></el-switch>
                     </template>
@@ -123,7 +123,7 @@
                     width="120">
                 </na-col-indicator>
 
-                <el-table-column :label="$t('显示仪表板')" align="center" prop="displayDashboard" sortable="custom">
+                <el-table-column :label="$t('显示仪表板')" align="center" prop="displayDashboard" sortable="custom" width="120">
                     <template #default="{ row }">
                         <el-switch v-model="row.displayDashboard" @change="changeDisplayDashboard($event, row)"></el-switch>
                     </template>
diff --git a/src/frontend/admin/src/views/sys/user/index.vue b/src/frontend/admin/src/views/sys/user/index.vue
index 3bfe006a..c9431493 100644
--- a/src/frontend/admin/src/views/sys/user/index.vue
+++ b/src/frontend/admin/src/views/sys/user/index.vue
@@ -114,6 +114,7 @@
                     :label="$t('所属角色')"
                     @click="(item) => (this.dialog.roleSave = { row: item, mode: 'view' })"
                     field="name"
+                    min-width="200"
                     prop="roles" />
                 <el-table-column :label="$t('最后登录')" align="right" prop="lastLoginTime" sortable="custom" width="120">
                     <template #default="{ row }">