From 1c25b34120d8da18293e6c2df5becb9f1f40ccd6 Mon Sep 17 00:00:00 2001
From: izory <791736813@qq.com>
Date: Mon, 15 Nov 2021 20:54:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=9C=AA=E5=AE=8C=E6=88=90=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Vue/src/views/tool/gen/editTable.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ZR.Vue/src/views/tool/gen/editTable.vue b/ZR.Vue/src/views/tool/gen/editTable.vue
index 6f3930c..81a6f7c 100644
--- a/ZR.Vue/src/views/tool/gen/editTable.vue
+++ b/ZR.Vue/src/views/tool/gen/editTable.vue
@@ -51,7 +51,7 @@
               <el-checkbox v-model="scope.row.isList"></el-checkbox>
             </template>
           </el-table-column>
-          <el-table-column label="查询" min-width="5%">
+          <!-- <el-table-column label="查询" min-width="5%">
             <template slot-scope="scope">
               <el-checkbox v-model="scope.row.isQuery"></el-checkbox>
             </template>
@@ -69,7 +69,7 @@
                 <el-option label="BETWEEN" value="BETWEEN" />
               </el-select>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="显示类型" min-width="12%">
             <template slot-scope="scope">
               <el-select v-model="scope.row.htmlType">

From eb6bd4c1c28d3afaf43bdf38804719ef8c07e599 Mon Sep 17 00:00:00 2001
From: izory <791736813@qq.com>
Date: Mon, 15 Nov 2021 20:54:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=AF=BC=E5=85=A5=E7=BC=96=E8=BE=91=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=95=B0=E6=8D=AE=E5=BD=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.CodeGenerator/CodeGeneratorTool.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs
index 9f547cc..acd00b9 100644
--- a/ZR.CodeGenerator/CodeGeneratorTool.cs
+++ b/ZR.CodeGenerator/CodeGeneratorTool.cs
@@ -482,6 +482,7 @@ namespace ZR.CodeGenerator
                     Create_by = genTable.Create_by,
                     Create_time = DateTime.Now,
                     IsInsert = !column.IsIdentity,//非自增字段都需要插入
+                    IsEdit = true,
                     IsQuery = false,
                     HtmlType = GenConstants.HTML_INPUT
                 };
@@ -509,9 +510,9 @@ namespace ZR.CodeGenerator
                     genTableColumn.HtmlType = GenConstants.HTML_TEXTAREA;
                 }
                 //编辑字段
-                if (GenConstants.COLUMNNAME_NOT_EDIT.Any(f => column.DbColumnName.Contains(f)) && !column.IsIdentity && !column.IsPrimarykey)
+                if (column.IsIdentity || column.IsPrimarykey || GenConstants.COLUMNNAME_NOT_EDIT.Any(f => column.DbColumnName.Contains(f)) )
                 {
-                    genTableColumn.IsEdit = true;
+                    genTableColumn.IsEdit = false;
                 }
                 //列表字段
                 if (!GenConstants.COLUMNNAME_NOT_LIST.Any(f => column.DbColumnName.Contains(f) && !column.IsPrimarykey))