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

2025-08-28 05:12:32 +08:00 · 2023-02-26 14:18:22 +08:00
parent 34c373c11e
commit ab912d0ba6
111 changed files with 3068 additions and 9329 deletions
--- a/server/internal/logic/sys/cron_group.go
+++ b/server/internal/logic/sys/cron_group.go
@@ -9,14 +9,12 @@ package sys
 import (
 	"context"
 	"github.com/gogf/gf/v2/errors/gerror"
-	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
 	"hotgo/internal/consts"
 	"hotgo/internal/dao"
 	"hotgo/internal/model/entity"
 	"hotgo/internal/model/input/sysin"
 	"hotgo/internal/service"
-	"hotgo/utility/tree"
 	"hotgo/utility/validate"
 )

@@ -157,31 +155,39 @@ func (s *sSysCronGroup) List(ctx context.Context, in sysin.CronGroupListInp) (li
 }

 // Select 选项
-func (s *sSysCronGroup) Select(ctx context.Context, in sysin.CronGroupSelectInp) (list sysin.CronGroupSelectModel, err error) {
+func (s *sSysCronGroup) Select(ctx context.Context, in sysin.CronGroupSelectInp) (res *sysin.CronGroupSelectModel, err error) {
 	var (
-		mod      = dao.SysCronGroup.Ctx(ctx)
-		models   []*entity.SysCronGroup
-		typeList []g.Map
+		mod    = dao.SysCronGroup.Ctx(ctx)
+		models []*entity.SysCronGroup
 	)

 	if err = mod.Order("pid asc,sort asc").Scan(&models); err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
-		return list, err
+		return
 	}

-	for i := 0; i < len(models); i++ {
-		typeList = append(typeList, g.Map{
-			"index":      models[i].Id,
-			"key":        models[i].Id,
-			"label":      models[i].Name,
-			"id":         models[i].Id,
-			"pid":        models[i].Pid,
-			"name":       models[i].Name,
-			"sort":       models[i].Sort,
-			"created_at": models[i].CreatedAt,
-			"status":     models[i].Status,
-		})
-	}
-
-	return tree.GenTree(typeList), nil
+	res = new(sysin.CronGroupSelectModel)
+	res.List = s.treeList(0, models)
+	return
+}
+
+// treeList 树状列表
+func (s *sSysCronGroup) treeList(pid int64, nodes []*entity.SysCronGroup) (list []*sysin.CronGroupTree) {
+	list = make([]*sysin.CronGroupTree, 0)
+	for _, v := range nodes {
+		if v.Pid == pid {
+			item := new(sysin.CronGroupTree)
+			item.SysCronGroup = *v
+			item.Label = v.Name
+			item.Value = v.Id
+			item.Key = v.Id
+
+			child := s.treeList(v.Id, nodes)
+			if len(child) > 0 {
+				item.Children = child
+			}
+			list = append(list, item)
+		}
+	}
+	return
 }
--- a/server/internal/logic/sys/dict_type.go
+++ b/server/internal/logic/sys/dict_type.go
@@ -9,14 +9,12 @@ package sys
 import (
 	"context"
 	"github.com/gogf/gf/v2/errors/gerror"
-	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
 	"hotgo/internal/consts"
 	"hotgo/internal/dao"
 	"hotgo/internal/model/entity"
 	"hotgo/internal/model/input/sysin"
 	"hotgo/internal/service"
-	"hotgo/utility/tree"
 )

 type sSysDictType struct{}
@@ -30,35 +28,19 @@ func init() {
 }

 // Tree 树
