Jelajahi Sumber

修复Index.vue.vm在没有查询条件的时候,前面有空格的情况
修复Service.cs.vm修复在有外键查询的时候,主键没有不明确的情况

轻风2016 2 tahun lalu
induk
melakukan
838d6add87

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

@@ -109,7 +109,11 @@ if (@column.QueryWhether == "Y"){
 } else {
             @:.Select<@(@Model.ClassName)Output>();
 }
-        return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize);
+      @if(@Model.TableField.Any(x=>x.EffectType == "fk")){
+        @:return await query.OrderBuilder(input,"[u].","[@(PKName)]").ToPagedListAsync(input.Page, input.PageSize);
+      }else{
+		@:return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize);
+      }
     }
 
     /// <summary>
@@ -190,7 +194,6 @@ if(@column.EffectType == "fk" && (@column.WhetherAddUpdate == "Y" || column.Quer
     @:/// <summary>
     @:/// 获取@(@column.ColumnComment)列表
     @:/// </summary>
-    @:/// <param name="input"></param>
     @:/// <returns></returns>
     @:[ApiDescriptionSettings(Name = "@(@column.FkEntityName)@(@column.PropertyName)Dropdown"), HttpGet]
     @:public async Task<dynamic> @(@column.FkEntityName)@(@column.PropertyName)Dropdown()

+ 2 - 2
Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm

@@ -83,9 +83,9 @@
             } 
       }
           @<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
-            @<el-form-item>
+            @<el-form-item @(Model.QueryWhetherList.Count > 0?"":"label-width=\"0px\"")>
               @<el-button-group style="display: flex; align-items: center;">
-                @<el-button type="primary"  icon="ele-Search" @@click="handleQuery" v-auth="'@(@Model.LowerClassName):page'"> 查询 </el-button>
+                @<el-button type="primary"  icon="ele-Search" @@click="handleQuery" v-auth="'@(@Model.LowerClassName):page'"> @(Model.QueryWhetherList.Count > 0?"查询":"刷新") </el-button>
                    @if(Model.QueryWhetherList.Count > 0){
                       @:<el-button icon="ele-Refresh" @@click="() => queryParams = {}"> 重置 </el-button>
                         @if(haveLikeCdt){