生成SQL语句优化、去除暂未实现功能

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

@@ -1,12 +1,13 @@
 -- 菜单
 INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time, update_by, update_time, remark) 
-VALUES ('{functionName}', 0, 1, '{ModelTypeName}', '{ModuleName}/{ViewsFileName}/{ViewsFileName}', 0, 0, 'M', '0', '0', '', '{Permission}', '', GETDATE(), '', NULL, '{ModelTypeDesc}');
+VALUES ('{FunctionName}', 0, 1, '/{ModuleName}/{ModelTypeName}', '{ModuleName}/{ViewsFileName}/index', 0, 0, 'C', '0', '0', '', '{Permission}:list', '', GETDATE(), '', NULL, '{ModelTypeDesc}');
 
 -- 按钮父菜单id
 declare @menuId int = @@identity
 
+
 INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time, update_by, update_time, remark) 
-VALUES ('查询', @menuId, 0, '#', NULL, 0, 0, 'F', '0', '0', '{Permission}:list}', '', '', GETDATE(), '', NULL, NULL);
+VALUES ('查询', @menuId, 1, '#', NULL, 0, 0, 'F', '0', '0', '{Permission}:query', '', '', GETDATE(), '', NULL, '');
 
 INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time, update_by, update_time, remark) 
 VALUES ('新增', @menuId, 1, '#', NULL, 0, 0, 'F', '0', '0', '{Permission}:add', '', '', GETDATE(), '', NULL, NULL);
@@ -15,4 +16,4 @@ INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isC
 VALUES ('删除', @menuId, 2, '#', NULL, 0, 0, 'F', '0', '0', '{Permission}:delete', '', '', GETDATE(), '', NULL, NULL);
 
 INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time, update_by, update_time, remark) 
-VALUES ('修改', @menuId, 3, '#', NULL, 0, 0, 'F', '0', '0', '{Permission}:update', '', '', GETDATE(), '', NULL, NULL);
+VALUES ('修改', @menuId, 3, '#', NULL, 0, 0, 'F', '0', '0', '{Permission}:update', '', '', GETDATE(), '', NULL, NULL);

ZR.CodeGenerator/CodeGeneratorTool.cs

@@ -396,7 +396,10 @@ namespace ZR.CodeGenerator
             var content = ReadTemplate("SqlTemplate.txt")
                 .Replace("{ModelTypeName}", replaceDto.ModelTypeName)
                 .Replace("{Permission}", replaceDto.Permission)
-                .Replace("{ModelTypeDesc}", replaceDto.TableDesc);
+                .Replace("{ModelTypeDesc}", replaceDto.TableDesc)
+                .Replace("{ModuleName}", generateDto.GenTable.ModuleName)
+                .Replace("{ViewsFileName}", replaceDto.ViewsFileName)
+                .Replace("{FunctionName}", generateDto.GenTable.FunctionName);
 
             return Tuple.Create(fullPath, content);
         }

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

@@ -6,29 +6,29 @@
           <span slot="label">生成模板</span>
           <el-select v-model="info.tplCategory" @change="tplSelectChange">
             <el-option label="单表（增删改查）" value="crud" />
-            <el-option label="树表（增删改查）" value="tree" />
-            <el-option label="主子表（增删改查）" value="sub" />
+            <!-- <el-option label="树表（增删改查）" value="tree" />
+            <el-option label="主子表（增删改查）" value="sub" /> -->
           </el-select>
         </el-form-item>
       </el-col>
-      <!--
+      
       <el-col :span="12">
         <el-form-item prop="baseNameSpace">
           <span slot="label">
             生成命名空间前缀
-            <el-tooltip content="比如 ZR.Model，目前不支持更换" placement="top">
+            <el-tooltip content="比如 ZR." placement="top">
               <i class="el-icon-question"></i>
             </el-tooltip>
           </span>
           <el-input v-model="info.baseNameSpace" />
         </el-form-item>
-      </el-col> -->
+      </el-col>
 
       <el-col :span="12">
         <el-form-item prop="moduleName">
           <span slot="label">
             生成模块名
-            <el-tooltip content="可理解为子系统名，例如 system" placement="top">
+            <el-tooltip content="可理解为子系统名，例如 system、user、tool" placement="top">
               <i class="el-icon-question"></i>
             </el-tooltip>
           </span>
@@ -72,7 +72,7 @@
         </el-form-item>
       </el-col> -->
 
-      <!-- <el-col :span="12">
+      <el-col :span="12">
         <el-form-item prop="genType">
           <span slot="label">
             生成代码方式
@@ -81,9 +81,9 @@
             </el-tooltip>
           </span>
           <el-radio v-model="info.genType" label="0">zip压缩包</el-radio>
-          <el-radio v-model="info.genType" label="1">自定义路径</el-radio>
+          <!-- <el-radio v-model="info.genType" label="1">自定义路径</el-radio> -->
         </el-form-item>
-      </el-col> -->
+      </el-col>
 
       <el-col :span="24" v-if="info.genType == '1'">
         <el-form-item prop="genPath">
@@ -209,9 +209,6 @@ export default {
         tplCategory: [
           { required: true, message: "请选择生成模板", trigger: "blur" },
         ],
-        packageName: [
-          { required: true, message: "请输入生成包路径", trigger: "blur" },
-        ],
         moduleName: [
           { required: true, message: "请输入生成模块名", trigger: "blur" },
         ],