Skip to content

Commit 7156d8c

Browse files
committed
chore: 优化列表工具栏菜单
1 parent b40ec9e commit 7156d8c

File tree

5 files changed

+58
-16
lines changed

5 files changed

+58
-16
lines changed

engine.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const (
2323
AppName = "QuarkGo"
2424

2525
// 版本号
26-
Version = "3.9.8"
26+
Version = "3.9.9"
2727

2828
// 包名
2929
PkgName = "github.com/quarkcloudio/quark-go/v3"

template/admin/resource/resolves_toolbar.go

Lines changed: 39 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,46 @@ import (
55
"github.com/quarkcloudio/quark-go/v3/template/admin/resource/types"
66
)
77

8-
// 列表工具栏
9-
func (p *Template) IndexTableMenus(ctx *quark.Context) interface{} {
8+
// 列表工具栏菜单项,示例如下:
9+
//
10+
// []map[string]string{
11+
// {
12+
// "key": "day",
13+
// "label": "日账单",
14+
// },
15+
// {
16+
// "key": "week",
17+
// "label": "周账单",
18+
// },
19+
// }
20+
func (p *Template) IndexTableMenuItems(ctx *quark.Context) []map[string]string {
21+
return []map[string]string{}
22+
}
1023

11-
// 模版实例
24+
// 列表工具栏菜单,示例如下:
25+
//
26+
// map[string]interface{}{
27+
// "type": "tab",
28+
// "items": []map[string]string{
29+
// {
30+
// "key": "day",
31+
// "label": "日账单",
32+
// },
33+
// {
34+
// "key": "week",
35+
// "label": "周账单",
36+
// },
37+
// },
38+
// }
39+
func (p *Template) IndexTableMenu(ctx *quark.Context) interface{} {
1240
template := ctx.Template.(types.Resourcer)
41+
items := template.IndexTableMenuItems(ctx)
42+
if items == nil {
43+
return map[string]interface{}{}
44+
}
1345

14-
menus := template.Menus(ctx)
15-
16-
return menus
46+
return map[string]interface{}{
47+
"type": "tab",
48+
"items": items,
49+
}
1750
}

template/admin/resource/resource.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -269,11 +269,6 @@ func (p *Template) Actions(ctx *quark.Context) []interface{} {
269269
return []interface{}{}
270270
}
271271

272-
// 菜单
273-
func (p *Template) Menus(ctx *quark.Context) interface{} {
274-
return map[string]interface{}{}
275-
}
276-
277272
// 数据导出前回调
278273
func (p *Template) BeforeExporting(ctx *quark.Context, list []map[string]interface{}) []interface{} {
279274
result := []interface{}{}

template/admin/resource/resource_index.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func (p *Template) IndexTableToolBar(ctx *quark.Context) interface{} {
4747
return template.GetTableToolBar(ctx).
4848
SetTitle(p.IndexTableTitle(ctx)).
4949
SetActions(p.IndexTableActions(ctx)).
50-
SetMenu(p.IndexTableMenus(ctx))
50+
SetMenu(p.IndexTableMenu(ctx))
5151
}
5252

5353
// 列表页树形表格

template/admin/resource/types/resourcer.go

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,6 @@ type Resourcer interface {
177177
// 行为
178178
Actions(ctx *quark.Context) []interface{}
179179

180-
// 菜单
181-
Menus(ctx *quark.Context) interface{}
182-
183180
// 创建行为组件
184181
BuildAction(ctx *quark.Context, item interface{}) interface{}
185182

@@ -264,6 +261,23 @@ type Resourcer interface {
264261
// 列表页工具栏
265262
IndexTableToolBar(ctx *quark.Context) interface{}
266263

264+
// 列表工具栏菜单
265+
IndexTableMenu(ctx *quark.Context) interface{}
266+
267+
// 列表工具栏菜单项,示例如下:
268+
//
269+
// []map[string]string{
270+
// {
271+
// "key": "day",
272+
// "label": "日账单",
273+
// },
274+
// {
275+
// "key": "week",
276+
// "label": "周账单",
277+
// },
278+
// }
279+
IndexTableMenuItems(ctx *quark.Context) []map[string]string
280+
267281
// 列表页树形表格
268282
IndexTableTreeBar(ctx *quark.Context) interface{}
269283

0 commit comments

Comments
 (0)