😎1、调整前端适配深色模式 2、代码优化

Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -19,7 +19,7 @@
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="BouncyCastle.Cryptography" Version="2.5.0" Aliases="BouncyCastleV2" />
-    <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.17.0" />
+    <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.17.1" />
     <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.6.20" />
     <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.6.20" />
     <PackageReference Include="Furion.Pure" Version="4.9.6.20" />

Admin.NET/Admin.NET.Core/Extension/LogInfoExtension.cs

@@ -3,8 +3,10 @@
 // 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
 //
 // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
-namespace Admin.NET.Core.Extension;
+
-public static class LogInformationExtension
+namespace Admin.NET.Core;
+
+public static class LogInfoExtension
 {
     /// <summary>
     /// 添加自定义日志 自动设置当前请求的Action和Controller名称

Admin.NET/Admin.NET.Core/Extension/RepositoryExtension.cs

@@ -330,7 +330,7 @@ public static class RepositoryExtension
     }
 
     /// <summary>
-    /// 禁用过滤运行  适用于更新和删除
+    /// 禁用过滤运行，适用于更新和删除
     /// </summary>
     /// <param name="repository">repository</param>
     /// <param name="action"></param>
@@ -347,7 +347,7 @@ public static class RepositoryExtension
     }
 
     /// <summary>
-    /// 禁用过滤运行  适用于更新和删除
+    /// 禁用过滤运行，适用于更新和删除
     /// </summary>
     /// <param name="client">db</param>
     /// <param name="action"></param>

Admin.NET/Admin.NET.Core/Logging/DatabaseLoggingWriter.cs

