Ver Fonte

BUG:
1、代码生成保存配置时,选择“树型控件”明前端没有提交FkEntityName的值,导到生成的文件有问题。
优化:
1、原来窗体的labelWidth是100px,5个中文字符就会换行,目前加大labelWidth:100=>130,窗体:700=>800

yzp há 2 anos atrás
pai
commit
20216bcb42

+ 4 - 1
Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/Output.cs.vm

@@ -1,4 +1,4 @@
-namespace @Model.NameSpace;
+namespace @Model.NameSpace;
 
     /// <summary>
     /// @(@Model.BusName)输出参数
@@ -31,6 +31,8 @@ if(column.EffectType == "fk")
 
 @foreach (var column in Model.TableField){
 if (@column.EffectType == "ApiTreeSelect"){
+    @:// 使用实际实体@(@column.FkTableName),所以这里就删了
+    @:/*
     @:[SugarTable("@(@column.FkTableName)")]
     @:public class @(@column.FkEntityName)TreeOutput: EntityBaseId
     @:{
@@ -44,5 +46,6 @@ if (@column.EffectType == "ApiTreeSelect"){
         @:[SugarColumn(IsIgnore = true)]
         @:public List<@(@column.FkEntityName)TreeOutput> Children { get; set; }
     @:}
+    @:*/
 }
 }

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

@@ -199,7 +199,7 @@ if(@column.EffectType == "ApiTreeSelect"){
     @:[HttpGet("/@(@Model.LowerClassName)/@(@column.FkEntityName)Tree")]
     @:public async Task<dynamic> @(@column.FkEntityName)Tree()
     @:{
-        @:return await _rep.Context.Queryable<@(@column.FkEntityName)TreeOutput>().ToTreeAsync(u => u.Children, u => u.@(@column.PidColumn), 0);
+        @:return await _rep.Context.Queryable<@(@column.FkEntityName)>().ToTreeAsync(u => u.Children, u => u.@(@column.PidColumn), 0);
     @:}
 }
 }

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

@@ -1,7 +1,7 @@
 <template>
 	<div class="@(@Model.LowerClassName)-container">
-		<el-dialog v-model="isShowDialog" :title="props.title" :width="700" draggable="">
-			<el-form :model="ruleForm" ref="ruleFormRef" size="default" label-width="100px" :rules="rules">
+		<el-dialog v-model="isShowDialog" :title="props.title" :width="800" draggable="">
+			<el-form :model="ruleForm" ref="ruleFormRef" size="default" label-width="130px" :rules="rules">
 				<el-row :gutter="35">
 					@foreach (var column in Model.TableField){
 					if(@column.ColumnKey == "True"){