-func (s *sSysDictType) Tree(ctx context.Context) (list []g.Map, err error) {
+func (s *sSysDictType) Tree(ctx context.Context) (list []*sysin.DictTypeTree, err error) {
 	var (
 		mod    = dao.SysDictType.Ctx(ctx)
 		models []*entity.SysDictType
 	)

-	if err = mod.Order("pid asc,sort asc").Scan(&models); err != nil {
+	if err = mod.Order("sort asc,id asc").Scan(&models); err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
 		return list, err
 	}

-	for i := 0; i < len(models); i++ {
-		list = append(list, g.Map{
-			"index":      models[i].Id,
-			"key":        models[i].Id,
-			"label":      models[i].Name,
-			"id":         models[i].Id,
-			"pid":        models[i].Pid,
-			"name":       models[i].Name,
-			"type":       models[i].Type,
-			"sort":       models[i].Sort,
-			"remark":     models[i].Remark,
-			"status":     models[i].Status,
-			"updated_at": models[i].UpdatedAt,
-			"created_at": models[i].CreatedAt,
-		})
-	}
-
-	return tree.GenTree(list), nil
+	list = s.treeList(0, models)
+	return
 }

 // Delete 删除
@@ -141,42 +123,11 @@ func (s *sSysDictType) Edit(ctx context.Context, in sysin.DictTypeEditInp) (err
 	return nil
 }

-// Select 选项
-func (s *sSysDictType) Select(ctx context.Context, in sysin.DictTypeSelectInp) (list sysin.DictTypeSelectModel, err error) {
-	var (
-		mod      = dao.SysDictType.Ctx(ctx)
-		models   []*entity.SysDictType
-		typeList []g.Map
-	)
-
-	if err = mod.Order("pid asc,sort asc").Scan(&models); err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return list, err
-	}
-
-	for i := 0; i < len(models); i++ {
-		typeList = append(typeList, g.Map{
-			"index":      models[i].Id,
-			"key":        models[i].Id,
-			"label":      models[i].Name,
-			"id":         models[i].Id,
-			"pid":        models[i].Pid,
-			"name":       models[i].Name,
-			"sort":       models[i].Sort,
-			"created_at": models[i].CreatedAt,
-			"status":     models[i].Status,
-		})
-	}
-
-	return tree.GenTree(typeList), nil
-}
-
 // TreeSelect 获取类型关系树选项
-func (s *sSysDictType) TreeSelect(ctx context.Context, in sysin.DictTreeSelectInp) (list sysin.DictTreeSelectModel, err error) {
+func (s *sSysDictType) TreeSelect(ctx context.Context, in sysin.DictTreeSelectInp) (list []*sysin.DictTypeTree, err error) {
 	var (
-		mod      = dao.SysDictType.Ctx(ctx)
-		models   []*entity.SysDictType
-		typeList []g.Map
+		mod    = dao.SysDictType.Ctx(ctx)
+		models []*entity.SysDictType
 	)

 	if err = mod.Order("pid asc,sort asc").Scan(&models); err != nil {
@@ -184,26 +135,39 @@ func (s *sSysDictType) TreeSelect(ctx context.Context, in sysin.DictTreeSelectIn
 		return list, err
 	}

-	for i := 0; i < len(models); i++ {
-		typeList = append(typeList, g.Map{
-			"index":      models[i].Id,
-			"key":        models[i].Id,
-			"label":      models[i].Name,
-			"id":         models[i].Id,
-			"pid":        models[i].Pid,
-			"name":       models[i].Name,
-			"sort":       models[i].Sort,
-			"created_at": models[i].CreatedAt,
-			"status":     models[i].Status,
-		})
-	}
+	list = s.treeList(0, models)

-	maps := tree.GenTree(typeList)
-	for _, v := range maps {
+	for _, v := range list {
 		// 父类一律禁止选中
-		if _, ok := v["children"]; ok {
-			v["disabled"] = true
+		if len(v.Children) > 0 {
+			v.Disabled = true
+			for _, v2 := range v.Children {
+				if len(v2.Children) > 0 {
+					v2.Disabled = true
+				}
+			}
 		}
 	}
-	return tree.GenTree(typeList), nil
+	return
+}
+
+// treeList 树状列表
+func (s *sSysDictType) treeList(pid int64, nodes []*entity.SysDictType) (list []*sysin.DictTypeTree) {
+	list = make([]*sysin.DictTypeTree, 0)
+	for _, v := range nodes {
+		if v.Pid == pid {
+			item := new(sysin.DictTypeTree)
+			item.SysDictType = *v
+			item.Label = v.Name
+			item.Value = v.Id
+			item.Key = v.Id
+
+			child := s.treeList(v.Id, nodes)
+			if len(child) > 0 {
+				item.Children = child
+			}
+			list = append(list, item)
+		}
+	}
+	return
 }