save for 调整 非全局方式使用

glennliao · glennliao · commit bb77d8f83332 · 2023-03-03T21:35:20.000+08:00
diff --git a/config/functions/functions.go b/config/functions/functions.go
@@ -19,6 +19,15 @@ func Reg(name string, f Func) {
 	funcMap[name] = f
 }
 
+func RegHandler(name string, handler func(ctx context.Context, param g.Map) (res any, err error)) {
+	if _, exists := funcMap[name]; exists {
+		panic(fmt.Errorf(" function %s has exists", name))
+	}
+	funcMap[name] = struct {
+		Handler func(ctx context.Context, param g.Map) (res any, err error)
+	}{Handler: handler}
+}
+
 func Call(ctx context.Context, name string, param g.Map) (any, error) {
 	return funcMap[name].Handler(ctx, param)
 }
diff --git a/query/node.go b/query/node.go
@@ -389,8 +389,9 @@ func (n *Node) parse() {
 		}
 
 	case NodeTypeFunc:
-		functionName, _ := util.ParseFunctionsStr(n.simpleReqVal)
-		n.simpleReqVal = functionName
+		// todo
+		//functionName, _ := util.ParseFunctionsStr(n.simpleReqVal)
+		//n.simpleReqVal = functionName
 
 	}
 	if n.queryContext.PrintProcessLog {
@@ -572,8 +573,15 @@ func (n *Node) fetch() {
 			n.total = n.children[n.primaryTableKey].total
 		}
 	case NodeTypeFunc:
+		functionName, paramKeys := util.ParseFunctionsStr(n.simpleReqVal)
+		//n.simpleReqVal = functionName
+		// todo 如何传递参数
 		param := model.Map{}
-		n.ret, n.err = functions.Call(n.ctx, n.simpleReqVal, param)
+		for _, key := range paramKeys {
+			param[key] = n.queryContext.pathNodes[key].simpleReqVal
+		}
+
+		n.ret, n.err = functions.Call(n.ctx, functionName, param)
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -389,8 +389,9 @@ func (n *Node) parse() {`
`389`	`389`	`}`
`390`	`390`
`391`	`391`	`case NodeTypeFunc:`
`392`		`- functionName, _ := util.ParseFunctionsStr(n.simpleReqVal)`
`393`		`- n.simpleReqVal = functionName`
	`392`	`+ // todo`
	`393`	`+ //functionName, _ := util.ParseFunctionsStr(n.simpleReqVal)`
	`394`	`+ //n.simpleReqVal = functionName`
`394`	`395`
`395`	`396`	`}`
`396`	`397`	`if n.queryContext.PrintProcessLog {`
`@@ -572,8 +573,15 @@ func (n *Node) fetch() {`
`572`	`573`	`n.total = n.children[n.primaryTableKey].total`
`573`	`574`	`}`
`574`	`575`	`case NodeTypeFunc:`
	`576`	`+ functionName, paramKeys := util.ParseFunctionsStr(n.simpleReqVal)`
	`577`	`+ //n.simpleReqVal = functionName`
	`578`	`+ // todo 如何传递参数`
`575`	`579`	`param := model.Map{}`
`576`		`- n.ret, n.err = functions.Call(n.ctx, n.simpleReqVal, param)`
	`580`	`+ for _, key := range paramKeys {`
	`581`	`+ param[key] = n.queryContext.pathNodes[key].simpleReqVal`
	`582`	`+ }`
	`583`	`+`
	`584`	`+ n.ret, n.err = functions.Call(n.ctx, functionName, param)`
`577`	`585`	`}`
`578`	`586`
`579`	`587`	`}`