diff --git a/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs b/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs
index a398197..c014eaa 100644
--- a/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs
+++ b/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs
@@ -231,7 +231,7 @@ namespace ZR.Admin.WebApi.Controllers
}
///
- /// 生成代码
+ /// 生成代码(下载方式)
///
/// 数据传输对象
///
@@ -249,12 +249,7 @@ namespace ZR.Admin.WebApi.Controllers
var genTableInfo = GenTableService.GetGenTableInfo(dto.TableId);
genTableInfo.Columns = GenTableColumnService.GenTableColumns(dto.TableId);
- //附加参数,key,value格式
- if (!string.IsNullOrEmpty(genTableInfo.Options))
- {
- Dictionary options = JsonConvert.DeserializeObject>(genTableInfo.Options);
- dto.ParentMenuId = (long)options.GetValueOrDefault("parentMenuId", 0);
- }
+
dto.GenTable = genTableInfo;
//生成代码
CodeGeneratorTool.Generate(genTableInfo, dto);
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/MySqlTemplate.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/MySqlTemplate.txt
index 0b7d4f1..917216d 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/MySqlTemplate.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/MySqlTemplate.txt
@@ -1,6 +1,6 @@
-- 菜单
INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by, create_time, remark)
-VALUES ('{FunctionName}', 0, 1, '{ModuleName}/{ModelTypeName}', '{ModuleName}/{ViewsFileName}/index', 0, 0, 'C', '0', '0', '{Permission}:list', 'icon1', '', sysdate(), '{FunctionName}菜单');
+VALUES ('{FunctionName}', {ParentId}, 1, '{ModuleName}/{ModelTypeName}', '{ModuleName}/{ViewsFileName}/index', 0, 0, 'C', '0', '0', '{Permission}:list', 'icon1', '', sysdate(), '{FunctionName}菜单');
-- 按钮父菜单id
SELECT @menuId := LAST_INSERT_ID();
diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs
index 4baec86..7f33fdc 100644
--- a/ZR.CodeGenerator/CodeGeneratorTool.cs
+++ b/ZR.CodeGenerator/CodeGeneratorTool.cs
@@ -408,7 +408,7 @@ namespace ZR.CodeGenerator
.Replace("{Permission}", replaceDto.Permission)
.Replace("{ModuleName}", generateDto.GenTable.ModuleName)
.Replace("{ViewsFileName}", replaceDto.ViewsFileName)
- .Replace("{ParentId}", generateDto.ParentMenuId.ToString())
+ .Replace("{ParentId}", generateDto.GenTable.ParentMenuId.ToString())
.Replace("{FunctionName}", generateDto.GenTable.FunctionName);
generateDto.GenCodes.Add(new GenCode(8, "sql", fullPath, content));
diff --git a/ZR.CodeGenerator/Model/GenerateDto.cs b/ZR.CodeGenerator/Model/GenerateDto.cs
index e81020f..9ce7d07 100644
--- a/ZR.CodeGenerator/Model/GenerateDto.cs
+++ b/ZR.CodeGenerator/Model/GenerateDto.cs
@@ -45,10 +45,6 @@ namespace ZR.CodeGenerator.Model
/// 代码生成压缩包名称
///
public string ZipFileName { get; set; }
- ///
- /// 父级菜单id
- ///
- public long ParentMenuId { get; set; }
#endregion
}
diff --git a/ZR.CodeGenerator/Model/ReplaceDto.cs b/ZR.CodeGenerator/Model/ReplaceDto.cs
index ca3ea07..caff6f1 100644
--- a/ZR.CodeGenerator/Model/ReplaceDto.cs
+++ b/ZR.CodeGenerator/Model/ReplaceDto.cs
@@ -72,7 +72,7 @@ namespace ZR.CodeGenerator.Model
///
/// 查询条件
///
- public string QueryCondition { get; set; }
+ public string QueryCondition { get; set; } = "";
///
/// 查询属性
///
diff --git a/ZR.Model/System/Generate/GenTable.cs b/ZR.Model/System/Generate/GenTable.cs
index 0d9790b6..32a567c 100644
--- a/ZR.Model/System/Generate/GenTable.cs
+++ b/ZR.Model/System/Generate/GenTable.cs
@@ -69,8 +69,12 @@ namespace ZR.Model.System.Generate
///
public string Options { get; set; }
+ #region 表额外字段
/** 表列信息 */
[SqlSugar.SugarColumn(IsIgnore = true)]
public List Columns { get; set; }
+ [SqlSugar.SugarColumn(IsIgnore = true)]
+ public string ParentMenuId { get; set; }
+ #endregion
}
}
diff --git a/ZR.Service/System/GenTableService.cs b/ZR.Service/System/GenTableService.cs
index 9664f5f..8526be5 100644
--- a/ZR.Service/System/GenTableService.cs
+++ b/ZR.Service/System/GenTableService.cs
@@ -1,5 +1,6 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
+using Newtonsoft.Json;
using SqlSugar;
using System;
using System.Collections.Generic;
@@ -53,7 +54,24 @@ namespace ZR.Service.System
///
public GenTable GetGenTableInfo(long tableId)
{
- return GenTableRepository.GetId(tableId);
+ var info = GenTableRepository.GetId(tableId);
+ SetTableFromOptions(info);
+
+ return info;
+ }
+
+ ///
+ /// 设置代码生成其他参数
+ ///
+ ///
+ private void SetTableFromOptions(GenTable genTable)
+ {
+ //附加参数,key,value格式
+ if (!string.IsNullOrEmpty(genTable?.Options))
+ {
+ Dictionary options = JsonConvert.DeserializeObject>(genTable.Options);
+ genTable.ParentMenuId = Convert.ToString(options.GetValueOrDefault("parentMenuId"));
+ }
}
///
diff --git a/ZR.Vue/src/views/tool/gen/index.vue b/ZR.Vue/src/views/tool/gen/index.vue
index 391fbfd..e310d97 100644
--- a/ZR.Vue/src/views/tool/gen/index.vue
+++ b/ZR.Vue/src/views/tool/gen/index.vue
@@ -170,7 +170,6 @@ export default {
if (res.code === 200) {
this.preview.open = true;
this.preview.data = res.data;
- console.log(res);
}
});
},