From d8504a194ebb64b49b85bbbe9c14c890c6a5e68a 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: Thu, 7 Dec 2023 11:23:10 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=BC=98=E5=8C=96=E3=80=81=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt | 10 +---------
 ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt     |  1 +
 ZR.ServiceCore/Services/GenTableService.cs             |  4 ++++
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt
index 4471574..b46cba5 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt
@@ -96,7 +96,7 @@ $if(null != genTable.SubTableName && "" != genTable.SubTableName)
             return Context.InsertNav(model).Include(s1 => s1.${genTable.SubTable.ClassName}Nav).ExecuteReturnEntity();
 $else
 $if(replaceDto.useSnowflakeId)
-            model.${replaceDto.PKName} = Insertable(model).ExecuteReturnSnowflakeId();
+            Insertable(model).ExecuteReturnSnowflakeId();
             return model;
 $else
             return Insertable(model).ExecuteReturnEntity();
@@ -111,14 +111,6 @@ $end
         /// <returns></returns>
         public int Update${replaceDto.ModelTypeName}(${replaceDto.ModelTypeName} model)
         {
-            //return Update(w => w.${replaceDto.PKName} == model.${replaceDto.PKName}, it => new ${replaceDto.ModelTypeName}()
-            //{
-$foreach(item in genTable.Columns)
-$if((item.IsEdit))
-            //    $item.CsharpField = model.$item.CsharpField,
-$end
-${end}
-            //});
 $if(null != genTable.SubTableName && "" != genTable.SubTableName)
             return Context.UpdateNav(model).Include(z1 => z1.${genTable.SubTable.ClassName}Nav).ExecuteCommand() ? 1 : 0;
 $else
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
index 369e06a..2257bdd 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
@@ -860,6 +860,7 @@ function row${genTable.SubTable.ClassName}Index({ row, rowIndex }) {
 /** ${genTable.SubTable.FunctionName}添加按钮操作 */
 function handleAdd${genTable.SubTable.ClassName}() {
   let obj = {};
+  //下面的代码自己设置默认值
 $foreach(column in genTable.SubTable.Columns)
 $if(column.IsPK || column.CsharpField == genTable.SubTableFkName)
 $elseif(column.IsList == true && "" != column.CsharpField)
diff --git a/ZR.ServiceCore/Services/GenTableService.cs b/ZR.ServiceCore/Services/GenTableService.cs
index 7d31777..40df692 100644
--- a/ZR.ServiceCore/Services/GenTableService.cs
+++ b/ZR.ServiceCore/Services/GenTableService.cs
@@ -140,8 +140,12 @@ namespace ZR.ServiceCore.Services
                     column.Sort = prevColumn.Sort;
                     column.IsExport = prevColumn.IsExport;
                     column.IsSort = prevColumn.IsSort;
+                    column.IsQuery = prevColumn.IsQuery;
+                    column.IsList = prevColumn.IsList;
+                    column.HtmlType = prevColumn.HtmlType;
                     column.Update_time = DateTime.Now;
                     column.Update_by = genTable.Update_by;
+
                     if (column.IsList)
                     {
                         column.DictType = prevColumn.DictType;