浏览代码

😁调整代码生成支持排序字段相关代码及升级依赖

zuohuaijun 3 年之前
父节点
当前提交
2683756e46

+ 6 - 6
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -19,15 +19,15 @@
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="FluentEmail.Smtp" Version="3.0.2" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.8.40" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.8.40" />
-    <PackageReference Include="Furion.Pure" Version="4.8.8.40" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.8.41" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.8.41" />
+    <PackageReference Include="Furion.Pure" Version="4.8.8.41" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
-    <PackageReference Include="Lazy.Captcha.Core" Version="2.0.4" />
+    <PackageReference Include="Lazy.Captcha.Core" Version="2.0.5" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.7.4.5" />
     <PackageReference Include="Magicodes.IE.Pdf" Version="2.7.4.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.20" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.0.20" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.21" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.0.21" />
     <PackageReference Include="NEST" Version="7.17.5" />
     <PackageReference Include="NewLife.Redis" Version="5.5.2023.803" />
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.9" />

+ 2 - 2
Admin.NET/Admin.NET.Core/Entity/SysCodeGenConfig.cs

@@ -167,10 +167,10 @@ public class SysCodeGenConfig : EntityBase
     [SugarColumn(ColumnDescription = "父级字段", Length = 128)]
     [MaxLength(128)]
     public string? PidColumn { get; set; }
-    
+
     /// <summary>
     /// 排序
     /// </summary>
-    [SugarColumn(ColumnDescription = "排序",DefaultValue = "100")]
+    [SugarColumn(ColumnDescription = "排序")]
     public int OrderNo { get; set; } = 100;
 }

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenConfigService.cs

@@ -38,7 +38,7 @@ public class SysCodeGenConfigService : IDynamicApiController, ITransient
             {
                 u.NetType = (u.EffectType == "EnumSelector" ? u.DictTypeCode : u.NetType);
             })
-            .OrderBy(u=>u.OrderNo)
+            .OrderBy(u => u.OrderNo)
             .ToListAsync();
     }
 

+ 1 - 1
Web/src/views/system/codeGen/component/genConfigDialog.vue

@@ -60,7 +60,7 @@
 				</el-table-column>
 				<el-table-column prop="orderNo" label="排序" width="70" show-overflow-tooltip>
 					<template #default="scope">
-						<el-input v-model="scope.row.orderNo" autocomplete="off" type="number"  />
+						<el-input v-model="scope.row.orderNo" autocomplete="off" type="number" />
 					</template>
 				</el-table-column>
 			</el-table>