Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'net5.0'

Browse Source
This commit is contained in:
不做码农
2022-05-09 20:20:21 +08:00
parent 7e9f9301ff f6ded6ce36
commit f741d7a7bf
6 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/CurdForm.txt
View File

@@ -53,13 +53,13 @@ $elseif(column.HtmlType == "datetime")
$elseif(column.HtmlType == "imageUpload")
<el-col :lg="24">
<el-form-item label="${labelName}" prop="${columnName}">
<UploadImage v-model="form.${columnName}" column="${columnName}" @success="handleUploadSuccess" />
<UploadImage v-model="form.${columnName}" column="${columnName}" @input="handleUploadSuccess" />
</el-form-item>
</el-col>
$elseif(column.HtmlType == "fileUpload")
<el-col :lg="24">
<el-form-item label="${labelName}" prop="${columnName}">
<UploadFile v-model="form.${columnName}" column="${columnName}" @success="handleUploadSuccess" />
<UploadFile v-model="form.${columnName}" column="${columnName}" @input="handleUploadSuccess" />
</el-form-item>
</el-col>
$elseif(column.HtmlType == "radio")

2
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt
View File

@@ -9,7 +9,7 @@ using ${options.ModelsNamespace}.Models;
using ${options.IServicsNamespace}.${options.SubNamespace}.I${options.SubNamespace}Service;
using ${options.ApiControllerNamespace}.Extensions;
using ${options.ApiControllerNamespace}.Filters;
using ${options.BaseNamespace}.Common;
using ${options.BaseNamespace}Common;
namespace ${options.ApiControllerNamespace}.Controllers
{

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

@@ -53,7 +53,7 @@ $end
$end
var response = _${replaceDto.ModelTypeName}Repository
.Queryable()
$if(genTable.SubTableName != "" && genTable.SubTableName != null)
$if(null != genTable.SubTableName && "" != genTable.SubTableName)
.Includes(it => it.Sub.MappingField(z => z.${genTable.SubTableFkName}, () => it.${replaceDto.PKName}))
$end
$if(genTable.SortField != "" && genTable.SortField != null)