xinyin025/hotgo
1
0
Fork 0
mirror of https://github.com/bufanyun/hotgo.git synced 2025-11-13 20:53:49 +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))