发布v2.15.1版本，更新内容请查看：https://github.com/bufanyun/hotgo/blob/v2.0/docs/guide-zh-CN/start-update-log.md

2025-08-27 20:45:39 +08:00 · 2024-04-22 23:08:40 +08:00
parent 82483bd7b9
commit e144b12580
445 changed files with 17457 additions and 6708 deletions
--- a/server/resource/generate/default/curd/logic.go.template
+++ b/server/resource/generate/default/curd/logic.go.template
@@ -17,15 +17,21 @@ import (
 	"github.com/gogf/gf/v2/os/gtime"
 	"github.com/gogf/gf/v2/util/gconv"
 	"hotgo/internal/dao"
+	"hotgo/internal/consts"
 	"hotgo/internal/library/contexts"
 	"hotgo/internal/library/hgorm"
 	"hotgo/internal/library/hgorm/handler"
+	"hotgo/internal/library/hgorm/hook"
 	"@{.importInput}"
 	"hotgo/internal/model/input/form"
 	"@{.importService}"
 	"hotgo/utility/convert"
 	"hotgo/utility/excel"
 	"hotgo/utility/validate"
+	@{ if eq .options.Step.IsAddon true }isc "hotgo/internal/service"@{end}
+	@{ if eq .options.Step.IsTreeTable true }"hotgo/utility/tree"@{end}
+	@{ if eq .options.Step.HasFuncDict true }"hotgo/internal/library/dict"@{end}
+	@{ if eq .options.Step.HasFuncDict true }"hotgo/internal/model"@{end}
 )

 type s@{.servFunName} struct{}
