Skip to content

Support set menu component #955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions docs/docsrc/examples/examples_presets/menu.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package examples_presets

import (
"fmt"
"net/http"
"net/url"

Expand Down Expand Up @@ -220,3 +221,40 @@ func PresetsGroupMenuWithPermission(b *presets.Builder, db *gorm.DB) (
// @snippet_end
return
}

func PresetsMenuComponent(b *presets.Builder, db *gorm.DB) (
mb *presets.ModelBuilder,
cl *presets.ListingBuilder,
ce *presets.EditingBuilder,
dp *presets.DetailingBuilder,
) {
PresetsGroupMenu(b, db)
b.MenuComponentFunc(func(menus []h.HTMLComponent, menuGroupSelected, menuItemSelected string) h.HTMLComponent {
return h.Div(
web.Scope(
vuetify.VList(menus...).
OpenStrategy("multiple").
Class("primary--text").
Density(vuetify.DensityCompact).
Attr("v-model:opened", "locals.menuOpened").
Attr("v-model:selected", "locals.selection").
Attr("color", "transparent"),
).VSlot("{ locals }").Init(
fmt.Sprintf(`{ menuOpened: [%q] }`, menuGroupSelected),
fmt.Sprintf(`{ selection: [%q] }`, menuItemSelected),
),
)
})
b.MenuOrder(
"books",
b.MenuGroup("Media1").SubItems(
"videos",
"musics",
).Icon("mdi-video"),
b.MenuGroup("Media2").SubItems(
"videos",
"musics",
).Icon("mdi-video"),
)
return
}
25 changes: 25 additions & 0 deletions docs/docsrc/examples/examples_presets/menu_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,28 @@ func TestPresetsCustomizeMenuWithPermission(t *testing.T) {
})
}
}

func TestPresetsPresetsMenuComponent(t *testing.T) {
pb := presets.New().DataOperator(gorm2op.DataOperator(TestDB))
PresetsMenuComponent(pb, TestDB)

cases := []multipartestutils.TestCase{
{
Name: "multiple openStrategy",
Debug: false,
ReqFunc: func() *http.Request {
return multipartestutils.NewMultipartBuilder().
PageURL("/presets-menu-component/books").
BuildEventFuncRequest()
},
ExpectPageBodyContainsInOrder: []string{`:open-strategy='"multiple"'`},
ExpectPageBodyNotContains: []string{`:open-strategy='"single"'`},
},
}

for _, c := range cases {
t.Run(c.Name, func(t *testing.T) {
multipartestutils.RunCase(t, c, pb)
})
}
}
1 change: 1 addition & 0 deletions docs/docsrc/examples/examples_presets/mux.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ func SamplesHandler(mux examples.Muxer) {
addExample(mux, db, PresetsCustomizeMenu)
addExample(mux, db, PresetsGroupMenu)
addExample(mux, db, PresetsGroupMenuWithPermission)
addExample(mux, db, PresetsMenuComponent)
addExample(mux, db, PresetsConfirmDialog)
addExample(mux, db, PresetsEditingCustomizationTabs)
addExample(mux, db, PresetsEditingValidate)
Expand Down
15 changes: 12 additions & 3 deletions presets/menu_order.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@
type MenuOrderBuilder struct {
p *Builder
// string or *MenuGroupBuilder
order []interface{}
modelMap map[string]*ModelBuilder
once sync.Once
order []interface{}
modelMap map[string]*ModelBuilder
menuComponentFunc func(menus []h.HTMLComponent, menuGroupSelected, menuItemSelected string) h.HTMLComponent
once sync.Once
}

type menuOrderItem struct {
Expand All @@ -30,6 +31,11 @@
return &MenuOrderBuilder{p: b}
}

func (b *MenuOrderBuilder) MenuComponentFunc(fn func(menus []h.HTMLComponent, menuGroupSelected, menuItemSelected string) h.HTMLComponent) *MenuOrderBuilder {
b.menuComponentFunc = fn
return b

Check warning on line 36 in presets/menu_order.go

View check run for this annotation

Codecov / codecov/patch

presets/menu_order.go#L34-L36

Added lines #L34 - L36 were not covered by tests
}

func (b *MenuOrderBuilder) isMenuGroupInOrder(mgb *MenuGroupBuilder) bool {
for _, v := range b.order {
if v == mgb {
Expand Down Expand Up @@ -208,6 +214,9 @@
}

func (b *MenuOrderBuilder) buildMenuComponent(menus []h.HTMLComponent, menuGroupSelected, menuItemSelected string) h.HTMLComponent {
if b.menuComponentFunc != nil {
return b.menuComponentFunc(menus, menuGroupSelected, menuItemSelected)
}
return h.Div(
web.Scope(
VList(menus...).
Expand Down
5 changes: 5 additions & 0 deletions presets/presets.go
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,11 @@ func (b *Builder) AddMenuTopItemFunc(key string, v ComponentFunc) (r *Builder) {
return b
}

func (b *Builder) MenuComponentFunc(fn func(menus []h.HTMLComponent, menuGroupSelected, menuItemSelected string) h.HTMLComponent) (r *Builder) {
b.menuOrder.menuComponentFunc = fn
return b
}

func (b *Builder) RunSwitchLocalCodeFunc(ctx *web.EventContext) (r h.HTMLComponent) {
if b.switchLocaleFunc != nil {
return b.switchLocaleFunc(ctx)
Expand Down
Loading