fix 代码生成细节优化,自定义验证器未加载修复
This commit is contained in:
parent
8c669310fe
commit
d22b5e2fb7
1
main.go
1
main.go
@ -8,6 +8,7 @@ import (
|
|||||||
_ "github.com/tiger1103/gfast/v3/internal/app/boot"
|
_ "github.com/tiger1103/gfast/v3/internal/app/boot"
|
||||||
_ "github.com/tiger1103/gfast/v3/internal/app/system/packed"
|
_ "github.com/tiger1103/gfast/v3/internal/app/system/packed"
|
||||||
"github.com/tiger1103/gfast/v3/internal/cmd"
|
"github.com/tiger1103/gfast/v3/internal/cmd"
|
||||||
|
_ "github.com/tiger1103/gfast/v3/library/libValidate"
|
||||||
_ "github.com/tiger1103/gfast/v3/task"
|
_ "github.com/tiger1103/gfast/v3/task"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -262,7 +262,7 @@ func (c *{{$structName}}Controller) Export(ctx context.Context, req *{{.table.Mo
|
|||||||
{{else if eq $column.HtmlType "deptSelectorSingle"}}
|
{{else if eq $column.HtmlType "deptSelectorSingle"}}
|
||||||
//{{$column.ColumnComment}}
|
//{{$column.ColumnComment}}
|
||||||
{{$column.HtmlField}}Str := ""
|
{{$column.HtmlField}}Str := ""
|
||||||
{{$column.HtmlField}}Obj := systemService.SysDept().GetByDept(ctx, v.DepartId)
|
{{$column.HtmlField}}Obj := systemService.SysDept().GetByDept(ctx, v.{{$column.GoField}})
|
||||||
if {{$column.HtmlField}}Obj != nil {
|
if {{$column.HtmlField}}Obj != nil {
|
||||||
{{$column.HtmlField}}Str = {{$column.HtmlField}}Obj.DeptName
|
{{$column.HtmlField}}Str = {{$column.HtmlField}}Obj.DeptName
|
||||||
}
|
}
|
||||||
|
@ -19,6 +19,7 @@ package {{$structName}}
|
|||||||
{{$hasLinkTable:=false}}
|
{{$hasLinkTable:=false}}
|
||||||
{{$useCommonService:=false}}
|
{{$useCommonService:=false}}
|
||||||
{{$hasDeptSelector:=false}}
|
{{$hasDeptSelector:=false}}
|
||||||
|
{{$hasUserMultipleSelector:=false}}
|
||||||
{{$usedSystemModel := false}}
|
{{$usedSystemModel := false}}
|
||||||
{{range $index, $column := .table.Columns}}
|
{{range $index, $column := .table.Columns}}
|
||||||
{{if eq $column.HtmlType "images" "file" "files" "imageSelector" "fileSelector"}}
|
{{if eq $column.HtmlType "images" "file" "files" "imageSelector" "fileSelector"}}
|
||||||
@ -27,6 +28,9 @@ package {{$structName}}
|
|||||||
{{if eq $column.HtmlType "deptSelectorMultiple" "deptSelectorSingle"}}
|
{{if eq $column.HtmlType "deptSelectorMultiple" "deptSelectorSingle"}}
|
||||||
{{$hasDeptSelector = true}}
|
{{$hasDeptSelector = true}}
|
||||||
{{end}}
|
{{end}}
|
||||||
|
{{if eq $column.HtmlType "userSelectorMultiple"}}
|
||||||
|
{{$hasUserMultipleSelector = true}}
|
||||||
|
{{end}}
|
||||||
{{if and (or (eq $column.HtmlField "createdBy" "updatedBy" "deletedBy" "deptId") (eq $column.HtmlType "userSelectorSingle" "userSelectorMultiple" "deptSelectorMultiple" "deptSelectorSingle")) (ne $.table.ModuleName "system")}}
|
{{if and (or (eq $column.HtmlField "createdBy" "updatedBy" "deletedBy" "deptId") (eq $column.HtmlType "userSelectorSingle" "userSelectorMultiple" "deptSelectorMultiple" "deptSelectorSingle")) (ne $.table.ModuleName "system")}}
|
||||||
{{$usedSystemModule = true}}
|
{{$usedSystemModule = true}}
|
||||||
{{end}}
|
{{end}}
|
||||||
@ -206,12 +210,12 @@ func (s *s{{.table.ClassName}})List(ctx context.Context, req *model.{{.table.Cla
|
|||||||
listRes.List = make([]*model.{{.table.ClassName}}ListRes,len(res))
|
listRes.List = make([]*model.{{.table.ClassName}}ListRes,len(res))
|
||||||
for k,v:=range res{
|
for k,v:=range res{
|
||||||
{{range $index, $column := .table.Columns}}
|
{{range $index, $column := .table.Columns}}
|
||||||
{{if eq $column.HtmlType "userSelectorMultiple"}}
|
{{if and $column.IsList (eq $column.HtmlType "userSelectorMultiple")}}
|
||||||
var linked{{$column.GoField}} []*{{if $usedSystemModel}}systemModel{{else}}model{{end}}.SysUserSimpleRes
|
var linked{{$column.GoField}} []*{{if $usedSystemModel}}systemModel{{else}}model{{end}}.SysUserSimpleRes
|
||||||
linked{{$column.GoField}}, err = {{if $usedSystemModule}}systemService{{else}}service{{end}}.SysUser().GetUsers(ctx, gconv.Interfaces(v.{{$column.GoField}}))
|
linked{{$column.GoField}}, err = {{if $usedSystemModule}}systemService{{else}}service{{end}}.SysUser().GetUsers(ctx, gconv.Interfaces(v.{{$column.GoField}}))
|
||||||
liberr.ErrIsNil(ctx, err)
|
liberr.ErrIsNil(ctx, err)
|
||||||
{{end}}
|
{{end}}
|
||||||
{{if eq $column.HtmlType "deptSelectorMultiple"}}
|
{{if and $column.IsList (eq $column.HtmlType "deptSelectorMultiple")}}
|
||||||
linked{{$column.GoField}} := make([]*{{if $usedSystemModel}}systemModel{{else}}model{{end}}.LinkDeptRes, len(v.{{$column.GoField}}))
|
linked{{$column.GoField}} := make([]*{{if $usedSystemModel}}systemModel{{else}}model{{end}}.LinkDeptRes, len(v.{{$column.GoField}}))
|
||||||
for lk, lv := range v.{{$column.GoField}} {
|
for lk, lv := range v.{{$column.GoField}} {
|
||||||
linked{{$column.GoField}}[lk] = {{if $usedSystemModule}}systemService{{else}}service{{end}}.SysDept().GetByDept(ctx, lv)
|
linked{{$column.GoField}}[lk] = {{if $usedSystemModule}}systemService{{else}}service{{end}}.SysDept().GetByDept(ctx, lv)
|
||||||
@ -508,7 +512,7 @@ func (s *s{{.table.ClassName}})GetBy{{$pkGoField}}(ctx context.Context, {{$.tabl
|
|||||||
err =g.Try(ctx, func(ctx context.Context){
|
err =g.Try(ctx, func(ctx context.Context){
|
||||||
err = dao.{{.table.ClassName}}.Ctx(ctx).WithAll().Where(dao.{{.table.ClassName}}.Columns().{{$pkGoField}}, {{$.table.PkColumn.HtmlField}}).Scan(&res)
|
err = dao.{{.table.ClassName}}.Ctx(ctx).WithAll().Where(dao.{{.table.ClassName}}.Columns().{{$pkGoField}}, {{$.table.PkColumn.HtmlField}}).Scan(&res)
|
||||||
liberr.ErrIsNil(ctx,err,"获取信息失败")
|
liberr.ErrIsNil(ctx,err,"获取信息失败")
|
||||||
{{if or $.table.HasDeptId $hasDeptSelector}}
|
{{if or $.table.HasDeptId $hasDeptSelector $hasUserMultipleSelector}}
|
||||||
if res!=nil{
|
if res!=nil{
|
||||||
{{if $.table.HasDeptId}}
|
{{if $.table.HasDeptId}}
|
||||||
{{if $usedSystemModule}}
|
{{if $usedSystemModule}}
|
||||||
@ -517,7 +521,6 @@ func (s *s{{.table.ClassName}})GetBy{{$pkGoField}}(ctx context.Context, {{$.tabl
|
|||||||
res.DeptInfo = service.SysDept().GetByDept(ctx, res.DeptId)
|
res.DeptInfo = service.SysDept().GetByDept(ctx, res.DeptId)
|
||||||
{{end}}
|
{{end}}
|
||||||
{{end}}
|
{{end}}
|
||||||
{{if $hasDeptSelector}}
|
|
||||||
{{range $index, $column := .table.Columns}}
|
{{range $index, $column := .table.Columns}}
|
||||||
{{if eq $column.HtmlType "userSelectorMultiple"}}
|
{{if eq $column.HtmlType "userSelectorMultiple"}}
|
||||||
res.Linked{{$column.GoField}}, err = {{if $usedSystemModule}}systemService{{else}}service{{end}}.SysUser().GetUsers(ctx, gconv.Interfaces(res.{{$column.GoField}}))
|
res.Linked{{$column.GoField}}, err = {{if $usedSystemModule}}systemService{{else}}service{{end}}.SysUser().GetUsers(ctx, gconv.Interfaces(res.{{$column.GoField}}))
|
||||||
@ -531,7 +534,6 @@ func (s *s{{.table.ClassName}})GetBy{{$pkGoField}}(ctx context.Context, {{$.tabl
|
|||||||
}
|
}
|
||||||
{{end}}
|
{{end}}
|
||||||
{{end}}
|
{{end}}
|
||||||
{{end}}
|
|
||||||
}
|
}
|
||||||
{{end}}
|
{{end}}
|
||||||
{{range $index, $column := .table.Columns}}
|
{{range $index, $column := .table.Columns}}
|
||||||
|
@ -132,6 +132,7 @@
|
|||||||
<el-date-picker clearable style="width: 200px"
|
<el-date-picker clearable style="width: 200px"
|
||||||
v-model="formData.{{$column.HtmlField}}"
|
v-model="formData.{{$column.HtmlField}}"
|
||||||
type="date"
|
type="date"
|
||||||
|
value-format="YYYY-MM-DD"
|
||||||
placeholder="选择{{$column.ColumnComment}}">
|
placeholder="选择{{$column.ColumnComment}}">
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@ -140,6 +141,7 @@
|
|||||||
<el-date-picker clearable style="width: 200px"
|
<el-date-picker clearable style="width: 200px"
|
||||||
v-model="formData.{{$column.HtmlField}}"
|
v-model="formData.{{$column.HtmlField}}"
|
||||||
type="datetime"
|
type="datetime"
|
||||||
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
placeholder="选择{{$column.ColumnComment}}">
|
placeholder="选择{{$column.ColumnComment}}">
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user