@@ -36,7 +42,7 @@ func New@{.servFunName}() *s@{.servFunName} {

 func init() {
 	service.Register@{.servFunName}(New@{.servFunName}())
-}
+	@{ if eq .options.Step.HasFuncDict true }dict.RegisterFunc("@{.varName | LcFirst}Option", "@{.tableComment}选项", service.@{.servFunName}().Option)@{end}}

 // Model @{.tableComment}ORM模型
 func (s *s@{.servFunName}) Model(ctx context.Context, option ...*handler.Option) *gdb.Model {
@@ -46,26 +52,45 @@ func (s *s@{.servFunName}) Model(ctx context.Context, option ...*handler.Option)
 // List 获取@{.tableComment}列表
 func (s *s@{.servFunName}) List(ctx context.Context, in *@{.templateGroup}in.@{.varName}ListInp) (list []*@{.templateGroup}in.@{.varName}ListModel, totalCount int, err error) {
 	mod := s.Model(ctx@{ if eq .options.Step.HasNotFilterAuth true } ,&handler.Option{FilterAuth: false}@{end})
+
+	// 字段过滤
+  @{.listFields}
+
+	@{ if ne .listJoin "" }
+  // 关联表字段
+  @{.listJoin}
+  @{end}
+
@{.listWhere}
-@{.listJoin.link}
-	totalCount, err = mod.Clone().Count()
-	if err != nil {
-		err = gerror.Wrap(err, "获取@{.tableComment}数据行失败，请稍后重试！")
-		return
+
+@{ if eq .options.Step.IsTreeTable true }
+  // 树形列表判断是否需要分页
+	if in.Pagination {
+		mod = mod.Page(in.Page, in.PerPage)
 	}
+@{end}

-	if totalCount == 0 {
-		return
-	}
+@{ if eq .options.Step.IsTreeTable false }
+  // 分页
+	mod = mod.Page(in.Page, in.PerPage)
+@{end}

-@{.listJoin.select}
+	// 排序
+	mod = mod.@{.listOrder}

-    if err = mod.Fields(@{.listJoin.fields}).Page(in.Page, in.PerPage).@{.listOrder}.Scan(&list);err != nil {
+@{ if eq .options.Step.HasHookMemberSummary true }
+	// 操作人摘要信息
+	mod = mod.Hook(hook.MemberSummary)
+@{end}
+
+	// 查询数据
+    if err = mod.ScanAndCount(&list, &totalCount, false);err != nil {
 		err = gerror.Wrap(err, "获取@{.tableComment}列表失败，请稍后重试！")
 		return
    }
 	return
 }
+
@{ if eq .options.Step.HasExport true }
 // Export 导出@{.tableComment}
 func (s *s@{.servFunName}) Export(ctx context.Context, in *@{.templateGroup}in.@{.varName}ListInp) (err error) {
@@ -81,7 +106,7 @@ func (s *s@{.servFunName}) Export(ctx context.Context, in *@{.templateGroup}in.@
 	}

 	var (
-		fileName  = "导出@{.tableComment}-" + gctx.CtxId(ctx) + ".xlsx"
+		fileName  = "导出@{.tableComment}-" + gctx.CtxId(ctx)
 		sheetName = fmt.Sprintf("索引条件共%v行,共%v页,当前导出是第%v页,本页共%v行", totalCount, form.CalPageCount(totalCount, in.PerPage), in.Page, len(list))
 		exports   []@{.templateGroup}in.@{.varName}ExportModel
 	)
@@ -93,28 +118,45 @@ func (s *s@{.servFunName}) Export(ctx context.Context, in *@{.templateGroup}in.@
    err = excel.ExportByStructs(ctx, tags, exports, fileName, sheetName)
 	return
 }@{end}
+
@{ if eq .options.Step.HasEdit true }
 // Edit 修改/新增@{.tableComment}
 func (s *s@{.servFunName}) Edit(ctx context.Context, in *@{.templateGroup}in.@{.varName}EditInp) (err error) {
-@{.edit.unique}	// 修改
-	if in.@{.pk.GoName} > 0 {
-@{.edit.update}
-	}
+@{.edit.unique}	return g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
+		@{ if eq .options.Step.IsTreeTable true }in.Pid, in.Level, in.Tree, err = hgorm.AutoUpdateTree(ctx, &dao.@{.daoName}, in.@{.pk.GoName}, in.Pid)
+		if err != nil {
+			return err
+		}@{end}
+		// 修改
+		if in.@{.pk.GoName} > 0 {
+	@{.edit.update}
+		}

-	// 新增
-@{.edit.insert}
-	return
+		// 新增
+	@{.edit.insert}
+		return
+	})
 }
@{end}
+
@{ if eq .options.Step.HasDel true }
 // Delete 删除@{.tableComment}
 func (s *s@{.servFunName}) Delete(ctx context.Context, in *@{.templateGroup}in.@{.varName}DeleteInp) (err error) {
+	@{ if eq .options.Step.IsTreeTable true }count, err := dao.@{.daoName}.Ctx(ctx).Where(dao.@{.daoName}.Columns().Pid, in.@{.pk.GoName}).Count()
+	if err != nil {
+		err = gerror.Wrap(err, consts.ErrorORM)
+		return err
+	}
+	if count > 0 {
+		return gerror.New("请先删除该@{.tableComment}下的所有下级！")
+	}@{end}
 	if _, err = s.Model(ctx@{ if eq .options.Step.HasNotFilterAuth true } ,&handler.Option{FilterAuth: false}@{end}).WherePri(in.@{.pk.GoName}).Delete();err != nil {
 		err = gerror.Wrap(err, "删除@{.tableComment}失败，请稍后重试！")
    	return
 	}
 	return
 }@{end}
+
@{ if and (eq .options.Step.HasEdit true) (eq .options.Step.HasMaxSort true) }
 // MaxSort 获取@{.tableComment}最大排序
 func (s *s@{.servFunName}) MaxSort(ctx context.Context, in *@{.templateGroup}in.@{.varName}MaxSortInp) (res *@{.templateGroup}in.@{.varName}MaxSortModel, err error) {
@@ -131,15 +173,17 @@ func (s *s@{.servFunName}) MaxSort(ctx context.Context, in *@{.templateGroup}in.
 	return
 }
@{end}
+
@{ if or (eq .options.Step.HasView true) (eq .options.Step.HasEdit true) }
 // View 获取@{.tableComment}指定信息
 func (s *s@{.servFunName}) View(ctx context.Context, in *@{.templateGroup}in.@{.varName}ViewInp) (res *@{.templateGroup}in.@{.varName}ViewModel, err error) {
-    if err = s.Model(ctx@{ if eq .options.Step.HasNotFilterAuth true } ,&handler.Option{FilterAuth: false}@{end}).WherePri(in.@{.pk.GoName}).Scan(&res);err != nil {
+    if err = s.Model(ctx@{ if eq .options.Step.HasNotFilterAuth true } ,&handler.Option{FilterAuth: false}@{end}).WherePri(in.@{.pk.GoName})@{ if eq .options.Step.HasHookMemberSummary true }.Hook(hook.MemberSummary)@{end}.Scan(&res);err != nil {
 		err = gerror.Wrap(err, "获取@{.tableComment}信息，请稍后重试！")
 		return
    }
 	return
 }@{end}
+
@{ if eq .options.Step.HasStatus true }
 // Status 更新@{.tableComment}状态
 func (s *s@{.servFunName}) Status(ctx context.Context, in *@{.templateGroup}in.@{.varName}StatusInp) (err error) {
@@ -150,12 +194,12 @@ func (s *s@{.servFunName}) Status(ctx context.Context, in *@{.templateGroup}in.@
 	return
 }
@{end}
+
@{ if eq .options.Step.HasSwitch true }
 // Switch 更新@{.tableComment}开关
 func (s *s@{.servFunName}) Switch(ctx context.Context, in *@{.templateGroup}in.@{.varName}SwitchInp) (err error) {
 	var fields = []string{
-@{.switchFields}
-		// ...
+@{.switchFields}		// ...
 	}

 	if !validate.InSlice(fields, in.Key) {
@@ -169,4 +213,38 @@ func (s *s@{.servFunName}) Switch(ctx context.Context, in *@{.templateGroup}in.@
 	}
 	return
 }
+@{end}
+
+@{ if eq .options.Step.IsTreeTable true }
+// TreeOption 获取@{.tableComment}关系树选项
+func (s *s@{.servFunName}) TreeOption(ctx context.Context) (nodes []tree.Node, err error) {
+	var models []*@{.templateGroup}in.@{.varName}TreeOption
+	if err = s.Model(ctx@{ if eq .options.Step.HasNotFilterAuth true } ,&handler.Option{FilterAuth: false}@{end}).Fields(@{.templateGroup}in.@{.varName}TreeOption{}).OrderAsc(dao.@{.daoName}.Columns().Pid).@{.listOrder}.Scan(&models); err != nil {
+		err = gerror.Wrap(err, "获取@{.tableComment}关系树选项失败！")
+		return
+	}
+	nodes = make([]tree.Node, len(models))
+	for i, v := range models {
+		nodes[i] = v
+	}
+	return tree.ListToTree(0, nodes)
+}
+@{end}
+
+@{ if eq .options.Step.HasFuncDict true }
+// Option 获取@{.tableComment}选项
+func (s *s@{.servFunName}) Option(ctx context.Context) (opts []*model.Option, err error) {
+	var models []*entity.@{.daoName}
+	if err = s.Model(ctx@{ if eq .options.Step.HasNotFilterAuth true } ,&handler.Option{FilterAuth: false}@{end}).Fields(dao.@{.daoName}.Columns().@{.options.FuncDict.Value.GoName},dao.@{.daoName}.Columns().@{.options.FuncDict.Label.GoName}).
+	@{.listOrder}.Scan(&models); err != nil {
+		err = gerror.Wrap(err, "获取@{.tableComment}选项失败！")
+		return
+	}
+
+	opts = make([]*model.Option, len(models))
+	for k, v := range models {
+		opts[k] = dict.GenHashOption(v.@{.options.FuncDict.Value.GoName}, gconv.String(v.@{.options.FuncDict.Label.GoName}))
+	}
+	return
+}
@{end}