feat：代码生成完善导航查询

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplDto.txt

@@ -5,6 +5,9 @@ using System.ComponentModel.DataAnnotations;
 $if(replaceDto.ShowBtnExport)
 using MiniExcelLibs.Attributes;
 $end
+$if(null != genTable.SubTableName && "" != genTable.SubTableName)
+using ${subTableOptions.ModelsNamespace}.${subTableOptions.SubNamespace};
+$end
 
 namespace ${options.DtosNamespace}
 {
@@ -54,14 +57,14 @@ $if(genTable.TplCategory == "subNav" && genTable.SubTable != null)
 $if(replaceDto.ShowBtnExport)
         [ExcelIgnore]
 $end
-        public ${genTable.SubTable.ClassName} ${genTable.SubTable.ClassName} { get; set; }
+        public ${genTable.SubTable.ClassName} ${genTable.SubTable.ClassName}Nav { get; set; }
 $end
 
 $if(genTable.TplCategory == "subNavMore" && genTable.SubTable != null)
 $if(replaceDto.ShowBtnExport)
         [ExcelIgnore]
 $end
-        public List<${genTable.SubTable.ClassName}> ${genTable.SubTable.ClassName} { get; set; }
+        public List<${genTable.SubTable.ClassName}> ${genTable.SubTable.ClassName}Nav { get; set; }
 $end
     }
 }

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt

@@ -1,6 +1,9 @@
 using System;
 using SqlSugar;
 using System.Collections.Generic;
+$if(genTable.TplCategory.Contains("subNav") && genTable.SubTable != null)
+using ${subTableOptions.ModelsNamespace}.${subTableOptions.SubNamespace};
+$end
 
 namespace ${options.ModelsNamespace}.${options.SubNamespace}
 {
@@ -38,12 +41,12 @@ $if(genTable.TplCategory == "tree")
         public List<${replaceDto.ModelTypeName}> Children { get; set; }
 $end
 $if(genTable.TplCategory == "subNav" && genTable.SubTable != null)
-        [Navigate(NavigateType.Dynamic, null)] //自定义关系映射
-        public ${genTable.SubTable.ClassName} ${genTable.SubTable.ClassName} { get; set; }
+        [Navigate(NavigateType.OneToOne, nameof(${replaceDto.PKName}))] //自定义关系映射
+        public ${genTable.SubTable.ClassName} ${genTable.SubTable.ClassName}Nav { get; set; }
 $end
 $if(genTable.TplCategory == "subNavMore" && genTable.SubTable != null)
-        [Navigate(NavigateType.Dynamic, null)] //自定义关系映射
-        public List<${genTable.SubTable.ClassName}> ${genTable.SubTable.ClassName} { get; set; }
+        [Navigate(NavigateType.OneToMany, nameof(${genTable.SubTable.ClassName}.${genTable.SubTableFkName}), nameof(${replaceDto.PKName}))] //自定义关系映射
+        public List<${genTable.SubTable.ClassName}> ${genTable.SubTable.ClassName}Nav { get; set; }
 $end
     }
 }

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt

@@ -51,7 +51,7 @@ $end
 $end
             var response = Queryable()
 $if(null != genTable.SubTableName && "" != genTable.SubTableName)
-                .Includes(it => it.${genTable.SubTable.ClassName}.MappingField(z => z.${genTable.SubTableFkName}, () => it.${replaceDto.PKName}))
+                .Includes(x => x.${genTable.SubTable.ClassName}Nav) //填充子对象
 $end
 $if(genTable.Options.SortField != "" && genTable.Options.SortField != null)
                 //.OrderBy("${genTable.Options.SortField} ${genTable.Options.SortType}")

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/TreeVue.txt

@@ -102,7 +102,6 @@ $end
       <el-table-column type="selection" width="50" align="center"/>
 $foreach(column in genTable.Columns)
 $set(labelName = "")
-$set(checkboxHtml = "")
 $set(showToolTipHtml = "")
 $set(columnName = column.CsharpFieldFl)
 $if(column.CsharpType == "string" || column.HtmlType == "datetime")

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt

@@ -114,19 +114,37 @@ $end
       @sort-change="sortChange" 
       @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="50" align="center"/>
+$if(null != genTable.SubTableName && "" != genTable.SubTableName && genTable.TplCategory == "subNav")
+      <el-table-column type="expand">
+        <template #default="props">
+          <el-descriptions border>
+$foreach(subColumn in genSubTable.Columns)
+            <el-descriptions-item label="${subColumn.ColumnComment}">{{ props.row.$tool.FirstLowerCase(genTable.SubTable.ClassName)Nav.${subColumn.CsharpFieldFl} }}</el-descriptions-item>
+$end
+          </el-descriptions>
+        </template>
+      </el-table-column>
+$end
+$if(null != genTable.SubTableName && "" != genTable.SubTableName && genTable.TplCategory == "subNavMore")
+      <el-table-column type="expand">
+        <template #default="props">
+          <el-table :data="props.row.$tool.FirstLowerCase(genTable.SubTable.ClassName)Nav">
+$foreach(subColumn in genSubTable.Columns)
+$if(subColumn.IsList == true)
+            <el-table-column prop="${subColumn.CsharpFieldFl}" label="${subColumn.ColumnComment}" align="center"/>
+$end
+$end
+        </el-table>
+        </template>
+      </el-table-column>
+$end
 $foreach(column in genTable.Columns)
-$set(labelName = "")
-$set(checkboxHtml = "")
+$set(labelName = column.ColumnComment)
 $set(showToolTipHtml = "")
 $set(columnName = column.CsharpFieldFl)
 $if(column.CsharpType == "string" || column.HtmlType == "datetime")
 $set(showToolTipHtml = " :show-overflow-tooltip=\"true\"")
 $end
-$if(column.ColumnComment != "")
-$set(labelName = column.ColumnComment)
-$else
-$set(labelName = column.CsharpFieldFl)
-$end
 $if(column.IsList == true)
 $if(column.HtmlType == "customInput" && column.IsPk == false)
       <el-table-column prop="${columnName}" label="${labelName}" width="90" sortable align="center" v-if="columns.showColumn('${columnName}')">
@@ -192,14 +210,9 @@ $end
       <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
         <el-row :gutter="20">
 $foreach(column in genTable.Columns)
-$set(labelName = "")
 $set(columnName = column.CsharpFieldFl)
 $set(value = "item.dictValue")
-$if(column.ColumnComment != "")
 $set(labelName = column.ColumnComment)
-$else
-$set(labelName = column.CsharpFieldFl)
-$end
 $if(column.CsharpType == "int" || column.CsharpType == "long")
     $set(value = "parseInt(item.dictValue)")
 $end