Просмотр исходного кода

BUG:
1、editDialog 中重复声明了dl引用
2、Service 中排序有错

yzp 2 лет назад
Родитель
Сommit
7afd87f8ba

+ 5 - 9
Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm

@@ -32,7 +32,7 @@ public class @(@Model.ClassName)Service : IDynamicApiController, ITransient
     [ApiDescriptionSettings(Name = "Page")]
     public async Task<SqlSugarPagedList<@(@Model.ClassName)Output>> Page(@(@Model.ClassName)Input input)
     {
-        var query= _rep.AsQueryable()
+        var query = _rep.AsQueryable()
 @{string conditionFlag = "";}
 @if (haveLikeCdt) {
             @:.WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u =>
@@ -71,7 +71,9 @@ if (@column.QueryWhether == "Y"){
             @:.LeftJoin<@(@column.FkEntityName)>((@(@joinTableName)) => u.@(@column.PropertyName) == @(@column.PropertyName.ToLower()).@(@column.ValueColumn) )
         }
     }
-            @:.Select((@(@joinTableName))=> new @(@Model.ClassName)Output{
+            @:.OrderBy(u => u.CreateTime)
+            @:.Select((@(@joinTableName)) => new @(@Model.ClassName)Output
+            @:{
 @foreach (var column in Model.TableField){
                 if(@column.EffectType == "fk"){   
                 @:@(@column.PropertyName) = u.@(@column.PropertyName), 
@@ -85,7 +87,7 @@ if (@column.QueryWhether == "Y"){
                 @:@(@column.PropertyName) = u.@(@column.PropertyName),
                 }
 }
-            @:})
+            @:});
 @foreach (var column in Model.TableField){
     if(@column.EffectType == "fk"){   
  
@@ -96,7 +98,6 @@ if (@column.QueryWhether == "Y"){
 } else {
             @:.Select<@(@Model.ClassName)Output>()
 }
-;
 @foreach (var column in Model.TableField){
 if (@column.QueryWhether == "Y"){
     if(@column.NetType?.TrimEnd('?') == "DateTime" && @column.QueryType == "~"){
@@ -113,11 +114,6 @@ if (@column.QueryWhether == "Y"){
     }
 }
 }
-        @if(Model.IsJoinTable){
-        @:query = query.OrderBuilder(input, "", "u.CreateTime");
-        }else{
-        @:query = query.OrderBuilder(input, "", "CreateTime");
-        }
         return await query.ToPagedListAsync(input.Page, input.PageSize);
     }
 

+ 0 - 1
Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/editDialog.vue.vm

@@ -175,7 +175,6 @@
 	}
 @if(@Model.TableField.Any(x=>x.EffectType == "Upload")){
     @:import { Plus } from "@@element-plus/icons-vue";
-	@:import { getDictDataList as dl } from '/@@/utils/dict-utils';
     @:import { UploadRequestOptions } from "element-plus";
     @:import {@string.Join(",",Model.TableField.Where(x=>x.EffectType == "Upload").Select(x=>"upload"+x.PropertyName).ToList())} from '/@@/api/main/@(@Model.LowerClassName)';
 }