wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

⚡代码生成模板优化、同步功能优化

Browse Source
This commit is contained in:
不做码农 2023-12-07 11:23:10 +08:00
parent 8745df6ece
commit d8504a194e
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt
View File

@ -96,7 +96,7 @@ $if(null != genTable.SubTableName && "" != genTable.SubTableName)
return Context.InsertNav(model).Include(s1 => s1.${genTable.SubTable.ClassName}Nav).ExecuteReturnEntity(); return Context.InsertNav(model).Include(s1 => s1.${genTable.SubTable.ClassName}Nav).ExecuteReturnEntity();
$else $else
$if(replaceDto.useSnowflakeId) $if(replaceDto.useSnowflakeId)
model.${replaceDto.PKName} = Insertable(model).ExecuteReturnSnowflakeId(); Insertable(model).ExecuteReturnSnowflakeId();
return model; return model;
$else $else
return Insertable(model).ExecuteReturnEntity(); return Insertable(model).ExecuteReturnEntity();
@ -111,14 +111,6 @@ $end
/// <returns></returns> /// <returns></returns>
public int Update${replaceDto.ModelTypeName}(${replaceDto.ModelTypeName} model) 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) $if(null != genTable.SubTableName && "" != genTable.SubTableName)
return Context.UpdateNav(model).Include(z1 => z1.${genTable.SubTable.ClassName}Nav).ExecuteCommand() ? 1 : 0; return Context.UpdateNav(model).Include(z1 => z1.${genTable.SubTable.ClassName}Nav).ExecuteCommand() ? 1 : 0;
$else $else

1
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
View File

@ -860,6 +860,7 @@ function row${genTable.SubTable.ClassName}Index({ row, rowIndex }) {
/** ${genTable.SubTable.FunctionName}添加按钮操作 */ /** ${genTable.SubTable.FunctionName}添加按钮操作 */
function handleAdd${genTable.SubTable.ClassName}() { function handleAdd${genTable.SubTable.ClassName}() {
let obj = {}; let obj = {};
//下面的代码自己设置默认值
$foreach(column in genTable.SubTable.Columns) $foreach(column in genTable.SubTable.Columns)
$if(column.IsPK || column.CsharpField == genTable.SubTableFkName) $if(column.IsPK || column.CsharpField == genTable.SubTableFkName)
$elseif(column.IsList == true && "" != column.CsharpField) $elseif(column.IsList == true && "" != column.CsharpField)

4
ZR.ServiceCore/Services/GenTableService.cs
View File

@ -140,8 +140,12 @@ namespace ZR.ServiceCore.Services
column.Sort = prevColumn.Sort; column.Sort = prevColumn.Sort;
column.IsExport = prevColumn.IsExport; column.IsExport = prevColumn.IsExport;
column.IsSort = prevColumn.IsSort; column.IsSort = prevColumn.IsSort;
column.IsQuery = prevColumn.IsQuery;
column.IsList = prevColumn.IsList;
column.HtmlType = prevColumn.HtmlType;
column.Update_time = DateTime.Now; column.Update_time = DateTime.Now;
column.Update_by = genTable.Update_by; column.Update_by = genTable.Update_by;
if (column.IsList) if (column.IsList)
{ {
column.DictType = prevColumn.DictType; column.DictType = prevColumn.DictType;