fix 代码生成bug、新增加演示图

ZR.CodeGenerator/CodeGenerateTemplate.cs

@@ -194,7 +194,7 @@ namespace ZR.CodeGenerator
             if (dbFieldInfo.HtmlType == GenConstants.HTML_DATETIME)
             {
                 sb.AppendLine("      <el-form-item label=\"时间\">");
-                sb.AppendLine("        <el-date-picker v-model=\"dateRange\" size=\"small\" value-format=\"yyyy-MM-dd\" type=\"daterange\" range-separator=\"-\" start-placeholder=\"开始日期\" end-placeholder=\"结束日期\"></el-date-picker>");
+                sb.AppendLine("        <el-date-picker v-model=\"timeRange\" size=\"small\" value-format=\"yyyy-MM-dd\" type=\"daterange\" range-separator=\"-\" start-placeholder=\"开始日期\" end-placeholder=\"结束日期\"></el-date-picker>");
                 sb.AppendLine("      </el-form-item>");
             }
             else

ZR.CodeGenerator/CodeGeneratorTool.cs

@@ -201,7 +201,7 @@ namespace ZR.CodeGenerator
                 .Replace("{Author}", replaceDto.Author)
                 .Replace("{DateTime}", replaceDto.AddTime);
 
-            //generateDto.GenCodes.Add(new GenCode(2, "数据传输实体类", fullPath, content));
+            generateDto.GenCodes.Add(new GenCode(2, "数据传输实体类", fullPath, content));
         }
         #endregion
 
@@ -255,7 +255,7 @@ namespace ZR.CodeGenerator
                 .Replace("{Author}", replaceDto.Author)
                 .Replace("{DateTime}", replaceDto.AddTime);
 
-            //generateDto.GenCodes.Add(new GenCode(4, "接口层", fullPath, content));
+            generateDto.GenCodes.Add(new GenCode(4, "接口层", fullPath, content));
         }
 
         /// <summary>

