From be4f0a2a9034564e7ab3246f681a0c48bde25c09 Mon Sep 17 00:00:00 2001 From: Po <448443959@qq.com> Date: Tue, 22 Oct 2024 02:23:00 +0000 Subject: [PATCH 1/4] =?UTF-8?q?Ruoyi=E5=BA=95=E9=83=A8=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=A0=8F=E5=A4=AA=E9=9D=A0=E5=B7=A6=E4=BA=86,=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Po <448443959@qq.com> --- Yi.RuoYi.Vue3/src/assets/styles/index.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Yi.RuoYi.Vue3/src/assets/styles/index.scss b/Yi.RuoYi.Vue3/src/assets/styles/index.scss index 29dd2b9e..37d403eb 100644 --- a/Yi.RuoYi.Vue3/src/assets/styles/index.scss +++ b/Yi.RuoYi.Vue3/src/assets/styles/index.scss @@ -133,6 +133,11 @@ aside { .pagination-container { margin-top: 30px; + + .el-pagination{ + right:20px; + position: absolute; + } } .text-center { From a4001c21b1aca48ff122f7d14f1c09c9f5174052 Mon Sep 17 00:00:00 2001 From: hao <1308173842@qq.com> Date: Fri, 25 Oct 2024 09:36:04 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dtos/Post/PostUpdateInputVo.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Post/PostUpdateInputVo.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Post/PostUpdateInputVo.cs index 0fd1154a..9c497a98 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Post/PostUpdateInputVo.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Post/PostUpdateInputVo.cs @@ -3,6 +3,7 @@ namespace Yi.Framework.Rbac.Application.Contracts.Dtos.Post public class PostUpdateInputVo { public bool? State { get; set; } + public int OrderNum { get; set; } public string PostCode { get; set; } public string PostName { get; set; } public string? Remark { get; set; } From 77d64796e02bbf935f31b0502a07c8c1a3085781 Mon Sep 17 00:00:00 2001 From: hao <1308173842@qq.com> Date: Fri, 25 Oct 2024 09:36:56 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Yi.Framework.Rbac.Application/Services/System/PostService.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/PostService.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/PostService.cs index 3cf0fe9c..1975ed9d 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/PostService.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/PostService.cs @@ -30,6 +30,7 @@ namespace Yi.Framework.Rbac.Application.Services.System var entities = await _repository._DbQueryable.WhereIF(!string.IsNullOrEmpty(input.PostName), x => x.PostName.Contains(input.PostName!)) .WhereIF(input.State is not null, x => x.State == input.State) + .OrderByDescending(x => x.OrderNum) .ToPageListAsync(input.SkipCount, input.MaxResultCount, total); return new PagedResultDto(total, await MapToGetListOutputDtosAsync(entities)); } From b44db2093817c74bfc2ab3ac8b1effa0e0c58259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=86=E5=91=860518?= Date: Fri, 25 Oct 2024 14:04:39 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8E=92=E5=BA=8F=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Yi.RuoYi.Vue3/src/views/system/dict/data.vue | 264 ++++++++++++++++--- 1 file changed, 230 insertions(+), 34 deletions(-) diff --git a/Yi.RuoYi.Vue3/src/views/system/dict/data.vue b/Yi.RuoYi.Vue3/src/views/system/dict/data.vue index 6bf1d72b..ec513e78 100644 --- a/Yi.RuoYi.Vue3/src/views/system/dict/data.vue +++ b/Yi.RuoYi.Vue3/src/views/system/dict/data.vue @@ -1,38 +1,234 @@