From 1023a687d53476e0ef37760c748ff87b0001443a 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, 28 Nov 2021 18:50:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=A03.7.0=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.CodeGenerator/CodeGeneratorTool.cs |  2 +-
 ZR.Vue/package.json                   |  5 ++---
 ZR.Vue/src/settings.js                |  2 +-
 ZR.Vue/src/views/index.vue            | 13 +++++++++++++
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs
index 7f33fdc..22555fc 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.GenTable.ParentMenuId.ToString())
+                .Replace("{ParentId}", generateDto.GenTable.ParentMenuId ?? "0")
                 .Replace("{FunctionName}", generateDto.GenTable.FunctionName);
 
             generateDto.GenCodes.Add(new GenCode(8, "sql", fullPath, content));
diff --git a/ZR.Vue/package.json b/ZR.Vue/package.json
index 873c7e6..05b455e 100644
--- a/ZR.Vue/package.json
+++ b/ZR.Vue/package.json
@@ -1,7 +1,6 @@
 {
-  "name": "zr",
-  "version": "1.0.0",
-  "description": "管理系统",
+  "name": "zradmin",
+  "description": "ZrAdmnin.NET管理系统",
   "author": "ZR",
   "scripts": {
     "dev": "vue-cli-service serve",
diff --git a/ZR.Vue/src/settings.js b/ZR.Vue/src/settings.js
index 803cbc5..2b3221c 100644
--- a/ZR.Vue/src/settings.js
+++ b/ZR.Vue/src/settings.js
@@ -2,7 +2,7 @@ module.exports = {
   /**
    * 框架版本号
    */
-  version: '3.5.0',
+  version: '3.7.0',
   title: 'ZrAdmin.NET',
   /**
    * 主题颜色
diff --git a/ZR.Vue/src/views/index.vue b/ZR.Vue/src/views/index.vue
index 8085410..8b3dedc 100644
--- a/ZR.Vue/src/views/index.vue
+++ b/ZR.Vue/src/views/index.vue
@@ -109,6 +109,19 @@
             <span>更新日志</span>
           </div>
           <el-collapse accordion>
+						<el-collapse-item title="v3.7.0-preview - 2021-11-28">
+              <ol>
+                <li>fix 代码生成编辑表信息选择上级菜单bug</li>
+                <li>新增下拉框组件代码生成查询模块</li>
+								<li>优化代码生成模板</li>
+								<li>优化后端分页统一返回json</li>
+								<li>修改代码生成form表单显示</li>
+								<li>新增代码生成单选按钮动态绑定数据</li>
+								<li>代码生成查询新增一键生成、可支持input、select、时间</li>
+								<li>修改代码生成数据库连接字符串</li>
+								<li>优化数据仓储</li>
+              </ol>
+            </el-collapse-item>
             <el-collapse-item title="v3.6.0 - 2021-11-21">
               <ol>
                 <li>新增加系统表导出功能</li>