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

Merge pull request #479 from trheyi/main

Browse source 
[fix] table & form layout.confg
This commit is contained in:
Max 2023-10-17 04:48:44 -05:00 • committed by GitHub
commit df2a4739e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
widgets/form/form.go
View file

@ -218,10 +218,6 @@ func MustGet(form interface{}) *DSL {
// Xgen trans to xgen setting // Xgen trans to xgen setting
func (dsl *DSL) Xgen(data map[string]interface{}, excludes map[string]bool) (map[string]interface{}, error) { func (dsl *DSL) Xgen(data map[string]interface{}, excludes map[string]bool) (map[string]interface{}, error) {
if dsl.Config == nil {
dsl.Config = map[string]interface{}{}
}
if dsl.Layout == nil { if dsl.Layout == nil {
dsl.Layout = &LayoutDSL{Form: &ViewLayoutDSL{}} dsl.Layout = &LayoutDSL{Form: &ViewLayoutDSL{}}
} }
@ -245,6 +241,13 @@ func (dsl *DSL) Xgen(data map[string]interface{}, excludes map[string]bool) (map
dsl.Config["full"] = true dsl.Config["full"] = true
} }
// Merge the layout config
if layout.Config != nil {
for key, value := range layout.Config {
dsl.Config[key] = value
}
}
setting := map[string]interface{}{} setting := map[string]interface{}{}
bytes, err := jsoniter.Marshal(layout) bytes, err := jsoniter.Marshal(layout)
if err != nil { if err != nil {

7
widgets/table/table.go
View file

@ -277,6 +277,13 @@ func (dsl *DSL) Xgen(data map[string]interface{}, excludes map[string]bool) (map
dsl.Config["full"] = true dsl.Config["full"] = true
} }
// Merge the layout config
if layout.Config != nil {
for key, value := range layout.Config {
dsl.Config[key] = value
}
}
setting := map[string]interface{}{} setting := map[string]interface{}{}
bytes, err := jsoniter.Marshal(layout) bytes, err := jsoniter.Marshal(layout)
if err != nil { if err != nil {

9
widgets/table/types.go
View file

@ -80,10 +80,11 @@ type BindActionDSL struct {
// LayoutDSL the table layout // LayoutDSL the table layout
type LayoutDSL struct { type LayoutDSL struct {
Primary string `json:"primary,omitempty"` Primary string `json:"primary,omitempty"`
Header *HeaderLayoutDSL `json:"header,omitempty"` Header *HeaderLayoutDSL `json:"header,omitempty"`
Filter *FilterLayoutDSL `json:"filter,omitempty"` Filter *FilterLayoutDSL `json:"filter,omitempty"`
Table *ViewLayoutDSL `json:"table,omitempty"` Table *ViewLayoutDSL `json:"table,omitempty"`
Config map[string]interface{} `json:"config,omitempty"`
} }
// HeaderLayoutDSL layout.header // HeaderLayoutDSL layout.header