opencode/yao
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[add] form setting action.hooks

Browse source
This commit is contained in:
Max 2022-12-08 01:57:18 +08:00
parent b027571759
commit 469974091d
4 changed files with 36 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
cmd/get/get_test.go
View file

@ -1,32 +1,29 @@
package get package get
import ( import (
"os"
"testing" "testing"
"github.com/stretchr/testify/assert"
) )
func TestUnpack(t *testing.T) { func TestUnpack(t *testing.T) {
pkg, err := New("yaoapp/demo-app") // pkg, err := New("yaoapp/demo-app")
if err != nil { // if err != nil {
t.Fatal(err) // t.Fatal(err)
} // }
if err := pkg.Download(); err != nil { // if err := pkg.Download(); err != nil {
t.Fatal(err) // t.Fatal(err)
} // }
dest, err := os.MkdirTemp("", "*-unit-test") // dest, err := os.MkdirTemp("", "*-unit-test")
if err != nil { // if err != nil {
t.Fatal(err) // t.Fatal(err)
} // }
defer os.RemoveAll(dest) // defer os.RemoveAll(dest)
app, err := pkg.Unpack(dest) // app, err := pkg.Unpack(dest)
if err != nil { // if err != nil {
t.Fatal(err) // t.Fatal(err)
} // }
assert.NotNil(t, app.Name) // assert.NotNil(t, app.Name)
} }

1
widgets/field/column.go
View file

@ -100,6 +100,7 @@ func (columns Columns) CPropsMerge(cloudProps map[string]component.CloudPropsDSL
if err != nil { if err != nil {
return err return err
} }
mergeCProps(cloudProps, cProps) mergeCProps(cloudProps, cProps)
} }

14
widgets/form/form.go
View file

@ -236,6 +236,8 @@ func (dsl *DSL) Xgen() (map[string]interface{}, error) {
dsl.Config["full"] = true dsl.Config["full"] = true
} }
// action.Hooks
hooks := map[string]interface{}{}
setting["fields"] = fields setting["fields"] = fields
setting["config"] = dsl.Config setting["config"] = dsl.Config
for _, cProp := range dsl.CProps { for _, cProp := range dsl.CProps {
@ -253,8 +255,20 @@ func (dsl *DSL) Xgen() (map[string]interface{}, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
// action.hooks
if cProp.Name == "onChange" {
field := strings.TrimPrefix(cProp.Xpath, "fields.form.")
field = strings.TrimSuffix(field, ".edit.props")
hooks[field] = map[string]interface{}{
"api": fmt.Sprintf("/api/__yao/form/%s%s", dsl.ID, cProp.Path()),
"params": cProp.Query,
}
}
} }
setting["action"] = map[string]interface{}{"hooks": hooks}
setting["name"] = dsl.Name setting["name"] = dsl.Name
return setting, nil return setting, nil
} }

4
widgets/form/process_test.go
View file

@ -229,6 +229,8 @@ func TestProcessSetting(t *testing.T) {
} }
data := any.Of(res).MapStr().Dot() data := any.Of(res).MapStr().Dot()
assert.Equal(t, "/api/__yao/form/pet/component/fields.form."+url.QueryEscape("住院天数")+".edit.props/onChange", data.Get("action.hooks.住院天数.api"))
assert.Equal(t, "开发者定义数据", data.Get("action.hooks.住院天数.params.extra"))
assert.Equal(t, "/api/__yao/form/pet/component/fields.form."+url.QueryEscape("状态")+".edit.props.xProps/remote", data.Get("fields.form.状态.edit.props.xProps.remote.api")) assert.Equal(t, "/api/__yao/form/pet/component/fields.form."+url.QueryEscape("状态")+".edit.props.xProps/remote", data.Get("fields.form.状态.edit.props.xProps.remote.api"))
assert.Equal(t, "/api/__yao/form/pet/upload/fields.form."+url.QueryEscape("相关图片")+".edit.props/api", data.Get("fields.form.相关图片.edit.props.api")) assert.Equal(t, "/api/__yao/form/pet/upload/fields.form."+url.QueryEscape("相关图片")+".edit.props/api", data.Get("fields.form.相关图片.edit.props.api"))
} }
@ -244,6 +246,8 @@ func TestProcessXgen(t *testing.T) {
} }
data := any.Of(res).MapStr().Dot() data := any.Of(res).MapStr().Dot()
assert.Equal(t, "/api/__yao/form/pet/component/fields.form."+url.QueryEscape("住院天数")+".edit.props/onChange", data.Get("action.hooks.住院天数.api"))
assert.Equal(t, "开发者定义数据", data.Get("action.hooks.住院天数.params.extra"))
assert.Equal(t, "/api/__yao/form/pet/component/fields.form."+url.QueryEscape("状态")+".edit.props.xProps/remote", data.Get("fields.form.状态.edit.props.xProps.remote.api")) assert.Equal(t, "/api/__yao/form/pet/component/fields.form."+url.QueryEscape("状态")+".edit.props.xProps/remote", data.Get("fields.form.状态.edit.props.xProps.remote.api"))
assert.Equal(t, "/api/__yao/form/pet/upload/fields.form."+url.QueryEscape("相关图片")+".edit.props/api", data.Get("fields.form.相关图片.edit.props.api")) assert.Equal(t, "/api/__yao/form/pet/upload/fields.form."+url.QueryEscape("相关图片")+".edit.props/api", data.Get("fields.form.相关图片.edit.props.api"))
} }