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 /// 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;