diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/service_Service.cs.vm b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/service_Service.cs.vm index 62af52a6..552dce4a 100644 --- a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/service_Service.cs.vm +++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/service_Service.cs.vm @@ -333,19 +333,24 @@ if(@column.EffectType == "Upload"){ @:public async Task Upload@(@column.PropertyName)([Required] IFormFile file) @:{ @:var service = App.GetRequiredService(); - @:return await service.UploadFile(new UploadFileInput { File = file }, "upload/@(@column.PropertyName)" ); + @:return await service.UploadFile(new UploadFileInput { File = file}, "upload/@(@column.PropertyName)" ); @:} } } @foreach (var column in Model.TableField){ + if(@column.EffectType == "ApiTreeSelector" && !definedObjects.ContainsKey("@(@column.FkEntityName)Tree")){ - @{definedObjects.Add("@(@column.FkEntityName)Tree", 1);} - @:[ApiDescriptionSettings(Name = "@(LowerFirstLetter(@column.FkEntityName))Tree", Description = "获取@(@column.ColumnComment)列表", Order = 920), HttpGet] - @:[DisplayName("获取@(@column.FkEntityName)Tree")] - @:public async Task @(@column.FkEntityName)Tree() + @:/// + @:/// 获取@(@Model.BusName)树列表 + @:/// + @:/// + @:/// + @:[ApiDescriptionSettings(Name = "GetTreeList", Description = "获取@(@Model.BusName)树列表", Order = 960), HttpPost] + @:[DisplayName("获取@(@Model.BusName)树列表")] + @:public async Task GetTreeList() @:{ - @:return await _@(@Model.LowerClassName)Rep.Context.Queryable<@(@column.FkEntityName)>().Select<@(@column.FkEntityName)Output>().ToTreeAsync(u => u.Children, u => u.@(@column.PidColumn), 0); + @:return await _@(@Model.LowerClassName)Rep.AsQueryable().OrderBy(u => new { u.OrderNo, u.Id }).ToTreeAsync(u => u.Children, u => u.Pid, 0, u => u.Id); @:} } } diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_TreeList.vue.vm b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_TreeList.vue.vm index 1ba2199d..f781c7b9 100644 --- a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_TreeList.vue.vm +++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_TreeList.vue.vm @@ -267,6 +267,7 @@ const userStore = useUserInfo(); @:const dc = userStore.getDictItemByValue; @:const dv = userStore.getDictItemByLabel; @:const dl = userStore.getDictDataByCode; +} // 变量 const state = reactive({