From d483b4e58ef113325329cc832bf1f87a52809e5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sun, 12 Mar 2023 19:31:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/CodeGenTemplate/TplTreeVue.txt        |  4 ++--
 .../wwwroot/CodeGenTemplate/TplVue.txt            |  6 +++---
 .../wwwroot/CodeGenTemplate/TplVueSelect.txt      |  4 ++--
 .../wwwroot/CodeGenTemplate/v3/Vue.txt            |  2 +-
 ZR.CodeGenerator/CodeGeneratorTool.cs             | 15 +++++----------
 5 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt
index 4173e90..b942c65 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt
@@ -40,7 +40,7 @@ $end
     <el-table v-if="refreshTable" :data="dataList" v-loading="loading" ref="table" border highlight-current-row @selection-change="handleSelectionChange"
       :default-expand-all="isExpandAll" row-key="${tool.FirstLowerCase(genTable.Options.TreeCode)}" :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
       <el-table-column type="selection" width="50" align="center"/>
-${VueViewListContent}
+${replaceDto.VueViewListHtml}
       <el-table-column label="操作" align="center" width="140">
         <template slot-scope="scope">
           <el-button size="mini" v-hasPermi="['${replaceDto.PermissionPrefix}:edit']" type="success" icon="el-icon-edit" title="编辑" 
@@ -56,7 +56,7 @@ ${VueViewListContent}
     <el-dialog :title="title" :lock-scroll="false" :visible.sync="open" >
       <el-form ref="form" :model="form" :rules="rules" :label-width="formLabelWidth">
         <el-row :gutter="20">
-        ${VueViewFormContent}
+        ${replaceDto.VueViewFormHtml}
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
index dae2504..3cf2364 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
@@ -11,7 +11,7 @@
     <!-- :model属性用于表单验证使用 比如下面的el-form-item 的 prop属性用于对表单值进行验证操作 -->
     <el-form :model="queryParams" size="small" label-position="right" inline ref="queryForm" :label-width="labelWidth" v-show="showSearch" 
       @submit.native.prevent>
-      ${vueQueryFormHtml}
+      ${replaceDto.VueQueryFormHtml}
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -45,7 +45,7 @@ $end
     <!-- 数据区域 -->
     <el-table :data="dataList" v-loading="loading" ref="table" border highlight-current-row @sort-change="sortChange" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="50" align="center"/>
-${VueViewListContent}
+${replaceDto.VueViewListHtml}
       <el-table-column label="操作" align="center" width="140">
         <template slot-scope="scope">
 $if(replaceDto.ShowBtnEdit)
@@ -65,7 +65,7 @@ $end
     <el-dialog :title="title" :lock-scroll="false" :visible.sync="open" >
       <el-form ref="form" :model="form" :rules="rules" :label-width="formLabelWidth">
         <el-row :gutter="20">
-        ${VueViewFormContent}
+        ${replaceDto.VueViewFormHtml}
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt
index 2c075e0..c48f706 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt
@@ -11,7 +11,7 @@
     <!-- :model属性用于表单验证使用 比如下面的el-form-item 的 prop属性用于对表单值进行验证操作 -->
     <el-form :model="queryParams" size="small" label-position="right" inline ref="queryForm" :label-width="labelWidth" v-show="showSearch" 
       @submit.native.prevent>
-      ${vueQueryFormHtml}
+      ${replaceDto.VueQueryFormHtml}
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -28,7 +28,7 @@
     <!-- 数据区域 -->
     <el-table :data="dataList" v-loading="loading" ref="table" border highlight-current-row @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="50" align="center"/>
-${VueViewListContent}
+${replaceDto.VueViewListHtml}
       <el-table-column label="操作" align="center" width="140">
         <template slot-scope="scope">
           <el-button size="mini" type="success" icon="el-icon-view" title="查看" 
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
index 55c241b..1db9a4d 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
@@ -128,7 +128,7 @@ $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">
+          <el-table :data="props.row.$tool.FirstLowerCase(genTable.SubTable.ClassName)Nav" header-row-class-name="text-navy">
 $foreach(subColumn in genSubTable.Columns)
 $if(subColumn.IsList == true)
             <el-table-column prop="${subColumn.CsharpFieldFl}" label="${subColumn.ColumnComment}" align="center"/>
diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs
index dc1c4e2..126a0ef 100644
--- a/ZR.CodeGenerator/CodeGeneratorTool.cs
+++ b/ZR.CodeGenerator/CodeGeneratorTool.cs
@@ -70,10 +70,6 @@ namespace ZR.CodeGenerator
             }
             else
             {
-                replaceDto.VueViewListHtml = GenerateVueTableList();
-                replaceDto.VueQueryFormHtml = GenerateVueQueryForm();
-                replaceDto.VueViewFormHtml = GenerateCurdForm();
-
                 GenerateVueViews(replaceDto, dto);
             }
             if (dto.GenTable.Options.GenerateRepo == 1)
@@ -180,15 +176,14 @@ namespace ZR.CodeGenerator
                 "select" => "TplVueSelect.txt",
                 _ => "TplVue.txt",
             };
-            var tpl = JnHelper.ReadTemplate(CodeTemplateDir, fileName);
-            tpl.Set("vueQueryFormHtml", replaceDto.VueQueryFormHtml);
-            tpl.Set("VueViewFormContent", replaceDto.VueViewFormHtml);//添加、修改表单
-            tpl.Set("VueViewListContent", replaceDto.VueViewListHtml);//查询 table列
+            replaceDto.VueViewListHtml = GenerateVueTableList();
+            replaceDto.VueQueryFormHtml = GenerateVueQueryForm();
+            replaceDto.VueViewFormHtml = GenerateCurdForm();
 
-            var result = tpl.Render();
+            var tpl = JnHelper.ReadTemplate(CodeTemplateDir, fileName);
             var fullPath = Path.Combine(generateDto.VueParentPath, "src", "views", generateDto.GenTable.ModuleName.FirstLowerCase(), $"{generateDto.GenTable.BusinessName.FirstUpperCase()}.vue");
 
-            generateDto.GenCodes.Add(new GenCode(6, "index.vue", fullPath, result));
+            generateDto.GenCodes.Add(new GenCode(6, "index.vue", fullPath, tpl.Render()));
         }
 
         /// <summary>