xinyin025/hotgo
1
0
Fork 0
mirror of https://github.com/bufanyun/hotgo.git synced 2025-11-14 13:13:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'bufanyun:v2.0' into v2.0-refactoring

Browse Source
This commit is contained in:
Lingjie Fu
2024-09-19 19:37:17 +08:00
committed by GitHub
parent f18ce6384b a2c6a8ac16
commit e0d9279685
7 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/internal/library/hggen/hggen.go
View File

@@ -179,7 +179,11 @@ func GenTypeSelect(ctx context.Context) (res sysin.GenTypeSelects, err error) {
Templates: make(sysin.GenTemplateSelects, 0),
}
confName, ok := consts.GenCodesTypeConfMap[k]
km := k
if km == consts.GenCodesTypeTree {
km = consts.GenCodesTypeCurd
}
confName, ok := consts.GenCodesTypeConfMap[km]
if ok {
var temps []*model.GenerateAppCrudTemplate
err = g.Cfg().MustGet(ctx, "hggen.application."+confName+".templates").Scan(&temps)

1
server/internal/library/hggen/views/curd.go
View File

@@ -403,6 +403,7 @@ func (l *gCurd) loadView(ctx context.Context, in *CurdPreviewInput) (err error)
"importWebApi": in.options.ImportWebApi, // 导入webApi
"apiPrefix": in.options.ApiPrefix, // api前缀
"componentPrefix": componentPrefix, // vue子组件前缀
"in": in.In, // 在模版中使用`in`参数,如:插件目录名称
})
in.view = view

4
server/internal/library/hggen/views/curd_generate_logic.go
View File

@@ -286,8 +286,8 @@ func (l *gCurd) generateLogicListWhereEach(buffer *bytes.Buffer, in *CurdPreview
case WhereModeNotLike:
whereTag = "\tif " + linkMode + " {\n\t\tmod = mod." + wherePrefix + "NotLike(" + tablePrefix + "dao." + daoName + ".Columns()." + columnName + ", in." + field.GoName + ")\n\t}"
case WhereModeJsonContains:
val := tablePrefix + "fmt.Sprintf(`JSON_CONTAINS(%s,'%v')`, dao." + daoName + ".Columns()." + columnName + ", in." + field.GoName + ")"
whereTag = "\tif in." + field.GoName + linkMode + " {\n\t\tmod = mod." + wherePrefix + "(" + val + ")\n\t}"
val := tablePrefix + `"JSON_CONTAINS("+dao.` + daoName + `.Columns().` + columnName + `+",?)", in.` + field.GoName
whereTag = "\tif " + linkMode + " {\n\t\tmod = mod." + wherePrefix + "(" + val + ")\n\t}"
default:
buffer.WriteString(fmt.Sprintf(LogicWhereNoSupport, field.QueryWhere))

9
server/internal/logic/sys/gen_codes.go
View File

@@ -177,8 +177,14 @@ func (s *sSysGenCodes) List(ctx context.Context, in *sysin.GenCodesListInp) (lis
if row == nil {
return ""
}
genType := int(row.GenType)
if genType == consts.GenCodesTypeTree {
genType = consts.GenCodesTypeCurd
}
for _, v := range typeSelect {
if v.Value == int(row.GenType) {
if v.Value == genType {
for index, template := range v.Templates {
if index == row.GenTemplate {
return template.Label
@@ -186,7 +192,6 @@ func (s *sSysGenCodes) List(ctx context.Context, in *sysin.GenCodesListInp) (lis
}
}
}
return ""
}

4
server/resource/generate/default/curd/logic.go.template
View File

@@ -151,11 +151,11 @@ func (s *s@{.servFunName}) Delete(ctx context.Context, in *@{.templateGroup}in.@
return gerror.New("请先删除该@{.tableComment}下的所有下级！")
}@{end}
@{ if eq .deletedUpdate "" }
if _, err = s.Model(ctx@{ if eq .options.Step.HasNotFilterAuth true } ,&handler.Option{FilterAuth: false}@{end}).WherePri(in.@{.pk.GoName}).Delete();err != nil {
if _, err = s.Model(ctx@{ if eq .options.Step.HasNotFilterAuth true } ,&handler.Option{FilterAuth: false}@{end}).WherePri(in.@{.pk.GoName}).Unscoped().Delete();err != nil {
err = gerror.Wrap(err, "删除@{.tableComment}失败，请稍后重试！")
return
}@{else}
if _, err = s.Model(ctx@{ if eq .options.Step.HasNotFilterAuth true } ,&handler.Option{FilterAuth: false}@{end}).WherePri(in.@{.pk.GoName}).Data(@{.deletedUpdate}).Update();err != nil {
if _, err = s.Model(ctx@{ if eq .options.Step.HasNotFilterAuth true } ,&handler.Option{FilterAuth: false}@{end}).WherePri(in.@{.pk.GoName}).Data(@{.deletedUpdate}).Unscoped().Update();err != nil {
err = gerror.Wrap(err, "删除@{.tableComment}失败，请稍后重试！")
return
}@{end}