From b736e56ea7db253e7c206726d2c64f75f517b8c7 Mon Sep 17 00:00:00 2001 From: izory <599854767@qq.com> Date: Fri, 24 Sep 2021 08:27:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90SQL=E8=AF=AD=E5=8F=A5?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=81=E5=8E=BB=E9=99=A4=E6=9A=82=E6=9C=AA?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wwwroot/CodeGenTemplate/SqlTemplate.txt | 7 ++++--- ZR.CodeGenerator/CodeGeneratorTool.cs | 5 ++++- ZR.Vue/src/views/tool/gen/genInfoForm.vue | 21 ++++++++----------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/SqlTemplate.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/SqlTemplate.txt index a82aea1..f6e1aff 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/SqlTemplate.txt +++ b/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); \ No newline at end of file +VALUES ('修改', @menuId, 3, '#', NULL, 0, 0, 'F', '0', '0', '{Permission}:update', '', '', GETDATE(), '', NULL, NULL); diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs index d02e553..d2c6d99 100644 --- a/ZR.CodeGenerator/CodeGeneratorTool.cs +++ b/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); } diff --git a/ZR.Vue/src/views/tool/gen/genInfoForm.vue b/ZR.Vue/src/views/tool/gen/genInfoForm.vue index 0a0edb7..f191087 100644 --- a/ZR.Vue/src/views/tool/gen/genInfoForm.vue +++ b/ZR.Vue/src/views/tool/gen/genInfoForm.vue @@ -6,29 +6,29 @@ 生成模板 - - + - + 生成模块名 - + @@ -72,7 +72,7 @@ --> - - --> + @@ -209,9 +209,6 @@ export default { tplCategory: [ { required: true, message: "请选择生成模板", trigger: "blur" }, ], - packageName: [ - { required: true, message: "请输入生成包路径", trigger: "blur" }, - ], moduleName: [ { required: true, message: "请输入生成模块名", trigger: "blur" }, ],