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 /// /// 添加定时任务 /// - public static IServiceCollection AddSchedules(this IServiceCollection me, bool force = false) + public static IServiceCollection AddSchedules(this IServiceCollection me, bool force = false, Action optionsAction = null) { return App.WebHostEnvironment.IsProduction() || force - ? me.AddSchedule( // - builder => builder // - .AddJob(true, Triggers.PeriodSeconds(1).SetRunOnStart(true)) - .AddJob(true, Triggers.PeriodMinutes(1).SetRunOnStart(true))) + ? me.AddSchedule( // + builder => { + _ = builder // + .AddJob(true, Triggers.PeriodSeconds(1).SetRunOnStart(true)) + .AddJob(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'), '$1') - .replace(new RegExp('(http://cloud_code_adm_api.*?),', 'gi'), '$1') -} // 属性排序 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> - - + + - + 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> - + - + @@ -99,7 +99,8 @@ type: 'danger', }) " - :vue="this" /> + :vue="this" + width="150" /> 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> - - - + + +