Merge pull request glennliao#18 from glennliao/dev

glennliao · web-flow · commit 0b96d1c50f97 · 2023-03-14T18:53:26.000+08:00
## 0.2.0-beta2
diff --git a/drivers/framework_goframe/gf.go b/drivers/framework_goframe/gf.go
@@ -45,11 +45,11 @@ func (gf *GF) Bind(group *ghttp.RouterGroup, mode ...Mode) {
 	if len(mode) == 0 {
 		mode = []Mode{InDataMode}
 	}
-	group.POST("/get", gf.commonResponse(gf.Get, mode[0]))
-	group.POST("/post", gf.commonResponse(gf.Post, mode[0]))
-	group.POST("/head", gf.commonResponse(gf.Head, mode[0]))
-	group.POST("/put", gf.commonResponse(gf.Put, mode[0]))
-	group.POST("/delete", gf.commonResponse(gf.Delete, mode[0]))
+	group.POST("/get", gf.CommonResponse(gf.Get, mode[0]))
+	group.POST("/post", gf.CommonResponse(gf.Post, mode[0]))
+	group.POST("/head", gf.CommonResponse(gf.Head, mode[0]))
+	group.POST("/put", gf.CommonResponse(gf.Put, mode[0]))
+	group.POST("/delete", gf.CommonResponse(gf.Delete, mode[0]))
 }
 
 func (gf *GF) Get(ctx context.Context, req model.Map) (res model.Map, err error) {
@@ -76,7 +76,7 @@ func (gf *GF) Delete(ctx context.Context, req model.Map) (res model.Map, err err
 	return act.Result()
 }
 
-func (gf *GF) commonResponse(handler func(ctx context.Context, req model.Map) (res model.Map, err error), mode Mode) func(req *ghttp.Request) {
+func (gf *GF) CommonResponse(handler func(ctx context.Context, req model.Map) (res model.Map, err error), mode Mode) func(req *ghttp.Request) {
 	return func(req *ghttp.Request) {
 		metaRes := &gmap.ListMap{}
 		code := 200
diff --git a/query/node_query.go b/query/node_query.go
@@ -94,7 +94,7 @@ func (q *queryNode) parse() {
 		return
 	}
 
-	n.primaryTableKey = n.Key
+	n.primaryTableKey = filepath.Base(n.Path)
 
 	if len(refKeyMap) > 0 { // 需要引用别处
 		n.refKeyMap = make(map[string]NodeRef)
diff --git a/query/node_struct.go b/query/node_struct.go
@@ -4,6 +4,7 @@ import (
 	"github.com/glennliao/apijson-go/consts"
 	"github.com/glennliao/apijson-go/model"
 	"github.com/gogf/gf/v2/errors/gerror"
+	"path/filepath"
 	"strings"
 )
 
@@ -18,6 +19,10 @@ func newStructNode(n *Node) *structNode {
 func (h *structNode) parse() {
 	n := h.node
 
+	for _, childNode := range n.children {
+		childNode.parse()
+	}
+
 	if n.isList { // []节点
 
 		hasPrimary := false // 是否存在主查询表
@@ -35,7 +40,7 @@ func (h *structNode) parse() {
 				}
 
 				hasPrimary = true
-				n.primaryTableKey = child.Key
+				n.primaryTableKey = filepath.Base(child.Key)
 				child.page = n.page
 
 			}
@@ -46,9 +51,6 @@ func (h *structNode) parse() {
 		}
 	}
 
-	for _, childNode := range n.children {
-		childNode.parse()
-	}
 }
 
 func (h *structNode) fetch() {

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ func (q *queryNode) parse() {`
`94`	`94`	`return`
`95`	`95`	`}`
`96`	`96`
`97`		`- n.primaryTableKey = n.Key`
	`97`	`+ n.primaryTableKey = filepath.Base(n.Path)`
`98`	`98`
`99`	`99`	`if len(refKeyMap) > 0 { // 需要引用别处`
`100`	`100`	`n.refKeyMap = make(map[string]NodeRef)`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import (`
`4`	`4`	`"github.com/glennliao/apijson-go/consts"`
`5`	`5`	`"github.com/glennliao/apijson-go/model"`
`6`	`6`	`"github.com/gogf/gf/v2/errors/gerror"`
	`7`	`+ "path/filepath"`
`7`	`8`	`"strings"`
`8`	`9`	`)`
`9`	`10`
`@@ -18,6 +19,10 @@ func newStructNode(n Node) structNode {`
`18`	`19`	`func (h *structNode) parse() {`
`19`	`20`	`n := h.node`
`20`	`21`
	`22`	`+ for _, childNode := range n.children {`
	`23`	`+ childNode.parse()`
	`24`	`+ }`
	`25`	`+`
`21`	`26`	`if n.isList { // []节点`
`22`	`27`
`23`	`28`	`hasPrimary := false // 是否存在主查询表`
`@@ -35,7 +40,7 @@ func (h *structNode) parse() {`
`35`	`40`	`}`
`36`	`41`
`37`	`42`	`hasPrimary = true`
`38`		`- n.primaryTableKey = child.Key`
	`43`	`+ n.primaryTableKey = filepath.Base(child.Key)`
`39`	`44`	`child.page = n.page`
`40`	`45`
`41`	`46`	`}`
`@@ -46,9 +51,6 @@ func (h *structNode) parse() {`
`46`	`51`	`}`
`47`	`52`	`}`
`48`	`53`
`49`		`- for _, childNode := range n.children {`
`50`		`- childNode.parse()`
`51`		`- }`
`52`	`54`	`}`
`53`	`55`
`54`	`56`	`func (h *structNode) fetch() {`