ZR.Vue/src/api/gendemo.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 /**
-   * 代码生成测试表分页查询
+   * 代码生成测试分页查询
    * @param {查询条件} data
    */
 export function listGendemo(query) {
@@ -13,7 +13,7 @@ export function listGendemo(query) {
 }
 
 /**
-   * 新增代码生成测试表
+   * 新增代码生成测试
    * @param data
    */
 export function addGendemo(data) {
@@ -25,7 +25,7 @@ export function addGendemo(data) {
 }
 
 /**
-   * 修改代码生成测试表
+   * 修改代码生成测试
    * @param data
    */
 export function updateGendemo(data) {
@@ -37,8 +37,8 @@ export function updateGendemo(data) {
 }
 
 /**
-   * 获取代码生成测试表详情
-   * @param {Id} 代码生成测试表Id
+   * 获取代码生成测试详情
+   * @param {Id} {ModelTypeDesc}Id
    */
 export function getGendemo(id) {
   return request({

ZR.Vue/src/views/tool/gen/index.vue

@@ -19,7 +19,7 @@
         <el-button type="danger" :disabled="multiple" plain icon="el-icon-delete" @click="handleDelete" size="mini" v-hasPermi="['tool:gen:delete']">删除</el-button>
       </el-col>
     </el-row>
-    <el-table ref="gridtable" v-loading="tableloading" :data="tableData" border @selection-change="handleSelectionChange" highlight-current-row height="500px">
+    <el-table ref="gridtable" v-loading="tableloading" :data="tableData" border @selection-change="handleSelectionChange" highlight-current-row height="480px">
       <el-table-column type="selection" align="center" width="55"></el-table-column>
       <el-table-column label="序号" type="index" width="50" align="center">
         <template slot-scope="scope">
@@ -45,7 +45,7 @@
     <!-- 预览界面 -->
     <el-dialog :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh" append-to-body>
       <el-tabs v-model="preview.activeName">
-        <el-tab-pane v-for="(item, key) in preview.data" :label="item.title" :name="item.type.toString()" :key="key">
+        <el-tab-pane v-for="(item, key) in preview.data" :label="item.title" :name="key.toString()" :key="key">
           <pre v-html="highlightedCode(item.content)">
           </pre>
         </el-tab-pane>
@@ -115,7 +115,7 @@ export default {
         open: false,
         title: "代码预览",
         data: {},
-        activeName: "1",
+        activeName: "0",
       },
       showGenerate: false,
       checkedCodeGenerateForm: [1, 2, 3, 4, 5, 6, 7, 8],
@@ -199,10 +199,10 @@ export default {
           var seachdata = {
             tableId: this.currentSelected.tableId,
             tableName: this.currentSelected.name,
-            genFiles: this.checkedCodeGenerateForm,
+            genCodeFiles: this.checkedCodeGenerateForm,
             coverd: this.coverd,
             dbType: this.dbType,
-            queryColumn: this.checkedQueryColumn,
+            // queryColumn: this.checkedQueryColumn,
           };
           console.log(JSON.stringify(seachdata));
 

ZRAdmin.xml

@@ -27,44 +27,47 @@
             <param name="data"></param>
             <returns></returns>
         </member>
-        <member name="T:ZR.Admin.WebApi.Controllers.UserInfoController">
+        <member name="T:ZR.Admin.WebApi.Controllers.GendemoController">
              <summary>
-            代码自动生成
+             代码生成测试Controller
+            
+             @author ruirui
+             @date 2021-09-24
              </summary>
         </member>
-        <member name="F:ZR.Admin.WebApi.Controllers.UserInfoController._UserInfoService">
+        <member name="F:ZR.Admin.WebApi.Controllers.GendemoController._GendemoService">
             <summary>
-            用户信息接口
+            代码生成测试接口
             </summary>
         </member>
-        <member name="M:ZR.Admin.WebApi.Controllers.UserInfoController.QueryUserInfo(ZR.Model.Dto.UserInfoQueryDto)">
+        <member name="M:ZR.Admin.WebApi.Controllers.GendemoController.QueryGendemo(ZR.Model.Dto.GendemoQueryDto)">
             <summary>
-            查询用户信息列表
+            查询代码生成测试列表
             </summary>
             <returns></returns>
         </member>
-        <member name="M:ZR.Admin.WebApi.Controllers.UserInfoController.GetUserInfo(System.Int32)">
+        <member name="M:ZR.Admin.WebApi.Controllers.GendemoController.GetGendemo(System.Int32)">
             <summary>
-            查询用户信息详情
+            查询代码生成测试详情
             </summary>
-            <param name="Luid"></param>
+            <param name="Id"></param>
             <returns></returns>
         </member>
-        <member name="M:ZR.Admin.WebApi.Controllers.UserInfoController.AddUserInfo(ZR.Model.Dto.UserInfoDto)">
+        <member name="M:ZR.Admin.WebApi.Controllers.GendemoController.AddGendemo(ZR.Model.Dto.GendemoDto)">
             <summary>
-            添加用户信息
+            添加代码生成测试
             </summary>
             <returns></returns>
         </member>
-        <member name="M:ZR.Admin.WebApi.Controllers.UserInfoController.UpdateUserInfo(ZR.Model.Dto.UserInfoDto)">
+        <member name="M:ZR.Admin.WebApi.Controllers.GendemoController.UpdateGendemo(ZR.Model.Dto.GendemoDto)">
             <summary>
-            更新用户信息
+            更新代码生成测试
             </summary>
             <returns></returns>
         </member>
-        <member name="M:ZR.Admin.WebApi.Controllers.UserInfoController.DeleteUserInfo(System.String)">
+        <member name="M:ZR.Admin.WebApi.Controllers.GendemoController.DeleteGendemo(System.String)">
             <summary>
-            删除用户信息
+            删除代码生成测试
             </summary>
             <returns></returns>
         </member>