Merge branch 'next' of https://gitee.com/zuohuaijun/Admin.NET into next

Admin.NET/Admin.NET.Core/Service/Dict/SysDictDataService.cs

@@ -1,4 +1,4 @@
-// 麻省理工学院许可证
+// 麻省理工学院许可证
 //
 // 版权所有 (c) 2021-2023 zuohuaijun，大名科技（天津）有限公司  联系电话/微信：18020030720  QQ：515096995
 //
@@ -37,7 +37,7 @@ public class SysDictDataService : IDynamicApiController, ITransient
             .Where(u => u.DictTypeId == input.DictTypeId)
             .WhereIF(code, u => u.Code.Contains(input.Code))
             .WhereIF(value, u => u.Value.Contains(input.Value))
-            .OrderBy(u => u.OrderNo)
+            .OrderBy(u => new { u.OrderNo, u.Code })
             .ToPagedListAsync(input.Page, input.PageSize);
     }
 
@@ -141,7 +141,7 @@ public class SysDictDataService : IDynamicApiController, ITransient
     {
         return await _sysDictDataRep.AsQueryable()
             .Where(u => u.DictTypeId == dictTypeId)
-            .OrderBy(u => u.OrderNo).ToListAsync();
+            .OrderBy(u => new { u.OrderNo, u.Code }).ToListAsync();
     }
 
     /// <summary>

Admin.NET/Admin.NET.Core/Service/Dict/SysDictTypeService.cs

@@ -38,7 +38,7 @@ public class SysDictTypeService : IDynamicApiController, ITransient
         return await _sysDictTypeRep.AsQueryable()
             .WhereIF(code, u => u.Code.Contains(input.Code))
             .WhereIF(name, u => u.Name.Contains(input.Name))
-            .OrderBy(u => u.OrderNo)
+            .OrderBy(u => new { u.OrderNo, u.Code })
             .ToPagedListAsync(input.Page, input.PageSize);
     }
 
@@ -49,7 +49,7 @@ public class SysDictTypeService : IDynamicApiController, ITransient
     [DisplayName("获取字典类型列表")]
     public async Task<List<SysDictType>> GetList()
     {
-        return await _sysDictTypeRep.AsQueryable().OrderBy(u => u.OrderNo).ToListAsync();
+        return await _sysDictTypeRep.AsQueryable().OrderBy(u => new { u.OrderNo, u.Code }).ToListAsync();
     }
 
     /// <summary>

Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/editDialog.vue.vm

@@ -142,7 +142,12 @@
 		</el-dialog>
 	</div>
 </template>
-
+<style scoped>
+/deep/ .el-select,
+/deep/ .el-input-number {
+  width: 100%;
+}
+</style>
 <script lang="ts" setup>
 	import { ref,onMounted } from "vue";
 	import { ElMessage } from "element-plus";