diff --git a/Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs b/Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs index 3c2d7a79..5179a008 100644 --- a/Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs +++ b/Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs @@ -277,7 +277,7 @@ public class SysAuthService : IDynamicApiController, ITransient // 获取水印文字(若系统水印为空则全局为空) var watermarkText = await _sysConfigService.GetConfigValue(ConfigConst.SysWebWatermark); if (!string.IsNullOrWhiteSpace(watermarkText)) - watermarkText += $"-{user.RealName}"; // $"-{user.RealName}-{_httpContextAccessor.HttpContext.GetRemoteIp()}-{DateTime.UtcNow}"; + watermarkText += $"-{user.RealName}"; // $"-{user.RealName}-{_httpContextAccessor.HttpContext.GetRemoteIpAddressToIPv4(true)}-{DateTime.UtcNow}"; return new LoginUserOutput { diff --git a/Web/src/views/system/ldap/index.vue b/Web/src/views/system/ldap/index.vue index e1618e91..08b0d689 100644 --- a/Web/src/views/system/ldap/index.vue +++ b/Web/src/views/system/ldap/index.vue @@ -111,7 +111,7 @@ const state = reactive({ }, localPageParam: { pageSize: 50 as number, - defaultSort: { field: 'orderNo', order: 'asc', descStr: 'desc' }, + defaultSort: { field: 'id', order: 'asc', descStr: 'desc' }, }, visible: false, title: '', diff --git a/Web/src/views/system/region/index.vue b/Web/src/views/system/region/index.vue index 82ca43fa..6cf86321 100644 --- a/Web/src/views/system/region/index.vue +++ b/Web/src/views/system/region/index.vue @@ -119,6 +119,8 @@ const options = useVxeTable( }, // vxeGrid配置参数(此处可覆写任何参数),参考vxe-table官方文档 { + stripe: false, + checkboxConfig: { range: false }, // 代理配置 proxyConfig: { autoLoad: true, ajax: { query: ({ page, sort }) => handleQueryApi(page, sort) } }, // 排序配置