From fc638a9a49010b1802a32da45400ceb7c8640347 Mon Sep 17 00:00:00 2001 From: zuohuaijun Date: Fri, 5 Jul 2024 01:41:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=98=8E1=E3=80=81=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E9=85=8D=E7=BD=AE=20=202?= =?UTF-8?q?=E3=80=81=E5=8E=BB=E6=8E=89=E5=BC=80=E6=94=BE=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=BF=BD=E7=95=A5=E7=9A=84=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=20=203=E3=80=81=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=BC=96=E7=A0=81=E5=94=AF=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Admin.NET/Admin.NET.Application/Configuration/CodeGen.json | 2 +- Admin.NET/Admin.NET.Core/Entity/SysConfig.cs | 2 +- Admin.NET/Admin.NET.Core/Entity/SysOpenAccess.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Admin.NET/Admin.NET.Application/Configuration/CodeGen.json b/Admin.NET/Admin.NET.Application/Configuration/CodeGen.json index a0cd44f0..275087a8 100644 --- a/Admin.NET/Admin.NET.Application/Configuration/CodeGen.json +++ b/Admin.NET/Admin.NET.Application/Configuration/CodeGen.json @@ -3,7 +3,7 @@ // 代码生成配置项-程序集名称集合 "CodeGen": { - "EntityAssemblyNames": [ "Admin." ], + "EntityAssemblyNames": [ "Admin.NET.Core", "Admin.NET.Application" ], "BaseEntityNames": [ "EntityTenantId", "EntityTenant", "EntityTenantBaseData", "EntityBaseData", "EntityBase", "EntityBaseId" ], "EntityBaseColumn": { "EntityTenantId": [ "Id", "TenantId" ], diff --git a/Admin.NET/Admin.NET.Core/Entity/SysConfig.cs b/Admin.NET/Admin.NET.Core/Entity/SysConfig.cs index d4fb5f17..f1f5fe16 100644 --- a/Admin.NET/Admin.NET.Core/Entity/SysConfig.cs +++ b/Admin.NET/Admin.NET.Core/Entity/SysConfig.cs @@ -12,7 +12,7 @@ namespace Admin.NET.Core; [SugarTable(null, "系统参数配置表")] [SysTable] [SugarIndex("index_{table}_N", nameof(Name), OrderByType.Asc)] -[SugarIndex("index_{table}_C", nameof(Code), OrderByType.Asc)] +[SugarIndex("index_{table}_C", nameof(Code), OrderByType.Asc, IsUnique = true)] public partial class SysConfig : EntityBase { /// diff --git a/Admin.NET/Admin.NET.Core/Entity/SysOpenAccess.cs b/Admin.NET/Admin.NET.Core/Entity/SysOpenAccess.cs index 68185cfb..f96c0ac0 100644 --- a/Admin.NET/Admin.NET.Core/Entity/SysOpenAccess.cs +++ b/Admin.NET/Admin.NET.Core/Entity/SysOpenAccess.cs @@ -51,8 +51,8 @@ public partial class SysOpenAccess : EntityBase /// /// 绑定用户 /// - [Newtonsoft.Json.JsonIgnore] - [System.Text.Json.Serialization.JsonIgnore] + //[Newtonsoft.Json.JsonIgnore] + //[System.Text.Json.Serialization.JsonIgnore] [Navigate(NavigateType.OneToOne, nameof(BindUserId))] public SysUser BindUser { get; set; } } \ No newline at end of file From 19639ccc91625444ef9686d6b8325c4ee381ffb9 Mon Sep 17 00:00:00 2001 From: zuohuaijun Date: Fri, 5 Jul 2024 02:35:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=98=8Evxetable=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Web/src/theme/index.scss | 2 +- Web/src/theme/{vxe.scss => vxeTable.scss} | 28 ++++++++++++++++++----- 2 files changed, 23 insertions(+), 7 deletions(-) rename Web/src/theme/{vxe.scss => vxeTable.scss} (54%) diff --git a/Web/src/theme/index.scss b/Web/src/theme/index.scss index 3a0b5cef..3455c492 100644 --- a/Web/src/theme/index.scss +++ b/Web/src/theme/index.scss @@ -8,4 +8,4 @@ @import './dark.scss'; @import './iconfont/font_2298093_rnp72ifj3ba.scss'; @import './font-awesome/font-awesome.scss'; -@import './vxe.scss'; +@import './vxeTable.scss'; diff --git a/Web/src/theme/vxe.scss b/Web/src/theme/vxeTable.scss similarity index 54% rename from Web/src/theme/vxe.scss rename to Web/src/theme/vxeTable.scss index b0980272..63a3e1f5 100644 --- a/Web/src/theme/vxe.scss +++ b/Web/src/theme/vxeTable.scss @@ -1,6 +1,22 @@ @import 'vxe-table/styles/all.scss'; @import 'vxe-pc-ui/styles/all.scss'; +:root { + --vxe-ui-font-family: var(--el-font-family); + // --vxe-ui-font-color: var(--el-text-color-primary); // 原：#606266; + // --vxe-ui-primary-color: var(--el-color-primary); // 原：#409eff; + // --vxe-ui-primary-lighten-color: var(--el-color-primary); + // --vxe-ui-table-row-height-small: 36px; // 原：40px + // --vxe-ui-table-row-height-mini: 32px; // 原：36px + // --vxe-ui-table-row-line-height: 18px; // 原：22px + // // --vxe-ui-table-header-font-weight: 500; // 原 700 + // --vxe-ui-table-font-color: var(--el-text-color-primary); + // --vxe-ui-table-header-font-color: var(--el-text-color-primary); + // --vxe-ui-table-footer-font-color: var(--el-text-color-primary); + // --vxe-ui-table-cell-padding-left: 8px; // 原：10px + // --vxe-ui-table-cell-padding-right: 8px; // 原：10px +} + .vxe-toolbar { padding: 0 0 6px 0; } @@ -61,9 +77,9 @@ color: unset !important; } -:deep(.xGrid-style .vxe-body--row.warning-row) { - background-color: var(--el-color-warning-light-9); -} -:deep(.xGrid-style .vxe-body--row.success-row) { - background-color: var(--el-color-success-light-9); -} +// :deep(.xGrid-style .vxe-body--row.warning-row) { +// background-color: var(--el-color-warning-light-9); +// } +// :deep(.xGrid-style .vxe-body--row.success-row) { +// background-color: var(--el-color-success-light-9); +// } From 268e0bd072a91a6d9211acb7a121559029afdd15 Mon Sep 17 00:00:00 2001 From: zuohuaijun Date: Fri, 5 Jul 2024 10:31:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=98=8E=E8=B0=83=E6=95=B4=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E9=80=9A=E7=9F=A5=E8=A1=A8=E6=A0=BC=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Web/src/layout/navBars/topBar/userNews.vue | 11 +++++++---- Web/src/views/home/notice/index.vue | 15 +++++++++------ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Web/src/layout/navBars/topBar/userNews.vue b/Web/src/layout/navBars/topBar/userNews.vue index 7d60c17a..4b07bdc8 100644 --- a/Web/src/layout/navBars/topBar/userNews.vue +++ b/Web/src/layout/navBars/topBar/userNews.vue @@ -29,14 +29,16 @@ - + -

+
+
+