@@ -61,14 +61,14 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter, IDisposable
         var jsonStr = logMsg.Context?.Get("loggingMonitor")?.ToString();
         if (string.IsNullOrWhiteSpace(jsonStr))
         {
-            var title = logMsg.Context.Get("Title")?.ToString() ?? "自定义操作日志";    //从上下文获取 通过LogInformationExtension赋值
+            var title = logMsg.Context.Get("Title")?.ToString() ?? "自定义操作日志";
-            var actionName = logMsg.Context.Get("Action")?.ToString() ?? "";    //从上下文获取 由LogInformationExtension自动赋值
+            var actionName = logMsg.Context.Get("Action")?.ToString() ?? "";
-            var controllerName = logMsg.Context.Get("Controller")?.ToString() ?? "";    //从上下文获取 由LogInformationExtension自动赋值
+            var controllerName = logMsg.Context.Get("Controller")?.ToString() ?? "";
-            var url = logMsg.Context.Get("Url")?.ToString() ?? "";    //从上下文获取 由LogInformationExtension自动赋值
+            var url = logMsg.Context.Get("Url")?.ToString() ?? "";
-            var method = logMsg.Context.Get("Method")?.ToString() ?? "";    //从上下文获取 由LogInformationExtension自动赋值 
+            var method = logMsg.Context.Get("Method")?.ToString() ?? "";
             if (string.IsNullOrWhiteSpace(actionName) && string.IsNullOrWhiteSpace(controllerName))
             {
-                //非LogInformationExtension调用,则从日志内容中获取控制器名称和函数名称
+                // 从日志内容中获取控制器名称和函数名称
                 var (action, controller) = ExtractActionAndController(logMsg.Message);
                 actionName = action;
                 controllerName = controller;

Web/package.json

@@ -2,7 +2,7 @@
 	"name": "admin.net.pro",
 	"type": "module",
 	"version": "2.4.33",
-	"lastBuildTime": "2025.01.12",
+	"lastBuildTime": "2025.01.13",
 	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
 	"author": "zuohuaijun",
 	"license": "MIT",
@@ -74,8 +74,8 @@
 		"vue-router": "^4.5.0",
 		"vue-signature-pad": "^3.0.2",
 		"vue3-tree-org": "^4.2.2",
-		"vxe-pc-ui": "^4.3.70",
+		"vxe-pc-ui": "^4.3.71",
-		"vxe-table": "^4.10.5",
+		"vxe-table": "^4.10.0",
 		"vxe-table-plugin-element": "^4.0.4",
 		"vxe-table-plugin-export-xlsx": "^4.0.7",
 		"xe-utils": "^3.7.0",

Web/src/components/transfer/index.vue

@@ -255,16 +255,16 @@ const allToLeft = () => {
 	max-height: 100%;
 	box-sizing: border-box;
 	position: relative;
-	border: 1px solid #ebeef5;
+	box-shadow: 0 0 0 1px var(--el-border-color, var(--el-border-color)) inset;
 	&__header {
 		width: 100%;
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
 		flex-wrap: nowrap;
-		background: #f5f7fa;
+		// background: #f5f7fa;
 		padding: 3px 6px;
-		border-bottom: 1px solid #ebeef5;
+		box-shadow: 0 0 0 1px var(--el-border-color, var(--el-border-color)) inset;
 	}
 	&__body {
 		height: 400px;

Web/src/theme/element.scss

@@ -89,7 +89,7 @@
 // 默认样式修改
 .el-menu {
 	border-right: none !important;
-	width: 220px;
+	width: auto;
 }
 
 .el-menu-item,

Web/src/views/system/cache/index.vue

@@ -4,7 +4,7 @@
 			<NoticeBar text="系统缓存数据管理，请慎重操作！！！" style="margin: 4px" />
 		</div>
 
-		<splitpanes class="default-theme">
+		<splitpanes>
 			<pane size="20">
 				<el-card shadow="hover" header="缓存列表" v-loading="state.loading" style="height: 100%" body-style="height:100%; overflow:auto">
 					<template #header>

Web/src/views/system/database/component/visualTable.vue

@@ -150,15 +150,19 @@ const onLineClick = (lineObject: RGLine, linkObject: RGLink, $event: RGUserEvent
 		overflow: hidden;
 	}
 }
+::v-deep(.rel-easy-view) {
+	background-color: var(--el-color-white) !important;
+}
+
 .c-data-table {
-	background-color: #ffffff;
+	background-color: var(--el-color-white) !important;
 	border-collapse: collapse;
 	width: 100%;
 }
 .c-data-table td,
 .c-data-table th {
 	border: 1px solid #f39930;
-	color: #333333;
+	color: var(--el-text-color-primary) !important;
 	padding: 5px;
 	padding-left: 20px;
 	padding-right: 20px;
@@ -166,7 +170,7 @@ const onLineClick = (lineObject: RGLine, linkObject: RGLink, $event: RGUserEvent
 .c-data-table td div,
 .c-data-table th div {
 	background-color: var(--el-color-primary-light-3);
-	color: #ffffff;
+	// color: #ffffff;
 	border-radius: 5px;
 }
 </style>

Web/src/views/system/file/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="sys-file-container">
-		<splitpanes class="default-theme">
+		<splitpanes>
 			<pane size="15" style="display: flex">
 				<FileTree ref="fileTreeRef" @node-click="handleNodeChange" />
 			</pane>

Web/src/views/system/formDes/index.vue

@@ -17,5 +17,15 @@ body {
 
 .form-designer {
 	overflow: unset !important;
+	background-color: var(--el-color-white) !important;
 }
+// ::v-deep(.form-widget-container) {
+// 	background-color: var(--el-color-white) !important;
+// }
+// ::v-deep(.field-widget-item) {
+// 	background-color: var(--el-color-white) !important;
+// }
+// ::v-deep(.container-widget-item) {
+// 	background-color: var(--el-color-white) !important;
+// }
 </style>

Web/src/views/system/openAccess/component/helpView.vue

@@ -12,11 +12,11 @@
 				<ul>
 					<li>
 						在需要使用 Signature 身份验证的 Api 中贴上
-						<p><el-tag>[Authorize(AuthenticationSchemes = SignatureAuthenticationDefaults.AuthenticationScheme)]</el-tag></p>
+						<p><el-tag style="border: 1 solid var(--el-border-color)">[Authorize(AuthenticationSchemes = SignatureAuthenticationDefaults.AuthenticationScheme)]</el-tag></p>
 					</li>
 					<li>
 						如果 Api 需要保留 Jwt 方式的身份验证，可贴上
-						<p><el-tag>[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme + "," + SignatureAuthenticationDefaults.AuthenticationScheme)]</el-tag></p>
+						<p><el-tag style="border: 1 solid var(--el-border-color)">[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme + "," + SignatureAuthenticationDefaults.AuthenticationScheme)]</el-tag></p>
 					</li>
 					<li>
 						通过对请求的签名，可以达到以下目的：
@@ -41,7 +41,7 @@
 				<ul>
 					<li>
 						按照如下顺序对请求中的参数进行排序，各个参数通过&进行拼接（中间不含空格）：
-						<p><el-tag>method & url & accessKey & timestamp & nonce</el-tag></p>
+						<p><el-tag style="border: 1 solid var(--el-border-color)">method & url & accessKey & timestamp & nonce</el-tag></p>
 						<ul>
 							<li><el-tag effect="plain">method</el-tag> 需要大写，如：GET</li>
 							<li><el-tag effect="plain">url</el-tag> 去除协议、域名、参数，以 / 开头，如：/api/demo/helloWord</li>

Web/src/views/system/org/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="sys-org-container">
-		<splitpanes class="default-theme">
+		<splitpanes>
 			<pane size="15" style="display: flex">
 				<OrgTree ref="orgTreeRef" @node-click="handleNodeChange" />
 			</pane>

Web/src/views/system/print/component/hiprint/index.vue

@@ -420,7 +420,8 @@ defineExpose({ hiprintTemplate, printDataDemo, setPrintDataDemo, initPaper, mode
 	text-overflow: ellipsis;
 	color: var(--el-color-primary);
 	box-shadow: none !important;
-	// border: 1px dashed var(--el-color-primary);
+	border: 1px solid var(--el-border-color);
+	background-color: var(--el-color-white);
 }
 
 // 默认图片

Web/src/views/system/region/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="sys-region-container">
-		<splitpanes class="default-theme">
+		<splitpanes>
 			<pane size="20" style="display: flex">
 				<RegionTree ref="regionTreeRef" @node-click="handleNodeChange" />
 			</pane>

Web/src/views/system/server/index.vue

@@ -110,10 +110,10 @@
 			<el-col :md="24" :sm="24">
 				<el-card shadow="hover" header="程序集信息" style="margin-top: 5px; --el-card-padding: 10px">
 					<div v-for="d in state.assemblyInfo" :key="d.name" style="display: inline-block; margin: 4px; text-align: left">
-						<el-tag round>
+						<el-tag size="large" round style="border: 1 solid var(--el-border-color)">
 							<div style="display: inline-flex">
 								<div>{{ d.name }}</div>
-								<div style="color: black; font-size: 9px; margin-left: 3px">v{{ d.version }}</div>
+								<div style="color: red; font-size: 9px; margin-left: 3px">v{{ d.version }}</div>
 							</div>
 						</el-tag>
 					</div>
@@ -224,7 +224,7 @@ onDeactivated(() => {
 }
 
 .sysInfo_td {
-	border-bottom: 1px solid #e8e8e8;
+	border-bottom: 1px solid var(--el-border-color);
 	min-width: 100px;
 }
 </style>

Web/src/views/system/stressTest/index.vue

@@ -4,7 +4,7 @@
 			<NoticeBar text="接口压测会占用服务器大量的系统资源（内存、带宽），请慎重操作！！！" style="margin: 4px" />
 		</div>
 
-		<splitpanes class="default-theme overlay-hidden">
+		<splitpanes>
 			<pane size="20" class="vh100">
 				<el-card class="vh80" shadow="hover" header="" v-loading="state.loading">
 					<el-row :gutter="35">
@@ -37,7 +37,7 @@
 							<el-icon v-else size="16" style="margin-right: 3px; display: inline; vertical-align: middle"><ele-Link /></el-icon>
 							{{ node.label }}
 							<span class="node-button" v-if="!node.data.children">
-								<el-button type="warning" plain icon="ele-Position" @click="treeNodeTest(node.data)" />
+								<el-button type="warning" icon="ele-Position" @click="treeNodeTest(node.data)" />
 							</span>
 						</template>
 					</el-tree>

Web/src/views/system/tenant/index.vue

@@ -32,7 +32,7 @@
 			<vxe-grid ref="xGrid" class="xGrid-style" v-bind="options" v-on="gridEvents">
 				<template #toolbar_buttons>
 					<el-button icon="ele-Plus" type="primary" @click="handleAdd" v-auth="'sysTenant/add'"> 新增 </el-button>
-					<el-button type="danger" icon="ele-Refresh" @click="syncTenantDb" plain> 同步所有租户数据库 </el-button>
+					<el-button type="danger" icon="ele-Refresh" @click="syncTenantDb"> 同步所有租户数据库 </el-button>
 				</template>
 				<template #toolbar_tools> </template>
 				<template #empty>

Web/src/views/system/user/component/editUser.vue

@@ -8,7 +8,7 @@
 				</div>
 			</template>
 			<el-tabs v-loading="state.loading" v-model="state.selectedTabName">
-				<el-tab-pane label="基础信息" style="height: 550px; overflow-y: auto; overflow-x: hidden">
+				<el-tab-pane label="基础信息" style="height: 650px; overflow-y: auto; overflow-x: hidden">
 					<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="auto">
 						<el-row :gutter="10">
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">

Web/src/views/system/user/component/userCenter.vue

@@ -144,7 +144,7 @@
 				</div>
 			</template>
 			<div style="border: 1px dashed gray; width: 100%; height: 250px">
-				<VueSignaturePad ref="signaturePadRef" :options="state.signOptions" style="background-color: #fff" />
+				<VueSignaturePad ref="signaturePadRef" :options="state.signOptions" />
 			</div>
 			<div style="margin-top: 10px">
 				<div style="display: inline">画笔粗细：<el-input-number v-model="state.signOptions.minWidth" :min="0.5" :max="2.5" :step="0.1" size="small" /></div>
@@ -397,7 +397,7 @@ defineExpose({ handleChangeSignFile });
 	margin-bottom: 10px;
 	width: 100%;
 	height: 150px;
-	background-color: #fff;
+	// background-color: #fff;
 	text-align: center;
 	vertical-align: middle;
 	border: solid 1px var(--el-border-color);

Web/src/views/system/user/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="sys-user-container">
-		<splitpanes class="default-theme">
+		<splitpanes>
 			<pane size="15" style="display: flex">
 				<OrgTree ref="orgTreeRef" @node-click="handleNodeChange" />
 			</pane>
@@ -162,6 +162,7 @@ const options = useVxeTable<UserOutput>(
 	},
 	// vxeGrid配置参数(此处可覆写任何参数)，参考vxe-table官方文档
 	{
+		// height:'400',
 		// 代理配置
 		proxyConfig: { autoLoad: true, ajax: { query: ({ page, sort }) => handleQueryApi(page, sort) } },
 		// 排序配置